From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 b43e40f..afcd3b4 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;
@@ -112,9 +113,9 @@
@Transactional(rollbackFor = Exception.class)
public void updateItem(MesMdItemSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪
- validateItemExists(updateReqVO.getId());
+ MesMdItemDO existingItem = validateItemExists(updateReqVO.getId());
// 鏍￠獙鏁版嵁
- validateItemSaveData(updateReqVO);
+ validateItemSaveData(updateReqVO, existingItem);
// 鏇存柊
MesMdItemDO updateObj = BeanUtils.toBean(updateReqVO, MesMdItemDO.class);
@@ -133,10 +134,17 @@
}
private void validateItemSaveData(MesMdItemSaveReqVO reqVO) {
+ validateItemSaveData(reqVO, null);
+ }
+
+ private void validateItemSaveData(MesMdItemSaveReqVO reqVO, MesMdItemDO existingItem) {
// 鏍￠獙鐗╂枡缂栫爜鐨勫敮涓�鎬�
validateItemCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍￠獙鐗╂枡鍚嶇О鐨勫敮涓�鎬э細MDM 涓绘暟鎹互缂栫爜涓哄敮涓�鏍囪瘑锛屽厑璁稿悓鍚嶄笉鍚岃鏍�
- if (reqVO.getMdmItemId() == null) {
+ // 鏍￠獙鐗╂枡鍚嶇О鐨勫敮涓�鎬э細MDM 涓绘暟鎹互缂栫爜涓哄敮涓�鏍囪瘑锛屽厑璁稿悓鍚嶄笉鍚岃鏍笺��
+ // 鏇存柊鏃跺墠绔彲鑳芥湭鍥炰紶 mdmItemId锛岄渶瑕佷互搴撲腑璁板綍鐨勬潵婧愪负鍑嗭紝鍚﹀垯浼氳鍒や负鏈湴鐗╂枡
+ boolean mdmItem = reqVO.getMdmItemId() != null
+ || (existingItem != null && existingItem.getMdmItemId() != null);
+ if (!mdmItem) {
validateItemNameUnique(reqVO.getId(), reqVO.getName());
}
// 鏍￠獙鐗╂枡鍒嗙被瀛樺湪
@@ -290,8 +298,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
@@ -419,4 +438,4 @@
return item;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3