From 704265308b1227dbada5a36b2027b588c062ded2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 12 十月 2026 09:14:37 +0800
Subject: [PATCH] feat(mes): 新增业务码支持并优化追溯查询功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/bagcode/MesProBagCodeServiceImpl.java | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 11 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 591eaf2..2310eff 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
@@ -89,6 +89,8 @@
@Resource
private MesCodeRedisDAO codeRedisDao;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.trace.integrity.MesTraceIntegrityService integrityService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -119,24 +121,27 @@
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())
+ .setBusinessCode(codeRedisDao.generate())
.setBagCount(perPallet)
.setAutoGenerated(true)
+ .setItemId(item.getId())
.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())
+ .setBusinessCode(codeRedisDao.generate())
.setBagNo(bagNo)
.setItemId(item.getId())
.setItemCode(item.getCode())
@@ -161,13 +166,15 @@
// 鍘熷琚嬬爜涓嶄緷璧栬閲忓崟浣嶇被鍨嬩笌鎵樼洏锛氫粎鎸夋暟閲忕敓鎴愶紝琚嬬爜甯﹀搧绉嶅啑浣欙紝鍚庣画鍙甯稿綍鍏ユ壒娆�/缁戝畾鎵樼洏
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(codeRedisDao.generate())
+ .setBusinessCode(codeRedisDao.generate())
.setBagNo(bagNo)
.setItemId(item.getId())
.setItemCode(item.getCode())
@@ -237,25 +244,36 @@
}
// 褰曞叆鐨勮鐮佸繀椤诲睘浜庡悓涓�鍝佺锛屼笖涓庢壒娆″凡鏈夎鐮佸搧绉嶄竴鑷达紙鍘嗗彶绌虹櫧琚嬬爜 item 涓虹┖涓嶅弬涓庢牎楠岋級
Set<Long> itemIds = new LinkedHashSet<>();
+ if (batch.getItemId() != null) itemIds.add(batch.getItemId());
bagCodes.stream().map(MesProBagCodeDO::getItemId).filter(Objects::nonNull).forEach(itemIds::add);
itemIds.addAll(bagCodeMapper.selectDistinctItemIdsByBatchId(batch.getId()));
+ for (Long palletId : bagCodes.stream().map(MesProBagCodeDO::getPalletId).filter(Objects::nonNull).distinct().sorted().toList()) {
+ MesProPalletDO pallet = palletMapper.selectByIdForUpdate(palletId);
+ if (pallet == null) throw exception(PRO_PALLET_NOT_EXISTS);
+ if (pallet.getBatchId() != null && !pallet.getBatchId().equals(batch.getId()))
+ throw exception(PRO_BAG_CODE_BIND_PALLET_MISMATCH);
+ Long palletItem = cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletItemResolver.resolve(pallet, bagCodeMapper.selectListByPalletId(palletId));
+ if (palletItem != null) itemIds.add(palletItem);
+ }
if (itemIds.size() > 1) {
throw exception(PRO_BAG_CODE_BIND_BATCH_ITEM_MISMATCH);
}
+ if (!itemIds.isEmpty()) batch.setItemId(itemIds.iterator().next());
if (bagCodeMapper.bindBatchByIds(ids, batch.getId(), batch.getCode(),
List.of(MesProBagCodeStatusEnum.GENERATED.getStatus(),
MesProBagCodeStatusEnum.PRINTED.getStatus())) != ids.size()) {
throw exception(PRO_BAG_CODE_STATUS_NOT_GENERATED);
}
- batchMapper.updateById(new MesProBatchDO().setId(batch.getId())
+ batchMapper.updateById(new MesProBatchDO().setId(batch.getId()).setItemId(batch.getItemId())
.setBagQuantity(bagCodeMapper.selectEffectiveCountByBatchId(batch.getId())));
// 绾ц仈锛氭湰缁勮鐮佺粦瀹氱殑鏈叆鎵规鎵樼洏锛屽垎閰嶆寮忔墭鐩樼爜骞剁粦瀹氭壒娆�
bindPalletsToBatch(bagCodes, batch);
+ integrityService.recordBatchIntegrity(batch.getId());
}
/**
* 琚嬬爜褰曞叆鎵规鏃讹紝灏嗗叾缁戝畾鐨勪复鏃舵墭鐩橈紙鏈粦瀹氭壒娆★級绾ц仈缁戝畾鍒板悓涓�鎵规锛�
- * 鍒嗛厤姝ｅ紡鎵樼洏鐮侊紙鎵规鍙�-P搴忓彿锛夈�佸洖鍐欒鐮佷笂鐨勫啑浣欐墭鐩樼爜銆佺疮璁℃壒娆℃墭鐩樻暟
+ * 鍒嗛厤姝ｅ紡鎵樼洏鐮侊紙16 浣嶉殢鏈烘暟瀛楋紝涓庢墭鐩樼爜鐢熸垚瑙勫垯涓�鑷达級銆佸洖鍐欒鐮佷笂鐨勫啑浣欐墭鐩樼爜銆佺疮璁℃壒娆℃墭鐩樻暟
*/
private void bindPalletsToBatch(List<MesProBagCodeDO> bagCodes, MesProBatchDO batch) {
List<Long> palletIds = bagCodes.stream().map(MesProBagCodeDO::getPalletId)
@@ -270,12 +288,13 @@
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)
+ .setItemId(batch.getItemId())
.setCode(palletCode)
.setBatchId(batch.getId())
.setBatchCode(batch.getCode())
- .setPalletNo(nextPalletNo - 1));
+ .setPalletNo(nextPalletNo++));
// 琚嬬爜涓婄殑鍐椾綑鎵樼洏鐮佺敱涓存椂鐮佹洿鏂颁负姝ｅ紡鐮�
bagCodeMapper.updatePalletCodeByPalletId(palletId, palletCode);
boundCount++;
@@ -344,6 +363,7 @@
MesProBagCodeDO newBagCode = new MesProBagCodeDO()
.setUuid(replaceUuid)
.setCode(codeRedisDao.generate())
+ .setBusinessCode(codeRedisDao.generate())
.setBagNo(newBagNo)
.setBatchId(batch.getId())
.setBatchCode(batch.getCode())
@@ -446,9 +466,16 @@
}
// 2. 閿佸畾骞舵牎楠岃鐮�
List<MesProBagCodeDO> bagCodes = validateBagCodesForBind(bindReqVO.getIds(), pallet, true);
+ Long itemId = cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletItemResolver.resolve(pallet,
+ bagCodeMapper.selectListByPalletId(pallet.getId()));
+ for (MesProBagCodeDO bag : bagCodes) {
+ if (bag.getItemId() == null) throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "琚嬬爜缂哄皯鍝佺");
+ itemId = cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletItemResolver.merge(itemId, bag.getItemId());
+ }
+ palletMapper.updateById(new MesProPalletDO().setId(pallet.getId()).setItemId(itemId));
// 3. 缁戝畾琚嬬爜骞剁疮鍔犳墭鐩樺凡瑁呰鏁帮紙鎵樼洏鏃犲閲忎笂闄愶級
int currentCount = pallet.getBagCount() == null ? 0 : pallet.getBagCount();
- bagCodeMapper.bindPalletByIds(bindReqVO.getIds(), pallet.getId(), pallet.getCode());
+ bagCodeMapper.bindPalletByIds(bindReqVO.getIds(), pallet.getId(), StrUtil.isNotBlank(pallet.getCode()) ? pallet.getCode() : pallet.getTempCode());
palletService.updatePalletBagCount(pallet.getId(), currentCount + bagCodes.size());
}
@@ -503,6 +530,32 @@
}
@Override
+ public MesProBagCodeDO getBagCodeByScanCode(String code) {
+ return bagCodeMapper.selectByScanCode(code);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int generateBusinessCodes(List<Long> ids) {
+ if (CollUtil.isEmpty(ids) || ids.size() > 200 || ids.stream().anyMatch(Objects::isNull)) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "璇烽�夋嫨 1 鑷� 200 鏉¤鐮�");
+ }
+ List<Long> uniqueIds = ids.stream().distinct().sorted().toList();
+ List<MesProBagCodeDO> bags = bagCodeMapper.selectListByIdsForUpdate(uniqueIds);
+ if (bags.size() != uniqueIds.size()) throw exception(PRO_BAG_CODE_NOT_EXISTS);
+ if (bags.stream().anyMatch(bag -> MesProBagCodeStatusEnum.CANCELED.getStatus().equals(bag.getStatus()))) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "宸蹭綔搴熻鐮佷笉鍙ˉ鐢熸垚涓氬姟鐮�");
+ }
+ int count = 0;
+ for (MesProBagCodeDO bag : bags) {
+ if (StrUtil.isNotBlank(bag.getBusinessCode())) continue;
+ bagCodeMapper.updateById(new MesProBagCodeDO().setId(bag.getId()).setBusinessCode(codeRedisDao.generate()));
+ count++;
+ }
+ return count;
+ }
+
+ @Override
public MesProBagCodeReplaceDO getReplacementByOldBagCodeId(Long oldBagCodeId) {
return replaceMapper.selectByOldBagCodeId(oldBagCodeId);
}
@@ -533,6 +586,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());
}
@@ -553,7 +616,7 @@
throw exception(PRO_BAG_CODE_NOT_EXISTS);
}
for (MesProBagCodeDO bagCode : bagCodes) {
- if (!pallet.getBatchId().equals(bagCode.getBatchId())) {
+ if (!Objects.equals(pallet.getBatchId(), bagCode.getBatchId())) {
throw exception(PRO_BAG_CODE_BIND_PALLET_MISMATCH);
}
if (bagCode.getPalletId() != null) {
--
Gitblit v1.9.3