From 381e02b9eccbe953b31d09f2af1c2ce77c816140 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 14:51:05 +0800
Subject: [PATCH] fix(mes): 隔离设备物料并支持销售产品映射
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java
index 5a46e79..a8508c0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemPageReqVO;
@@ -80,6 +81,12 @@
updateItem(createReqVO);
return createReqVO.getId();
}
+ // 瀛樺湪閫昏緫鍒犻櫎璁板綍锛堝彇娑堝悓姝ュ悗閲嶆柊鍚屾锛夛細鎭㈠璇ヨ褰曞悗璧版洿鏂帮紝閬垮厤涓婚敭鍐茬獊
+ if (itemMapper.selectAnyById(createReqVO.getId()) != null) {
+ itemMapper.restoreById(createReqVO.getId());
+ updateItem(createReqVO);
+ return createReqVO.getId();
+ }
}
// 鎻掑叆
@@ -129,8 +136,10 @@
private void validateItemSaveData(MesMdItemSaveReqVO reqVO) {
// 鏍￠獙鐗╂枡缂栫爜鐨勫敮涓�鎬�
validateItemCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙鐗╂枡鍚嶇О鐨勫敮涓�鎬�
- validateItemNameUnique(reqVO.getId(), reqVO.getName());
+ // 鏍￠獙鐗╂枡鍚嶇О鐨勫敮涓�鎬э細MDM 涓绘暟鎹互缂栫爜涓哄敮涓�鏍囪瘑锛屽厑璁稿悓鍚嶄笉鍚岃鏍�
+ if (reqVO.getMdmItemId() == null) {
+ validateItemNameUnique(reqVO.getId(), reqVO.getName());
+ }
// 鏍￠獙鐗╂枡鍒嗙被瀛樺湪
validateItemTypeExists(reqVO.getItemTypeId());
// 鏍￠獙璁￠噺鍗曚綅瀛樺湪
@@ -206,11 +215,9 @@
}
private void validateItemNameUnique(Long id, String name) {
- MesMdItemDO item = itemMapper.selectByName(name);
- if (item == null) {
- return;
- }
- if (ObjUtil.notEqual(item.getId(), id)) {
+ // 浣跨敤鍒楄〃鏌ヨ锛氬瓨閲忔暟鎹彲鑳藉瓨鍦ㄥ悓鍚嶇墿鏂欙紝閬垮厤 selectOne 鐩存帴鎶涘紓甯�
+ List<MesMdItemDO> items = itemMapper.selectList(MesMdItemDO::getName, name);
+ if (items.stream().anyMatch(item -> ObjUtil.notEqual(item.getId(), id))) {
throw exception(MD_ITEM_NAME_DUPLICATE);
}
}
@@ -284,8 +291,19 @@
List<MesMdItemTypeDO> children = itemTypeService.getItemTypeChildrenList(pageReqVO.getItemTypeId());
itemTypeIds.addAll(convertSet(children, MesMdItemTypeDO::getId));
}
+ // 鐢熶骇鐗╂枡绠＄悊绛夐〉闈㈠彲鎸夊垎绫荤紪鐮佹帓闄よ澶囧強鍏跺瓙鍒嗙被锛涘簳灞傝澶囦富鏁版嵁浠嶄繚鐣欑粰璁惧浠撳拰搴撳瓨娴佹按浣跨敤銆�
+ Set<Long> excludedItemTypeIds = null;
+ if (StrUtil.isNotBlank(pageReqVO.getExcludeItemTypeCode())) {
+ MesMdItemTypeDO excludedType = itemTypeService.getItemTypeByCode(pageReqVO.getExcludeItemTypeCode());
+ if (excludedType != null) {
+ excludedItemTypeIds = new HashSet<>();
+ excludedItemTypeIds.add(excludedType.getId());
+ List<MesMdItemTypeDO> children = itemTypeService.getItemTypeChildrenList(excludedType.getId());
+ excludedItemTypeIds.addAll(convertSet(children, MesMdItemTypeDO::getId));
+ }
+ }
// 鍒嗛〉鏌ヨ
- return itemMapper.selectPage(pageReqVO, itemTypeIds);
+ return itemMapper.selectPage(pageReqVO, itemTypeIds, excludedItemTypeIds);
}
@Override
@@ -413,4 +431,4 @@
return item;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3