From 8655501ffb8dbdaf2508e575933063e6731be714 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 28 八月 2026 17:14:40 +0800
Subject: [PATCH] refactor(mes): 重构MES生产批次和袋码管理功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/qrcode/MesProQrLabelBuilder.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/qrcode/MesProQrLabelBuilder.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/qrcode/MesProQrLabelBuilder.java
index d22a870..822e040 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/qrcode/MesProQrLabelBuilder.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/framework/qrcode/MesProQrLabelBuilder.java
@@ -26,16 +26,24 @@
public static QrLabelInfo buildBatchLabel(MesProBatchDO batch,
Map<Long, MesMdmItemDO> itemMap,
Map<Long, AdminUserRespDTO> userMap) {
+ // 鏈ˉ褰曚笟鍔′俊鎭椂鐢ㄤ复鏃舵壒娆＄爜浣滀负浜岀淮鐮佸唴瀹癸紝骞舵槑纭彁绀虹姸鎬侊紱鍝佺/浜х嚎绛変俊鎭己澶辨椂涓嶆嫾鎺ョ┖鏂囨湰
+ String code = StrUtil.blankToDefault(batch.getCode(), batch.getTempCode());
LinkedHashMap<String, String> keyValues = new LinkedHashMap<>();
- keyValues.put("鎵规鍙�", batch.getCode());
+ keyValues.put("鎵规鍙�", code);
+ if (StrUtil.isEmpty(batch.getCode())) {
+ keyValues.put("鐘舵��", "寰呰ˉ褰�");
+ }
MesMdmItemDO item = itemMap.get(batch.getItemId());
if (item != null) {
keyValues.put("鍝佺", item.getName());
keyValues.put("瑙勬牸", item.getSpecification());
}
- keyValues.put("浜х嚎", StrUtil.join(" / ", batch.getLineName(), batch.getLineCode()));
- keyValues.put("鐢熶骇鏃ユ湡", batch.getProduceDate() == null ? ""
- : LocalDateTimeUtil.format(batch.getProduceDate(), "yyyy-MM-dd HH:mm"));
+ if (StrUtil.isNotEmpty(batch.getLineName()) || StrUtil.isNotEmpty(batch.getLineCode())) {
+ keyValues.put("浜х嚎", StrUtil.join(" / ", batch.getLineName(), batch.getLineCode()));
+ }
+ if (batch.getProduceDate() != null) {
+ keyValues.put("鐢熶骇鏃ユ湡", LocalDateTimeUtil.format(batch.getProduceDate(), "yyyy-MM-dd HH:mm"));
+ }
if (batch.getPlanQuantity() != null) {
keyValues.put("璁″垝鏁伴噺", String.valueOf(batch.getPlanQuantity()));
}
@@ -43,7 +51,7 @@
if (user != null) {
keyValues.put("璐ｄ换浜�", user.getNickname());
}
- return QrLabelInfo.builder().fileName(batch.getCode()).code(batch.getCode()).keyValues(keyValues).build();
+ return QrLabelInfo.builder().fileName(code).code(code).keyValues(keyValues).build();
}
/**
@@ -53,17 +61,24 @@
MesProBatchDO batch,
Map<Long, MesMdmItemDO> itemMap,
Map<Long, AdminUserRespDTO> userMap) {
+ // 鏈粦瀹氭壒娆★紙涓存椂鎵樼洏鐮侊級鏃剁敤涓存椂鐮佷綔涓轰簩缁寸爜鍐呭骞舵槑纭彁绀虹姸鎬�
+ String code = StrUtil.blankToDefault(pallet.getCode(), pallet.getTempCode());
LinkedHashMap<String, String> keyValues = new LinkedHashMap<>();
- keyValues.put("鎵樼洏鐮�", pallet.getCode());
+ keyValues.put("鎵樼洏鐮�", code);
+ if (StrUtil.isEmpty(pallet.getCode())) {
+ keyValues.put("鐘舵��", "鏈粦瀹氭壒娆�");
+ }
keyValues.put("鎵樼洏搴忓彿", pallet.getPalletNo() == null ? "" : String.valueOf(pallet.getPalletNo()));
- keyValues.put("鎵规鍙�", pallet.getBatchCode());
+ if (StrUtil.isNotEmpty(pallet.getBatchCode())) {
+ keyValues.put("鎵规鍙�", pallet.getBatchCode());
+ }
if (pallet.getBagCount() != null) {
keyValues.put("宸茶琚嬫暟", String.valueOf(pallet.getBagCount()));
}
if (batch != null) {
fillBatchKeyValues(keyValues, batch, itemMap, userMap);
}
- return QrLabelInfo.builder().fileName(pallet.getCode()).code(pallet.getCode()).keyValues(keyValues).build();
+ return QrLabelInfo.builder().fileName(code).code(code).keyValues(keyValues).build();
}
/**
--
Gitblit v1.9.3