From ffca46b39d25439a06a27cafda2ec523a3fb67cf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 17:53:02 +0800
Subject: [PATCH] feat(mes): 增加盘号字段支持和优化报工质检流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java
index a84dda6..3905288 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java
@@ -6,9 +6,14 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchProcessTraceRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchPurchaseSourceRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchSalesTargetRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.sn.MesWmSnDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.batch.MesWmBatchMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.sn.MesWmSnMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
@@ -24,6 +29,7 @@
import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -34,7 +40,7 @@
/**
* 鎵规绠＄悊 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -52,6 +58,8 @@
@Resource
private MesMdmItemService mdmItemService;
@Resource
+ private MesWmSnMapper snMapper;
+ @Resource
private MdmItemBatchConfigApi itemBatchConfigApi;
@Resource
private MesMdAutoCodeRecordService autoCodeRecordService;
@@ -62,9 +70,7 @@
@Override
public PageResult<MesWmBatchDO> getBatchPage(MesWmBatchPageReqVO pageReqVO) {
- // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
- List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
- return batchMapper.selectPage(pageReqVO, permittedClientIds);
+ return batchMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -78,11 +84,16 @@
}
@Override
+ public List<MesWmBatchDO> getBatchList(java.util.Collection<Long> ids) {
+ return CollUtil.isEmpty(ids) ? java.util.Collections.emptyList() : batchMapper.selectByIds(ids);
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public MesWmBatchDO getOrGenerateBatchCode(MesWmBatchGenerateReqVO reqVO) {
// 1.1 鏌ヨ鐗╂枡淇℃伅锛屾鏌ユ槸鍚﹀惎鐢ㄦ壒娆＄鐞�
MesMdmItemDO item = mdmItemService.validateItemExists(reqVO.getItemId());
- if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
+ if (Boolean.FALSE.equals(item.getIsBatchManaged()) && StrUtil.isBlank(reqVO.getReelNo())) {
// 鏈惎鐢ㄦ壒娆＄鐞嗭紝杩斿洖 null
return null;
}
@@ -95,7 +106,8 @@
MdmItemBatchConfigRespDTO config = itemBatchConfigApi.getItemBatchConfig(reqVO.getItemId());
// 2. 鏍规嵁閰嶇疆鏍￠獙蹇呭～鍙傛暟骞舵竻绌轰笉闇�瑕佺殑鍙傛暟
- MesWmBatchDO batch = MesWmBatchDO.builder().itemId(reqVO.getItemId()).build();
+ String reelNo = StrUtil.isBlank(reqVO.getReelNo()) ? null : reqVO.getReelNo();
+ MesWmBatchDO batch = MesWmBatchDO.builder().itemId(reqVO.getItemId()).reelNo(reelNo).build();
if (config != null) {
// ========== 蹇呭～鏍￠獙锛坒lag=true 琛ㄧず璇ュ瓧娈典负蹇呭～锛� ==========
// 鐢熶骇鏃ユ湡
@@ -207,6 +219,15 @@
// 鏍￠獙鐗╂枡鏄惁鍖归厤
if (!existingBatch.getItemId().equals(reqVO.getItemId())) {
throw exception(WM_BATCH_ITEM_MISMATCH);
+ }
+ // 宸叉湁鎵规涓嶈兘鏀瑰彉鐩樺彿锛岄伩鍏嶅巻鍙插簱瀛樿璇爣鎴栦笉鍚岀洏鍙锋贩鍚堛��
+ String existingReelNo = StrUtil.isBlank(existingBatch.getReelNo()) ? null : existingBatch.getReelNo();
+ if (!ObjUtil.equal(existingReelNo, reelNo)) {
+ throw exception(WM_BATCH_REEL_MISMATCH);
+ }
+ if (existingReelNo != null && !ObjUtil.equal(existingBatch.getWorkOrderId(), reqVO.getWorkOrderId())) {
+ // 宸叉湁杩芥函鎵规涓嶈兘琚彟涓�宸ュ崟澶嶇敤骞惰鐩栨潵婧愩��
+ throw exception(WM_BATCH_REEL_MISMATCH);
}
// 鏇存柊鎵规灞炴�э紙浠呮洿鏂颁紶鍏ョ殑闈炵┖鍊硷級
updateBatchProperties(existingBatch, batch);
@@ -372,4 +393,39 @@
return batchMapper.selectCountByToolId(toolId);
}
+ @Override
+ public List<MesWmBatchPurchaseSourceRespVO> getPurchaseSourceList(String code) {
+ return batchMapper.selectPurchaseSourceList(code);
+ }
+
+ @Override
+ public List<MesWmBatchSalesTargetRespVO> getSalesTargetList(String code) {
+ return batchMapper.selectSalesTargetList(code);
+ }
+
+ @Override
+ public List<MesWmBatchProcessTraceRespVO> getProcessTraceList(String code) {
+ List<MesWmBatchProcessTraceRespVO> list = batchMapper.selectProcessTraceList(code);
+ if (CollUtil.isEmpty(list)) {
+ return list;
+ }
+ // 鎸夊伐鍗曘�佸伐搴忓簭鍙枫�佷簨浠舵椂闂存帓搴忥紙sort 鍙兘涓虹┖锛岀┖鍊煎厹搴曪級
+ list.sort(Comparator.comparing(MesWmBatchProcessTraceRespVO::getWorkOrderId,
+ Comparator.nullsLast(Comparator.naturalOrder()))
+ .thenComparing(MesWmBatchProcessTraceRespVO::getProcessSort,
+ Comparator.nullsLast(Comparator.naturalOrder()))
+ .thenComparing(MesWmBatchProcessTraceRespVO::getEventTime,
+ Comparator.nullsLast(Comparator.naturalOrder())));
+ return list;
+ }
+
+ @Override
+ public MesWmBatchDO getBatchBySn(String sn) {
+ MesWmSnDO snDO = snMapper.selectOne(MesWmSnDO::getCode, sn);
+ if (snDO == null || StrUtil.isBlank(snDO.getBatchCode())) {
+ return null;
+ }
+ return batchMapper.selectByCode(snDO.getBatchCode());
+ }
+
}
--
Gitblit v1.9.3