From 975fe5248cc1f3d999f4d660fc331570110c4968 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 08 十月 2026 13:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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..012ba93 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
@@ -80,6 +80,12 @@
updateItem(createReqVO);
return createReqVO.getId();
}
+ // 瀛樺湪閫昏緫鍒犻櫎璁板綍锛堝彇娑堝悓姝ュ悗閲嶆柊鍚屾锛夛細鎭㈠璇ヨ褰曞悗璧版洿鏂帮紝閬垮厤涓婚敭鍐茬獊
+ if (itemMapper.selectAnyById(createReqVO.getId()) != null) {
+ itemMapper.restoreById(createReqVO.getId());
+ updateItem(createReqVO);
+ return createReqVO.getId();
+ }
}
// 鎻掑叆
@@ -131,8 +137,10 @@
validateItemCodeUnique(reqVO.getId(), reqVO.getCode());
// 鏍￠獙鐗╂枡鍚嶇О鐨勫敮涓�鎬�
validateItemNameUnique(reqVO.getId(), reqVO.getName());
- // 鏍￠獙鐗╂枡鍒嗙被瀛樺湪
- validateItemTypeExists(reqVO.getItemTypeId());
+ // 鏍￠獙鐗╂枡鍒嗙被瀛樺湪锛圡DM 鍝佺鍚屾涓嶄紶鍒嗙被锛屽厑璁镐负绌猴級
+ if (reqVO.getItemTypeId() != null) {
+ validateItemTypeExists(reqVO.getItemTypeId());
+ }
// 鏍￠獙璁￠噺鍗曚綅瀛樺湪
validateUnitMeasureExists(reqVO.getUnitMeasureId());
}
--
Gitblit v1.9.3