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/pallet/MesProPalletServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 95 insertions(+), 11 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java
index 33794e4..ec1de18 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/pallet/MesProPalletServiceImpl.java
@@ -7,11 +7,14 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletBindBatchReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletPreGenerateReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.pallet.MesProPalletDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.bagcode.MesProBagCodeMapper;
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;
import jakarta.annotation.Resource;
@@ -22,7 +25,9 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -43,6 +48,11 @@
private MesProBagCodeMapper bagCodeMapper;
@Resource
private MesProBatchMapper batchMapper;
+
+ @Resource
+ private MesCodeRedisDAO codeRedisDao;
+ @Resource
+ private cn.iocoder.yudao.module.mes.service.trace.integrity.MesTraceIntegrityService integrityService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -67,11 +77,12 @@
for (int i = 0; i < createReqVO.getCount(); i++) {
int palletNo = startNo + i;
pallets.add(new MesProPalletDO()
- .setCode(batch.getCode() + "-P" + StrUtil.padPre(String.valueOf(palletNo), 2, '0'))
+ .setCode(codeRedisDao.generate())
+ .setBusinessCode(codeRedisDao.generate())
+ .setItemId(batch.getItemId())
.setBatchId(batch.getId())
.setBatchCode(batch.getCode())
.setPalletNo(palletNo)
- .setCapacity(createReqVO.getCapacity())
.setBagCount(0)
.setAutoGenerated(false)
.setStatus(MesProPalletStatusEnum.IN_USE.getStatus())
@@ -89,13 +100,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public List<MesProPalletDO> preGeneratePallet(MesProPalletPreGenerateReqVO reqVO) {
- // 1. 鐢熸垚涓存椂鎵樼洏鐮侊紙鍏ㄥ眬 8 浣嶅簭鍙凤紝鏍煎紡 PL-00000001锛�
- int startSeq = palletMapper.selectMaxTempCodeSeq() + 1;
+ // 1. 閫氳繃缁熶竴缂栫爜鐢熸垚鍣ㄥ垎閰嶄复鏃剁爜鍙婁笟鍔＄爜锛屼笉鍐嶈В鏋愬巻鍙蹭复鏃剁爜搴忓彿銆�
List<MesProPalletDO> list = new ArrayList<>(reqVO.getCount());
for (int i = 0; i < reqVO.getCount(); i++) {
list.add(new MesProPalletDO()
- .setTempCode("PL-" + StrUtil.padPre(String.valueOf(startSeq + i), 8, '0'))
- .setCapacity(reqVO.getCapacity())
+ .setTempCode(codeRedisDao.generate())
+ .setBusinessCode(codeRedisDao.generate())
.setBagCount(0)
.setAutoGenerated(false)
.setStatus(MesProPalletStatusEnum.IN_USE.getStatus())
@@ -136,20 +146,62 @@
}
pallets.add(pallet);
}
- // 3. 鍒嗛厤姝ｅ紡鎵樼洏鐮侊細鎵规鍙� + -P + 2 浣嶆墭鐩樺簭鍙凤紙鍚�昏緫鍒犻櫎璁板綍鍙備笌搴忓彿锛屼繚璇佷笉鍥為��銆佺爜鍊煎敮涓�锛�
+ Long itemId = batch.getItemId();
+ for (Long existing : bagCodeMapper.selectDistinctItemIdsByBatchId(batch.getId()))
+ itemId = MesProPalletItemResolver.merge(itemId, existing);
+ for (MesProPalletDO pallet : pallets) {
+ Long palletItem = MesProPalletItemResolver.resolve(pallet, bagCodeMapper.selectListByPalletId(pallet.getId()));
+ if (palletItem == null) throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "鎵樼洏缂哄皯鍝佺锛岃鍏堢粦瀹氬悓鍝佺琚嬬爜");
+ itemId = MesProPalletItemResolver.merge(itemId, palletItem);
+ }
+ // 3. 绾ц仈鍑嗗锛氭墭鐩樹笅鏈粦鎵规鐨勮鐮侀殢鎵樼洏涓�璧峰綍鍏ユ壒娆★紝鍝佺椤讳笌鎵规宸叉湁琚嬬爜涓�鑷�
+ List<MesProBagCodeDO> bags = bagCodeMapper.selectUnboundListByPalletIds(ids);
+ List<Long> bindBagIds = new ArrayList<>();
+ Set<Long> bagItemIds = new LinkedHashSet<>();
+ for (MesProBagCodeDO bag : bags) {
+ if (!MesProBagCodeStatusEnum.GENERATED.getStatus().equals(bag.getStatus())
+ && !MesProBagCodeStatusEnum.PRINTED.getStatus().equals(bag.getStatus())) {
+ continue;
+ }
+ bindBagIds.add(bag.getId());
+ if (bag.getItemId() != null) {
+ bagItemIds.add(bag.getItemId());
+ }
+ }
+ if (!bindBagIds.isEmpty()) {
+ bagItemIds.addAll(bagCodeMapper.selectDistinctItemIdsByBatchId(batch.getId()));
+ if (itemId != null) bagItemIds.add(itemId);
+ if (bagItemIds.size() > 1) {
+ throw exception(PRO_BAG_CODE_BIND_BATCH_ITEM_MISMATCH);
+ }
+ }
+ // 4. 鍒嗛厤姝ｅ紡鎵樼洏鐮侊細鎵规鍙� + -P + 2 浣嶆墭鐩樺簭鍙凤紙鍚�昏緫鍒犻櫎璁板綍鍙備笌搴忓彿锛屼繚璇佷笉鍥為��銆佺爜鍊煎敮涓�锛�
int startNo = palletMapper.selectMaxPalletNo(batch.getId()) + 1;
for (int i = 0; i < pallets.size(); i++) {
int palletNo = startNo + i;
+ String palletCode = codeRedisDao.generate();
palletMapper.updateById(new MesProPalletDO()
.setId(pallets.get(i).getId())
- .setCode(batch.getCode() + "-P" + StrUtil.padPre(String.valueOf(palletNo), 2, '0'))
+ .setItemId(itemId)
+ .setCode(palletCode)
.setBatchId(batch.getId())
.setBatchCode(batch.getCode())
.setPalletNo(palletNo));
+ // 鎵樼洏涓嬭鐮佺殑鍐椾綑鎵樼洏鐮佺敱涓存椂鐮佹洿鏂颁负姝ｅ紡鐮�
+ bagCodeMapper.updatePalletCodeByPalletId(pallets.get(i).getId(),
+ palletCode);
}
- // 4. 鍥炲啓鎵规鎵樼洏鐮佹暟閲�
- batchMapper.updateById(new MesProBatchDO().setId(batch.getId())
- .setPalletQuantity((batch.getPalletQuantity() == null ? 0 : batch.getPalletQuantity()) + pallets.size()));
+ // 5. 鎵樼洏涓嬭鐮佹壒閲忕粦瀹氭湰鎵规
+ if (!bindBagIds.isEmpty() && bagCodeMapper.bindBatchByIds(bindBagIds, batch.getId(), batch.getCode(),
+ List.of(MesProBagCodeStatusEnum.GENERATED.getStatus(),
+ MesProBagCodeStatusEnum.PRINTED.getStatus())) != bindBagIds.size()) {
+ throw exception(PRO_BAG_CODE_STATUS_NOT_GENERATED);
+ }
+ // 6. 鍥炲啓鎵规鍝佺銆佹墭鐩樼爜鏁伴噺涓庢湁鏁堣鐮佹暟閲�
+ batchMapper.updateById(new MesProBatchDO().setId(batch.getId()).setItemId(itemId)
+ .setPalletQuantity((batch.getPalletQuantity() == null ? 0 : batch.getPalletQuantity()) + pallets.size())
+ .setBagQuantity(bagCodeMapper.selectEffectiveCountByBatchId(batch.getId())));
+ integrityService.recordBatchIntegrity(batch.getId());
return pallets.size();
}
@@ -178,6 +230,33 @@
}
@Override
+ public MesProPalletDO getPalletByScanCode(String code) {
+ return palletMapper.selectByScanCode(code);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int generateBusinessCodes(java.util.List<Long> ids) {
+ if (ids == null || ids.isEmpty() || ids.size() > 200 || ids.stream().anyMatch(java.util.Objects::isNull))
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "璇烽�夋嫨 1 鑷� 200 鏉¤褰�");
+ java.util.List<MesProPalletDO> records = new java.util.ArrayList<>();
+ for (Long id : ids.stream().distinct().sorted().toList()) {
+ MesProPalletDO record = palletMapper.selectByIdForUpdate(id);
+ if (record == null) throw exception(PRO_PALLET_NOT_EXISTS);
+ if (MesProPalletStatusEnum.CANCELED.getStatus().equals(record.getStatus()))
+ throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "宸蹭綔搴熻褰曚笉鍙ˉ鐢熸垚涓氬姟鐮�");
+ records.add(record);
+ }
+ int count = 0;
+ for (MesProPalletDO record : records) {
+ if (StrUtil.isNotBlank(record.getBusinessCode())) continue;
+ palletMapper.updateById(new MesProPalletDO().setId(record.getId()).setBusinessCode(codeRedisDao.generate()));
+ count++;
+ }
+ return count;
+ }
+
+ @Override
public MesProPalletDO getPalletByCode(String code) {
MesProPalletDO pallet = palletMapper.selectByCode(code);
if (pallet == null) {
@@ -206,6 +285,11 @@
}
@Override
+ public List<MesProPalletDO> getUnboundPalletList() {
+ return palletMapper.selectUnboundList();
+ }
+
+ @Override
public List<MesProPalletDO> getPalletListByIds(Collection<Long> ids) {
if (CollUtil.isEmpty(ids)) {
return List.of();
--
Gitblit v1.9.3