From bc9d77f6061a5c7f7deceaabc7c5ed6c17ad8c2f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 14:19:37 +0800
Subject: [PATCH] fix(wm/productissue): 修复物料匹配校验逻辑并迁移至 MDM 物料服务
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java
index 2b84d90..1551481 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueLineServiceImpl.java
@@ -9,16 +9,16 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineReturnableRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueLineMapper;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductIssueStatusEnum;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueDetailService;
import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueLineService;
@@ -35,6 +35,8 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -53,7 +55,7 @@
@Lazy
private MesWmProductIssueService issueService;
@Resource
- private MesMdItemService mdmItemService;
+ private MesMdmItemService mdmItemService;
@Resource
@Lazy
private MesWmReturnIssueLineService returnIssueLineService;
@@ -158,10 +160,30 @@
private void validateProductIssueLineSaveData(MesWmProductIssueLineSaveReqVO reqVO) {
// 鏍￠獙鐖舵暟鎹瓨鍦� + 鑽夌鐘舵�佹墠鍏佽鏂板/淇敼琛�
issueService.validateProductIssueExistsAndPrepare(reqVO.getIssueId());
+ // 鏍￠獙鐗╂枡瀛樺湪涓斿惎鐢紙itemId 鍙ｅ緞涓� MDM 鐗╂枡涓绘暟鎹� mdm_item.id锛�
+ validateIssueItemExistsAndEnable(reqVO.getItemId());
// 鏍￠獙鐗╂枡鍦ㄥ伐鍗� BOM 涓�
validateItemInWorkOrderBom(reqVO.getIssueId(), reqVO.getItemId());
- // 鏍￠獙鐗╂枡瀛樺湪
- mdmItemService.validateItemExists(reqVO.getItemId());
+ }
+
+ /**
+ * 鏍￠獙棰嗘枡鐗╂枡鍦� MDM 鐗╂枡涓绘暟鎹腑瀛樺湪涓斿凡鍚敤
+ *
+ * 鍒嗗埆缁欏嚭銆屾煡涓嶅埌璇ョ墿鏂欍�嶃�岀墿鏂欏凡鍋滅敤銆嶄袱绉嶅叿浣撳師鍥狅紝骞跺甫涓婄墿鏂欑殑涓氬姟鏍囪瘑涓庝笅涓�姝ュ姩浣滐紝
+ * 閬垮厤缁熶竴鎶涘嚭绗肩粺鐨勨�滅墿鏂欎笉瀛樺湪鈥濊鐢ㄦ埛鏃犱粠鍒ゆ柇銆�
+ */
+ private void validateIssueItemExistsAndEnable(Long itemId) {
+ MesMdmItemDO item = mdmItemService.getItem(itemId);
+ if (item == null) {
+ throw new ServiceException(MD_ITEM_NOT_EXISTS.getCode(),
+ "棰嗘枡鍑哄簱鍗曡鐗╂枡涓嶅瓨鍦細鎻愪氦鐨勭墿鏂欑紪鍙穂ID=" + itemId + "]鍦� MDM 鐗╂枡涓绘暟鎹腑鏌ヤ笉鍒般��"
+ + "璇烽噸鏂伴�夋嫨鐗╂枡锛涜嫢璇ョ墿鏂欏凡琚垹闄わ紝璇锋敼閫夊叾瀹冪墿鏂欍��");
+ }
+ if (item.getStatus() != null && item.getStatus() == 1) {
+ throw new ServiceException(MD_ITEM_IS_DISABLE.getCode(),
+ "棰嗘枡鍑哄簱鍗曡鐗╂枡宸插仠鐢細鐗╂枡[" + item.getCode() + " " + item.getName() + "]褰撳墠涓哄仠鐢ㄧ姸鎬侊紝涓嶈兘棰嗘枡鍑哄簱銆�"
+ + "璇峰厛鍦ㄣ�屽熀纭�鏁版嵁 - MDM 鐗╂枡銆嶄腑鍚敤璇ョ墿鏂欙紝鎴栨敼閫夊叾瀹冨凡鍚敤鐨勭墿鏂欍��");
+ }
}
private void validateItemInWorkOrderBom(Long issueId, Long itemId) {
@@ -206,10 +228,10 @@
}
// 4. 鎵归噺鏌ヨ鐗╂枡鍜屽崟浣嶄俊鎭�
- Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
CollectionUtils.convertSet(lines, MesWmProductIssueLineDO::getItemId));
Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
- CollectionUtils.convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ CollectionUtils.convertSet(itemMap.values(), MesMdmItemDO::getUnitMeasureId));
// 5. 缁勮缁撴灉锛岃繃婊ゅ彲閫�鏁伴噺 > 0 鐨勮
List<MesWmProductIssueLineReturnableRespVO> result = new ArrayList<>();
@@ -226,7 +248,7 @@
vo.setQuantity(returnableQty);
// 濉厖鐗╂枡淇℃伅
- MesMdItemDO item = itemMap.get(line.getItemId());
+ MesMdmItemDO item = itemMap.get(line.getItemId());
if (item != null) {
vo.setItemCode(item.getCode());
vo.setItemName(item.getName());
--
Gitblit v1.9.3