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 | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 a8508c0..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
@@ -113,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);
@@ -134,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());
}
// 鏍￠獙鐗╂枡鍒嗙被瀛樺湪
--
Gitblit v1.9.3