From 66517edf1de22c8203daa256abffddae43bae704 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 17:58:28 +0800
Subject: [PATCH] feat(mes): 袋码绑定托盘免先录生产批次
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/batch/MesProBatchController.java | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 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 bde13d7..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
@@ -23,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;
@@ -44,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;
@@ -58,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;
@@ -76,6 +81,8 @@
private MesProPalletService palletService;
@Resource
private MesProBagCodeService bagCodeService;
+ @Resource
+ private MesProQrLabelAssembler labelAssembler;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇鎵规锛堜竴娆″綍鍏ヤ笟鍔′俊鎭紝鑷姩鐢熸垚鎵规鍙凤級")
@@ -200,11 +207,8 @@
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);
- }
String qrCode = StrUtil.blankToDefault(batch.getCode(), batch.getTempCode());
- QrCodeImageUtils.writeZip(response, "鎵规浜岀淮鐮�-" + qrCode, buildBatchQrLabels(batch, pallets));
+ QrCodeImageUtils.writeZip(response, "鎵规浜岀淮鐮�-" + qrCode, labelAssembler.buildBatchLabels(batch, pallets));
}
// ==================== 鎷兼帴 VO ====================
@@ -229,11 +233,8 @@
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();
- if (pallets.size() + 1 > QrCodeImageUtils.MAX_QR_EXPORT) throw exception(PRO_QR_EXPORT_TOO_MANY);
- List<QrLabelInfo> labels = new java.util.ArrayList<>();
- labels.add(MesProQrLabelBuilder.buildBatchBusinessCodeLabel(batch));
- pallets.forEach(pallet -> labels.add(MesProQrLabelBuilder.buildPalletBusinessCodeLabel(pallet)));
- QrCodeImageUtils.writeZip(response, "鎵规涓氬姟浜岀淮鐮�-" + batch.getBusinessCode(), labels);
+ QrCodeImageUtils.writeZip(response, "鎵规涓氬姟浜岀淮鐮�-" + batch.getBusinessCode(),
+ labelAssembler.buildBatchBusinessLabels(batch, pallets));
}
private List<MesProBatchRespVO> buildBatchRespVOList(List<MesProBatchDO> list) {
@@ -282,12 +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;
@@ -303,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