From 5072520172e8f45e3ccb8afc26cf0c8186ba4cdd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 19 十月 2026 16:31:42 +0800
Subject: [PATCH] refactor(mes): 重构质量管理和批次绑定功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java | 88 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 80 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java
index bae3140..084b5a0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/batch/MesProBatchServiceImpl.java
@@ -7,6 +7,10 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchPreGenerateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.batch.vo.MesProBatchSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.bagcode.vo.MesProBagCodeBindBatchReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.bagcode.MesProBagCodeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
import cn.iocoder.yudao.module.mes.controller.admin.pro.pallet.vo.MesProPalletBindBatchReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.batch.MesProBatchWorkerDO;
@@ -20,6 +24,8 @@
import cn.iocoder.yudao.module.mes.enums.pro.MesProBatchStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.pro.line.MesProLineService;
+import cn.iocoder.yudao.module.mes.service.pro.bagcode.MesProBagCodeService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletService;
import cn.iocoder.yudao.module.mes.service.trace.integrity.MesTraceIntegrityService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -61,6 +67,12 @@
@Resource
private MesProPalletService palletService;
+ @Resource
+ private MesProBagCodeService bagCodeService;
+ @Resource
+ private MesMdmItemService mdmItemService;
+ @Resource
+ private MdmUnitMeasureApi unitMeasureApi;
@Resource
private MesCodeRedisDAO codeRedisDao;
@@ -86,7 +98,7 @@
String code = generateBatchCode(line.getCode());
// 3. 鎻掑叆鎵规锛堜骇绾跨紪鐮�/鍚嶇О鍐椾綑鍥炲～锛涘嬀閫夌粦瀹氭墭鐩樻椂鎵规鐩存帴杩涘叆鐢熶骇涓級
- boolean bindPallets = CollUtil.isNotEmpty(createReqVO.getPalletIds());
+ boolean hasBindings = hasBindings(createReqVO);
MesProBatchDO batch = BeanUtils.toBean(createReqVO, MesProBatchDO.class)
.setCode(code)
.setBusinessCode(codeRedisDao.generate())
@@ -94,7 +106,7 @@
.setLineName(line.getName())
.setBagQuantity(0)
.setPalletQuantity(0)
- .setStatus(bindPallets ? MesProBatchStatusEnum.PRODUCING.getStatus()
+ .setStatus(hasBindings ? MesProBatchStatusEnum.PRODUCING.getStatus()
: MesProBatchStatusEnum.DRAFT.getStatus());
batchMapper.insert(batch);
@@ -102,6 +114,7 @@
insertBatchWorkers(batch.getId(), createReqVO.getWorkers());
// 5. 缁戝畾鎵樼洏锛堢骇鑱旂敓鎴愭寮忔墭鐩樼爜骞跺綍鍏ユ墭鐩樹笅琚嬬爜锛屽け璐ユ暣浣撳洖婊氾級
bindPalletsToBatch(batch.getId(), createReqVO.getPalletIds());
+ bindTonBagsToBatch(batch.getId(), createReqVO.getTonBagIds());
// 6. 鐢熸垚鎵规瀹屾暣鎬ф憳瑕�
integrityService.recordBatchIntegrity(batch.getId());
return batch.getId();
@@ -145,12 +158,12 @@
fillReqVO.setItemId(resolveBindingItem(batch, fillReqVO));
String code = generateBatchCode(line.getCode());
// 3. 钀藉簱涓氬姟淇℃伅锛堜繚鐣欎复鏃舵壒娆＄爜鐢ㄤ簬鍘嗗彶鎵爜杩芥函锛涗骇绾跨紪鐮�/鍚嶇О鍐椾綑鍥炲～锛涘嬀閫夌粦瀹氭墭鐩樻椂鎵规鐩存帴杩涘叆鐢熶骇涓級
- boolean bindPallets = CollUtil.isNotEmpty(fillReqVO.getPalletIds());
+ boolean hasBindings = hasBindings(fillReqVO);
MesProBatchDO updateObj = BeanUtils.toBean(fillReqVO, MesProBatchDO.class)
.setCode(code)
.setLineCode(line.getCode())
.setLineName(line.getName())
- .setStatus(bindPallets ? MesProBatchStatusEnum.PRODUCING.getStatus()
+ .setStatus(hasBindings ? MesProBatchStatusEnum.PRODUCING.getStatus()
: MesProBatchStatusEnum.DRAFT.getStatus());
batchMapper.updateById(updateObj);
// 4. 閲嶅缓鐢熶骇浜哄憳閰嶇疆
@@ -158,6 +171,7 @@
insertBatchWorkers(fillReqVO.getId(), fillReqVO.getWorkers());
// 5. 缁戝畾鎵樼洏锛堢骇鑱旂敓鎴愭寮忔墭鐩樼爜骞跺綍鍏ユ墭鐩樹笅琚嬬爜锛屽け璐ユ暣浣撳洖婊氾級
bindPalletsToBatch(fillReqVO.getId(), fillReqVO.getPalletIds());
+ bindTonBagsToBatch(fillReqVO.getId(), fillReqVO.getTonBagIds());
// 6. 鐢熸垚鎵规瀹屾暣鎬ф憳瑕侊紙琛ュ綍姝ｅ紡淇℃伅鍚庤鐩栵級
integrityService.recordBatchIntegrity(fillReqVO.getId());
}
@@ -187,9 +201,9 @@
updateObj.setLineCode(line.getCode()).setLineName(line.getName());
}
// 4. 鏇存柊鎵规锛堝嬀閫夌粦瀹氭墭鐩樻椂鎵规鐩存帴杩涘叆鐢熶骇涓紱鍙栨秷鍕鹃�変笉鍥為��锛屽凡缁戝畾鎵樼洏涓嶅彲瑙ｇ粦锛�
- boolean bindPallets = CollUtil.isNotEmpty(updateReqVO.getPalletIds());
+ boolean hasBindings = hasBindings(updateReqVO);
updateObj.setCode(code);
- if (bindPallets) {
+ if (hasBindings) {
updateObj.setStatus(MesProBatchStatusEnum.PRODUCING.getStatus());
}
batchMapper.updateById(updateObj);
@@ -199,6 +213,7 @@
insertBatchWorkers(updateReqVO.getId(), updateReqVO.getWorkers());
// 6. 缁戝畾鏂板鍕鹃�夌殑鎵樼洏锛堢骇鑱旂敓鎴愭寮忔墭鐩樼爜骞跺綍鍏ユ墭鐩樹笅琚嬬爜锛屽け璐ユ暣浣撳洖婊氾級
bindPalletsToBatch(updateReqVO.getId(), updateReqVO.getPalletIds());
+ bindTonBagsToBatch(updateReqVO.getId(), updateReqVO.getTonBagIds());
// 7. 鎽樿瑕嗙洊鑼冨洿鍚搧绉�/浜х嚎/鐢熶骇鏃ユ湡/璁″垝鏁伴噺锛岀紪杈戝悗閲嶆柊鐢熸垚閬垮厤璇姤绡℃敼
integrityService.recordBatchIntegrity(updateReqVO.getId());
}
@@ -252,6 +267,18 @@
@Override
public MesProBatchDO getBatch(Long id) {
return batchMapper.selectById(id);
+ }
+
+ @Override
+ public String getBindingMode(Long id) {
+ if (!palletMapper.selectListByBatchId(id).isEmpty()) return "pallet";
+ return bagCodeMapper.selectListByBatchId(id).stream()
+ .filter(bag -> bag.getPalletId() == null)
+ .map(MesProBagCodeDO::getItemId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .anyMatch(this::isTonItem)
+ ? "tonBag" : null;
}
@Override
@@ -344,6 +371,15 @@
* 鐢熸垚姝ｅ紡鎵樼洏鐮佸苟绾ц仈褰曞叆鎵樼洏涓嬫湭缁戞壒娆＄殑琚嬬爜锛屽け璐ユ暣浣撳洖婊�
*/
private Long resolveBindingItem(MesProBatchDO batch, MesProBatchSaveReqVO req) {
+ boolean palletsRequested = CollUtil.isNotEmpty(req.getPalletIds());
+ boolean tonsRequested = CollUtil.isNotEmpty(req.getTonBagIds());
+ if (palletsRequested && tonsRequested) throw bindingError("缁戝畾鎵樼洏鍜岀粦瀹氬惃琚嬪彧鑳介�夋嫨涓�绉�");
+ if (batch != null && (palletsRequested || tonsRequested)) {
+ String existingMode = getBindingMode(batch.getId());
+ if ((tonsRequested && "pallet".equals(existingMode))
+ || (palletsRequested && "tonBag".equals(existingMode)))
+ throw bindingError("璇ユ壒娆″凡缁戝畾鍙︿竴绉嶇爜锛岀粦瀹氭墭鐩樺拰缁戝畾鍚ㄨ鍙兘閫夋嫨涓�绉�");
+ }
Long itemId = batch == null ? null : batch.getItemId();
if (batch != null) {
for (Long existing : bagCodeMapper.selectDistinctItemIdsByBatchId(batch.getId()))
@@ -359,12 +395,48 @@
if (candidate == null) throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "鎵樼洏缂哄皯鍝佺锛岃鍏堢粦瀹氬悓鍝佺琚嬬爜");
itemId = cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletItemResolver.merge(itemId, candidate);
}
- // 璇锋眰閲岀殑鍝佺鍙兘涓庡凡缁戝畾/寰呯粦瀹氭墭鐩樹竴鑷达紝涓嶈兘閫氳繃缂栬緫鏀瑰彉鎵规鍝佺銆�
+ if (tonsRequested) {
+ if (req.getTonBagIds().contains(null)) throw bindingError("璇烽�夋嫨鏈夋晥鐨勫惃琚�");
+ List<Long> ids = req.getTonBagIds().stream().distinct().sorted().toList();
+ List<MesProBagCodeDO> bags = bagCodeMapper.selectListByIdsForUpdate(ids);
+ if (bags.size() != ids.size()) throw bindingError("鎵�閫夊惃琚嬩笉瀛樺湪");
+ for (MesProBagCodeDO bag : bags) {
+ if (bag.getBatchId() != null || bag.getPalletId() != null || !isTonItem(bag.getItemId()))
+ throw bindingError("鍙兘缁戝畾鏈綍鍏ユ壒娆°�佹病鏈夋墭鐩樹笖璁￠噺鍗曚綅涓哄惃鐨勮鐮�");
+ itemId = cn.iocoder.yudao.module.mes.service.pro.pallet.MesProPalletItemResolver.merge(itemId, bag.getItemId());
+ }
+ }
+ // 璇锋眰閲岀殑鍝佺鍙兘涓庡凡缁戝畾鎴栧緟缁戝畾鐨勬墭鐩�/鍚ㄨ涓�鑷达紝涓嶈兘閫氳繃缂栬緫鏀瑰彉鎵规鍝佺銆�
if (req.getItemId() != null && !Objects.equals(req.getItemId(), itemId))
- throw new cn.iocoder.yudao.framework.common.exception.ServiceException(400, "鍝佺鐢辩粦瀹氭墭鐩樺甫鍏ワ紝涓嶅彲淇敼涓哄叾浠栧搧绉�");
+ throw bindingError("鍝佺鐢辩粦瀹氭墭鐩樻垨鍚ㄨ甯﹀叆锛屼笉鍙慨鏀逛负鍏朵粬鍝佺");
return itemId;
}
+ private boolean hasBindings(MesProBatchSaveReqVO req) {
+ return CollUtil.isNotEmpty(req.getPalletIds()) || CollUtil.isNotEmpty(req.getTonBagIds());
+ }
+
+ private boolean isTonItem(Long itemId) {
+ if (itemId == null) return false;
+ MesMdmItemDO item = mdmItemService.getItem(itemId);
+ if (item == null || item.getUnitMeasureId() == null) return false;
+ var result = unitMeasureApi.getUnitMeasure(item.getUnitMeasureId());
+ return result != null && result.isSuccess() && result.getData() != null
+ && "鍚�".equals(StrUtil.trim(result.getData().getType()));
+ }
+
+ private cn.iocoder.yudao.framework.common.exception.ServiceException bindingError(String message) {
+ return new cn.iocoder.yudao.framework.common.exception.ServiceException(400, message);
+ }
+
+ private void bindTonBagsToBatch(Long batchId, List<Long> tonBagIds) {
+ if (CollUtil.isEmpty(tonBagIds)) return;
+ MesProBagCodeBindBatchReqVO req = new MesProBagCodeBindBatchReqVO();
+ req.setBatchId(batchId);
+ req.setIds(tonBagIds);
+ bagCodeService.bindBatch(req);
+ }
+
private void bindPalletsToBatch(Long batchId, List<Long> palletIds) {
if (CollUtil.isEmpty(palletIds)) {
return;
--
Gitblit v1.9.3