From 6c0fd2cb801554f7999d14e45a94ef0f0d0dfb8d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 17:45:33 +0800
Subject: [PATCH] feat(mes): 二维码大批量导出改为后台任务，取消数量上限
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java | 106 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 67 insertions(+), 39 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
index 55a450b..a83a15b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.pro.batch;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -10,6 +11,8 @@
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchPreGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchPreGenerateRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchTraceRespVO;
@@ -20,13 +23,12 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchWorkerDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.pallet.MesProPalletDO;
-import cn.iocoder.yudao.module.mes.framework.qrcode.MesProQrLabelBuilder;
import cn.iocoder.yudao.module.mes.framework.qrcode.QrCodeImageUtils;
-import cn.iocoder.yudao.module.mes.framework.qrcode.QrLabelInfo;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.bagcode.MesProBagCodeService;
import cn.iocoder.yudao.module.mes.service.pro.batch.MesProBatchService;
import cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletService;
+import cn.iocoder.yudao.module.mes.service.pro.qrexport.MesProQrLabelAssembler;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -41,7 +43,6 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -55,13 +56,20 @@
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_BATCH_NOT_EXISTS;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_QR_EXPORT_TOO_MANY;
@Tag(name = "绠＄悊鍚庡彴 - MES 鐢熶骇鎵规")
@RestController
@RequestMapping("/mes/pro/batch")
@Validated
public class MesProBatchController {
+
+ /**
+ * 鎵规杩芥函鍝嶅簲鍐呭祵鐨勮鐮佸垪琛ㄤ笂闄�
+ * <p>
+ * 杩欐槸鍝嶅簲浣撶Н鐨勪繚鎶わ紝涓庝簩缁寸爜瀵煎嚭鏃犲叧锛氳鐮佹�婚噺鐢� bagTotal 杩斿洖锛屽垪琛ㄦ湰韬彧浣滃睍绀虹敤閫斻��
+ * 瀵煎嚭璺緞涓嶅啀鏈夋暟閲忎笂闄愩��
+ */
+ private static final int MAX_TRACE_BAG_LIST_SIZE = 2000;
@Resource
private MesProBatchService batchService;
@@ -73,12 +81,31 @@
private MesProPalletService palletService;
@Resource
private MesProBagCodeService bagCodeService;
+ @Resource
+ private MesProQrLabelAssembler labelAssembler;
@PostMapping("/create")
- @Operation(summary = "鍒涘缓鐢熶骇鎵规锛堣嚜鍔ㄧ敓鎴愭壒娆″彿锛�")
+ @Operation(summary = "鍒涘缓鐢熶骇鎵规锛堜竴娆″綍鍏ヤ笟鍔′俊鎭紝鑷姩鐢熸垚鎵规鍙凤級")
@PreAuthorize("@ss.hasPermission('mes:pro-batch:create')")
public CommonResult<Long> createBatch(@Valid @RequestBody MesProBatchSaveReqVO createReqVO) {
return success(batchService.createBatch(createReqVO));
+ }
+
+ @PostMapping("/pre-generate")
+ @Operation(summary = "棰勭敓鎴愮敓浜ф壒娆′簩缁寸爜锛堜粎鐢熸垚涓存椂鎵规鐮侊紝涓嶅綍鍏ヤ笟鍔′俊鎭級")
+ @PreAuthorize("@ss.hasPermission('mes:pro-batch:create')")
+ public CommonResult<List<MesProBatchPreGenerateRespVO>> preGenerateBatch(
+ @Valid @RequestBody MesProBatchPreGenerateReqVO preGenerateReqVO) {
+ List<MesProBatchDO> list = batchService.preGenerateBatch(preGenerateReqVO);
+ return success(BeanUtils.toBean(list, MesProBatchPreGenerateRespVO.class));
+ }
+
+ @PutMapping("/fill-info")
+ @Operation(summary = "琛ュ綍鐢熶骇鎵规涓氬姟淇℃伅锛堢敓鎴愭寮忔壒娆″彿锛屼粎涓存椂鎵规鍙敤锛�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-batch:update')")
+ public CommonResult<Boolean> fillBatchInfo(@Valid @RequestBody MesProBatchSaveReqVO fillReqVO) {
+ batchService.fillBatchInfo(fillReqVO);
+ return success(true);
}
@PutMapping("/update")
@@ -161,7 +188,7 @@
@Parameter(name = "code", description = "鎵规鍙凤紙浜岀淮鐮佸唴瀹癸級", required = true, example = "PC20260818L01001")
@PreAuthorize("@ss.hasPermission('mes:pro-batch:query')")
public CommonResult<MesProBatchTraceRespVO> getBatchByCode(@RequestParam("code") String code) {
- MesProBatchDO batch = batchService.getBatchByCode(code);
+ MesProBatchDO batch = batchService.getBatchByScanCode(code);
if (batch == null) {
throw exception(PRO_BATCH_NOT_EXISTS);
}
@@ -180,32 +207,47 @@
throw exception(PRO_BATCH_NOT_EXISTS);
}
List<MesProPalletDO> pallets = palletService.getPalletListByBatchId(batchId);
- if (pallets.size() + 1 > QrCodeImageUtils.MAX_QR_EXPORT) {
- throw exception(PRO_QR_EXPORT_TOO_MANY);
- }
- QrCodeImageUtils.writeZip(response, "鎵规浜岀淮鐮�-" + batch.getCode(), buildBatchQrLabels(batch, pallets));
+ String qrCode = StrUtil.blankToDefault(batch.getCode(), batch.getTempCode());
+ QrCodeImageUtils.writeZip(response, "鎵规浜岀淮鐮�-" + qrCode, labelAssembler.buildBatchLabels(batch, pallets));
}
// ==================== 鎷兼帴 VO ====================
+
+ @PostMapping("/generate-business-code")
+ @Operation(summary = "琛ョ敓鎴愬凡鏈夌敓浜ф壒娆′笟鍔＄爜锛屽凡鏈夌爜鍊间笉鍙�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-batch:create')")
+ public CommonResult<Integer> generateBusinessCodes(@Valid @RequestBody
+ cn.iocoder.yudao.module.mes.controller.admin.pro.vo.MesProBusinessCodeGenerateReqVO reqVO) {
+ return success(batchService.generateBusinessCodes(reqVO.getIds()));
+ }
+
+ @GetMapping("/export-business-qr")
+ @Operation(summary = "瀵煎嚭鎵规鍙婃墍灞炴墭鐩樹笟鍔′簩缁寸爜锛屽唴瀹逛负绾笟鍔＄爜鍊�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-batch:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportBusinessQr(@RequestParam("batchId") Long batchId,
+ HttpServletResponse response) throws IOException {
+ MesProBatchDO batch = batchService.getBatch(batchId);
+ if (batch == null) throw exception(PRO_BATCH_NOT_EXISTS);
+ if (cn.iocoder.yudao.module.mes.enums.pro.MesProBatchStatusEnum.CANCELED.getStatus().equals(batch.getStatus()))
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "宸蹭綔搴熸壒娆′笉鍙鍑轰笟鍔′簩缁寸爜");
+ List<MesProPalletDO> pallets = palletService.getPalletListByBatchId(batchId).stream()
+ .filter(record -> !cn.iocoder.yudao.module.mes.enums.pro.MesProPalletStatusEnum.CANCELED.getStatus().equals(record.getStatus())).toList();
+ QrCodeImageUtils.writeZip(response, "鎵规涓氬姟浜岀淮鐮�-" + batch.getBusinessCode(),
+ labelAssembler.buildBatchBusinessLabels(batch, pallets));
+ }
private List<MesProBatchRespVO> buildBatchRespVOList(List<MesProBatchDO> list) {
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 1. 鑾峰緱鍏宠仈鏁版嵁锛堣矗浠讳汉銆佸搧绉嶇墿鏂欙級
+ // 1. 鑾峰緱鍏宠仈鏁版嵁锛堣矗浠讳汉锛夛紱鍝佺宸蹭笅娌夊埌琚嬬爜鏁版嵁鍖咃紝鎵规鍒楄〃涓嶅啀灞曠ず
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesProBatchDO::getOwnerUserId));
- Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
- convertSet(list, MesProBatchDO::getItemId));
- // 2. 鏋勫缓缁撴灉
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(convertSet(list, MesProBatchDO::getItemId));
return BeanUtils.toBean(list, MesProBatchRespVO.class, vo -> {
- MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user ->
- vo.setOwnerUserName(user.getNickname()));
- MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
- vo.setItemCode(item.getCode());
- vo.setItemName(item.getName());
- vo.setItemSpecification(item.getSpecification());
- });
+ MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user -> vo.setOwnerUserName(user.getNickname()));
+ MapUtils.findAndThen(itemMap, vo.getItemId(), item -> { vo.setItemCode(item.getCode()); vo.setItemName(item.getName()); });
});
}
@@ -241,11 +283,12 @@
respVO.setWorkers(buildWorkerRespVOList(batchService.getBatchWorkerListByBatchId(batch.getId())));
// 鎵樼洏鍒楄〃
respVO.setPallets(BeanUtils.toBean(palletService.getPalletListByBatchId(batch.getId()), MesProPalletRespVO.class));
- // 琚嬬爜鍒楄〃锛堝皝椤� 2000锛宐agTotal 璁板綍鎬绘暟锛�
+ // 琚嬬爜鍒楄〃锛堝皝椤� MAX_TRACE_BAG_LIST_SIZE锛宐agTotal 璁板綍鎬绘暟锛�
List<MesProBagCodeDO> bags = bagCodeService.getBagCodeListByBatchId(batch.getId());
+ respVO.setPendingBagQuantity((int) bags.stream().filter(b -> !Integer.valueOf(30).equals(b.getStatus()) && b.getInboundEventId() == null).count());
respVO.setBagTotal(bags.size());
- if (bags.size() > QrCodeImageUtils.MAX_QR_EXPORT) {
- bags = bags.subList(0, QrCodeImageUtils.MAX_QR_EXPORT);
+ if (bags.size() > MAX_TRACE_BAG_LIST_SIZE) {
+ bags = bags.subList(0, MAX_TRACE_BAG_LIST_SIZE);
}
respVO.setBags(buildBagCodeRespVOList(bags));
return respVO;
@@ -261,21 +304,6 @@
return BeanUtils.toBean(list, MesProBagCodeRespVO.class, vo ->
MapUtils.findAndThen(batchMap, vo.getBatchId(), batch ->
vo.setLineCode(batch.getLineCode()).setLineName(batch.getLineName())));
- }
-
- private List<QrLabelInfo> buildBatchQrLabels(MesProBatchDO batch, List<MesProPalletDO> pallets) {
- // 鑾峰緱鍏宠仈鏁版嵁锛堝搧绉嶃�佽矗浠讳汉锛夆�斺�旀壒娆′笌鎵樼洏鍚屽睘涓�鎵癸紝鍏辩敤鍚屼竴浠�
- Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
- convertSet(Collections.singletonList(batch), MesProBatchDO::getItemId));
- Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
- convertSet(Collections.singletonList(batch), MesProBatchDO::getOwnerUserId));
- // 鏋勫缓鏍囩锛氭壒娆″浘 + 鍏ㄩ儴鎵樼洏鍥�
- List<QrLabelInfo> labels = new ArrayList<>(pallets.size() + 1);
- labels.add(MesProQrLabelBuilder.buildBatchLabel(batch, itemMap, userMap));
- for (MesProPalletDO pallet : pallets) {
- labels.add(MesProQrLabelBuilder.buildPalletLabel(pallet, batch, itemMap, userMap));
- }
- return labels;
}
}
--
Gitblit v1.9.3