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/service/pro/bagcode/MesProBagCodeServiceImpl.java | 130 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 121 insertions(+), 9 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 d7f9b24..bfcd3af 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)
@@ -122,8 +124,10 @@
for (int i = 0; i < palletCount; i++) {
pallets.add(new MesProPalletDO()
.setTempCode(codeRedisDao.generate())
+ .setBusinessCode(codeRedisDao.generate())
.setBagCount(perPallet)
.setAutoGenerated(true)
+ .setItemId(item.getId())
.setStatus(MesProPalletStatusEnum.IN_USE.getStatus()));
}
palletMapper.insertBatch(pallets);
@@ -137,6 +141,7 @@
bagCodes.add(new MesProBagCodeDO()
.setUuid(uuid)
.setCode(codeRedisDao.generate())
+ .setBusinessCode(codeRedisDao.generate())
.setBagNo(bagNo)
.setItemId(item.getId())
.setItemCode(item.getCode())
@@ -169,6 +174,7 @@
bagCodes.add(new MesProBagCodeDO()
.setUuid(uuid)
.setCode(codeRedisDao.generate())
+ .setBusinessCode(codeRedisDao.generate())
.setBagNo(bagNo)
.setItemId(item.getId())
.setItemCode(item.getCode())
@@ -217,7 +223,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void bindBatch(MesProBagCodeBindBatchReqVO bindReqVO) {
- MesProBatchDO batch = batchMapper.selectByIdForUpdate(bindReqVO.getBatchId());
+ doBindBatch(bindReqVO.getBatchId(), bindReqVO.getIds());
+ }
+
+ /**
+ * 灏嗚鐮佸綍鍏ユ寚瀹氭壒娆★紝鍔犻攣椤哄簭涓恒�屾壒娆� 鈫� 琚嬬爜 鈫� 鎵樼洏銆嶃��
+ * <p>
+ * 銆屽綍鍏ユ壒娆°�嶄笌銆岀粦瀹氭墭鐩樸�嶅叡鐢ㄦ瀹炵幇锛氱粦瀹氭墭鐩樻椂鑻ユ墭鐩樺凡灞炴煇鎵规銆佽�屾墍閫夎鐮佸皻鏈綍鍏ユ壒娆★紝
+ * 鍏堟寜鏈柟娉曞畬鎴愬綍鍏ワ紝浠庤�屼繚璇佹壒娆″噯鍏ユ牎楠屻�佸搧绉嶄竴鑷存�ф牎楠屻�佹壒娆℃眹鎬诲洖鍐欎笌瀹屾暣鎬ц褰曞彧鏈変竴浠姐��
+ *
+ * @param batchId 鐢熶骇鎵规缂栧彿
+ * @param rawIds 寰呭綍鍏ョ殑琚嬬爜缂栧彿锛堟湭鍘婚噸锛�
+ */
+ private void doBindBatch(Long batchId, List<Long> rawIds) {
+ MesProBatchDO batch = batchMapper.selectByIdForUpdate(batchId);
if (batch == null) {
throw exception(PRO_BATCH_NOT_EXISTS);
}
@@ -228,7 +247,7 @@
if (StrUtil.isEmpty(batch.getCode())) {
throw exception(PRO_BATCH_NOT_FILLED);
}
- List<Long> ids = bindReqVO.getIds().stream().distinct().toList();
+ List<Long> ids = rawIds.stream().distinct().toList();
List<MesProBagCodeDO> bagCodes = bagCodeMapper.selectListByIdsForUpdate(ids);
if (bagCodes.size() != ids.size() || bagCodes.stream().anyMatch(code ->
code.getBatchId() != null
@@ -238,20 +257,31 @@
}
// 褰曞叆鐨勮鐮佸繀椤诲睘浜庡悓涓�鍝佺锛屼笖涓庢壒娆″凡鏈夎鐮佸搧绉嶄竴鑷达紙鍘嗗彶绌虹櫧琚嬬爜 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());
}
/**
@@ -273,6 +303,7 @@
}
String palletCode = codeRedisDao.generate();
palletMapper.updateById(new MesProPalletDO().setId(palletId)
+ .setItemId(batch.getItemId())
.setCode(palletCode)
.setBatchId(batch.getId())
.setBatchCode(batch.getCode())
@@ -345,6 +376,7 @@
MesProBagCodeDO newBagCode = new MesProBagCodeDO()
.setUuid(replaceUuid)
.setCode(codeRedisDao.generate())
+ .setBusinessCode(codeRedisDao.generate())
.setBagNo(newBagNo)
.setBatchId(batch.getId())
.setBatchCode(batch.getCode())
@@ -440,16 +472,50 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void bindPallet(MesProBagCodeBindReqVO bindReqVO) {
- // 1. 閿佸畾鎵樼洏锛岄伩鍏嶄笌鑷姩褰掗泦骞跺彂淇敼琚嬫暟
+ // 1. 鏃犻攣棰勮鎵樼洏涓庢墍閫夎鐮侊紝鍒ゆ柇鏄惁闇�瑕佸厛涓烘湭褰曞叆鎵规鐨勮鐮佽ˉ褰曟壒娆°��
+ // 鍔犻攣椤哄簭蹇呴』涓庛�屽綍鍏ユ壒娆°�嶄竴鑷达紙鎵规 鈫� 琚嬬爜 鈫� 鎵樼洏锛夛紝鍚﹀垯涓や釜鍏ュ彛骞跺彂鏃朵氦鍙夌瓑寰呬細姝婚攣銆�
+ List<Long> ids = bindReqVO.getIds().stream().distinct().toList();
+ MesProPalletDO palletSnapshot = palletMapper.selectById(bindReqVO.getPalletId());
+ if (palletSnapshot == null) {
+ throw exception(PRO_PALLET_NOT_EXISTS);
+ }
+ List<MesProBagCodeDO> snapshots = bagCodeMapper.selectListByIds(ids);
+ if (snapshots.size() != ids.size()) {
+ throw exception(PRO_BAG_CODE_NOT_EXISTS);
+ }
+ // 2. 鎵樼洏鏈粦瀹氭壒娆℃椂锛岃鐮佷篃蹇呴』鏈綍鍏ユ壒娆★紙鍙嶅悜涓嶆垚绔嬶細鏈綍鍏ユ壒娆＄殑琚嬬爜鍙粦鍒颁换鎰忔墭鐩橈級
+ if (palletSnapshot.getBatchId() == null
+ && snapshots.stream().anyMatch(code -> code.getBatchId() != null)) {
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400,
+ "鎵�閫夎鐮佸凡褰曞叆鐢熶骇鎵规锛岃鏀归�夎鎵规涓嬬殑鎵樼洏");
+ }
+ // 3. 鎵樼洏宸茬粦瀹氭壒娆°�佷笖瀛樺湪鏈綍鍏ユ壒娆＄殑琚嬬爜鏃讹紝澶嶇敤銆屽綍鍏ユ壒娆°�嶉�昏緫琛ュ綍
+ if (palletSnapshot.getBatchId() != null) {
+ List<Long> unboundIds = snapshots.stream()
+ .filter(code -> code.getBatchId() == null && code.getPalletId() == null
+ && !MesProBagCodeStatusEnum.CANCELED.getStatus().equals(code.getStatus()))
+ .map(MesProBagCodeDO::getId).toList();
+ if (!unboundIds.isEmpty()) {
+ doBindBatch(palletSnapshot.getBatchId(), unboundIds);
+ }
+ }
+ // 4. 閿佸畾鎵樼洏锛岄伩鍏嶄笌鑷姩褰掗泦骞跺彂淇敼琚嬫暟
MesProPalletDO pallet = palletMapper.selectByIdForUpdate(bindReqVO.getPalletId());
if (pallet == null) {
throw exception(PRO_PALLET_NOT_EXISTS);
}
- // 2. 閿佸畾骞舵牎楠岃鐮�
- List<MesProBagCodeDO> bagCodes = validateBagCodesForBind(bindReqVO.getIds(), pallet, true);
- // 3. 缁戝畾琚嬬爜骞剁疮鍔犳墭鐩樺凡瑁呰鏁帮紙鎵樼洏鏃犲閲忎笂闄愶級
+ // 5. 閿佸畾骞舵牎楠岃鐮侊紙褰曞叆鎵规鍚庯紝琚嬬爜涓庢墭鐩樺繀鐒跺悓鎵规锛�
+ List<MesProBagCodeDO> bagCodes = validateBagCodesForBind(ids, 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));
+ // 6. 缁戝畾琚嬬爜骞剁疮鍔犳墭鐩樺凡瑁呰鏁帮紙鎵樼洏鏃犲閲忎笂闄愶級
int currentCount = pallet.getBagCount() == null ? 0 : pallet.getBagCount();
- bagCodeMapper.bindPalletByIds(bindReqVO.getIds(), pallet.getId(), pallet.getCode());
+ bagCodeMapper.bindPalletByIds(ids, pallet.getId(), StrUtil.isNotBlank(pallet.getCode()) ? pallet.getCode() : pallet.getTempCode());
palletService.updatePalletBagCount(pallet.getId(), currentCount + bagCodes.size());
}
@@ -504,6 +570,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);
}
@@ -544,6 +636,26 @@
}
@Override
+ public Long getPrintableBagCodeCountByUuid(String uuid) {
+ return bagCodeMapper.selectPrintableCountByUuid(uuid);
+ }
+
+ @Override
+ public Long getPrintableBagCodeCountByBatchId(Long batchId) {
+ return bagCodeMapper.selectPrintableCountByBatchId(batchId);
+ }
+
+ @Override
+ public List<MesProBagCodeDO> getPrintableBagCodePageByUuid(String uuid, int pageNo, int pageSize) {
+ return bagCodeMapper.selectPrintablePageByUuid(uuid, pageNo, pageSize);
+ }
+
+ @Override
+ public List<MesProBagCodeDO> getPrintableBagCodePageByBatchId(Long batchId, int pageNo, int pageSize) {
+ return bagCodeMapper.selectPrintablePageByBatchId(batchId, pageNo, pageSize);
+ }
+
+ @Override
public void markOutbound(Long id, Long salesId) {
bagCodeMapper.markOutbound(id, salesId, LocalDateTime.now());
}
@@ -564,7 +676,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