From 4ca4444ad33a2a1a51f5c06e78ee9365dfb1eed6 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 08 十月 2026 17:11:11 +0800
Subject: [PATCH] feat(mes): 种子二维码标签国标四要素合规改造
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java
index c8f11c4..d7f9b24 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java
@@ -25,6 +25,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.pro.bagcode.MesProBagCodeReplaceMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.batch.MesProBatchMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.pallet.MesProPalletMapper;
+import cn.iocoder.yudao.module.mes.dal.redis.MesCodeRedisDAO;
import cn.iocoder.yudao.module.mes.enums.pro.MesProBagCodeStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProBatchStatusEnum;
import cn.iocoder.yudao.module.mes.enums.pro.MesProPalletStatusEnum;
@@ -86,6 +87,9 @@
*/
private static final Pattern KG_TYPE_PATTERN = Pattern.compile("^(\\d{1,5})鍗冨厠$");
+ @Resource
+ private MesCodeRedisDAO codeRedisDao;
+
@Override
@Transactional(rollbackFor = Exception.class)
public MesProBagCodeGenerateRespVO generateBagCodes(MesProBagCodeGenerateReqVO generateReqVO) {
@@ -115,24 +119,24 @@
String uuid = IdUtil.fastSimpleUUID();
List<MesProPalletDO> pallets = new ArrayList<>(palletCount);
if (!ton) {
- int startSeq = palletMapper.selectMaxTempCodeSeq() + 1;
for (int i = 0; i < palletCount; i++) {
pallets.add(new MesProPalletDO()
- .setTempCode("PL-" + StrUtil.padPre(String.valueOf(startSeq + i), 8, '0'))
+ .setTempCode(codeRedisDao.generate())
.setBagCount(perPallet)
.setAutoGenerated(true)
.setStatus(MesProPalletStatusEnum.IN_USE.getStatus()));
}
palletMapper.insertBatch(pallets);
}
- int startNo = bagCodeMapper.selectMaxBagNo() + 1;
+ // 琚嬪簭鍙峰師瀛愬垎閰嶏細鍏堝彇搴撳唴鏈�澶у簭鍙蜂綔鍩哄噯锛屽啀鐢� Redis 鍘熷瓙鑷锛岄伩鍏嶅苟鍙戠敓鎴愪骇鐢熼噸澶嶈搴忓彿
+ int startNo = codeRedisDao.allocateBagNoStart(totalCount, bagCodeMapper.selectMaxBagNo());
List<MesProBagCodeDO> bagCodes = new ArrayList<>(totalCount);
for (int i = 0; i < totalCount; i++) {
int bagNo = startNo + i;
MesProPalletDO pallet = ton ? null : pallets.get(i / perPallet);
bagCodes.add(new MesProBagCodeDO()
.setUuid(uuid)
- .setCode("BAG-" + StrUtil.padPre(String.valueOf(bagNo), 8, '0'))
+ .setCode(codeRedisDao.generate())
.setBagNo(bagNo)
.setItemId(item.getId())
.setItemCode(item.getCode())
@@ -157,13 +161,14 @@
// 鍘熷琚嬬爜涓嶄緷璧栬閲忓崟浣嶇被鍨嬩笌鎵樼洏锛氫粎鎸夋暟閲忕敓鎴愶紝琚嬬爜甯﹀搧绉嶅啑浣欙紝鍚庣画鍙甯稿綍鍏ユ壒娆�/缁戝畾鎵樼洏
MesMdmItemDO item = mdmItemService.validateItemExists(generateReqVO.getItemId());
String uuid = IdUtil.fastSimpleUUID();
- int startNo = bagCodeMapper.selectMaxBagNo() + 1;
+ // 琚嬪簭鍙峰師瀛愬垎閰嶏細鍏堝彇搴撳唴鏈�澶у簭鍙蜂綔鍩哄噯锛屽啀鐢� Redis 鍘熷瓙鑷锛岄伩鍏嶅苟鍙戠敓鎴愪骇鐢熼噸澶嶈搴忓彿
+ int startNo = codeRedisDao.allocateBagNoStart(generateReqVO.getCount(), bagCodeMapper.selectMaxBagNo());
List<MesProBagCodeDO> bagCodes = new ArrayList<>(generateReqVO.getCount());
for (int i = 0; i < generateReqVO.getCount(); i++) {
int bagNo = startNo + i;
bagCodes.add(new MesProBagCodeDO()
.setUuid(uuid)
- .setCode("BAG-" + StrUtil.padPre(String.valueOf(bagNo), 8, '0'))
+ .setCode(codeRedisDao.generate())
.setBagNo(bagNo)
.setItemId(item.getId())
.setItemCode(item.getCode())
@@ -251,7 +256,7 @@
/**
* 琚嬬爜褰曞叆鎵规鏃讹紝灏嗗叾缁戝畾鐨勪复鏃舵墭鐩橈紙鏈粦瀹氭壒娆★級绾ц仈缁戝畾鍒板悓涓�鎵规锛�
- * 鍒嗛厤姝ｅ紡鎵樼洏鐮侊紙鎵规鍙�-P搴忓彿锛夈�佸洖鍐欒鐮佷笂鐨勫啑浣欐墭鐩樼爜銆佺疮璁℃壒娆℃墭鐩樻暟
+ * 鍒嗛厤姝ｅ紡鎵樼洏鐮侊紙16 浣嶉殢鏈烘暟瀛楋紝涓庢墭鐩樼爜鐢熸垚瑙勫垯涓�鑷达級銆佸洖鍐欒鐮佷笂鐨勫啑浣欐墭鐩樼爜銆佺疮璁℃壒娆℃墭鐩樻暟
*/
private void bindPalletsToBatch(List<MesProBagCodeDO> bagCodes, MesProBatchDO batch) {
List<Long> palletIds = bagCodes.stream().map(MesProBagCodeDO::getPalletId)
@@ -266,12 +271,12 @@
if (pallet == null || pallet.getBatchId() != null || StrUtil.isNotEmpty(pallet.getCode())) {
continue;
}
- String palletCode = batch.getCode() + "-P" + StrUtil.padPre(String.valueOf(nextPalletNo++), 2, '0');
+ String palletCode = codeRedisDao.generate();
palletMapper.updateById(new MesProPalletDO().setId(palletId)
.setCode(palletCode)
.setBatchId(batch.getId())
.setBatchCode(batch.getCode())
- .setPalletNo(nextPalletNo - 1));
+ .setPalletNo(nextPalletNo++));
// 琚嬬爜涓婄殑鍐椾綑鎵樼洏鐮佺敱涓存椂鐮佹洿鏂颁负姝ｅ紡鐮�
bagCodeMapper.updatePalletCodeByPalletId(palletId, palletCode);
boundCount++;
@@ -339,7 +344,7 @@
MesProPalletDO pallet = oldBagCode.getPalletId() == null ? null : palletMap.get(oldBagCode.getPalletId());
MesProBagCodeDO newBagCode = new MesProBagCodeDO()
.setUuid(replaceUuid)
- .setCode(batch.getCode() + "-" + StrUtil.padPre(String.valueOf(newBagNo), 4, '0'))
+ .setCode(codeRedisDao.generate())
.setBagNo(newBagNo)
.setBatchId(batch.getId())
.setBatchCode(batch.getCode())
@@ -529,6 +534,16 @@
}
@Override
+ public List<MesProBagCodeDO> getPrintableBagCodeListByBatchId(Long batchId) {
+ return bagCodeMapper.selectPrintableListByBatchId(batchId);
+ }
+
+ @Override
+ public List<MesProBagCodeDO> getPrintableBagCodeListByUuid(String uuid) {
+ return bagCodeMapper.selectPrintableListByUuid(uuid);
+ }
+
+ @Override
public void markOutbound(Long id, Long salesId) {
bagCodeMapper.markOutbound(id, salesId, LocalDateTime.now());
}
--
Gitblit v1.9.3