From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 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 1102aef..2300bb2 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
@@ -396,12 +396,13 @@
*/
private void syncItemToMdm(MesMdItemDO item, MesMdItemSaveReqVO saveReqVO) {
// 1. 鑾峰彇鐗╂枡绫诲瀷瀵瑰簲鐨� itemType
- Integer itemType = null;
+ Long itemType = null;
if (item.getItemTypeId() != null) {
MesMdItemTypeDO itemTypeDO = itemTypeService.getItemType(item.getItemTypeId());
if (itemTypeDO != null) {
// MES: ITEM=鐗╂枡, PRODUCT=浜у搧 -> MDM: 1=鍘熸枡, 2=鍗婃垚鍝�, 3=鎴愬搧, 4=杈呮枡
- itemType = convertMesItemTypeToMdm(itemTypeDO.getItemOrProduct(), itemTypeDO.getName());
+// itemType = convertMesItemTypeToMdm(itemTypeDO.getItemOrProduct(), itemTypeDO.getName());
+ itemType = itemTypeDO.getId();
}
}
@@ -477,4 +478,21 @@
return 1; // 榛樿鍘熸枡
}
+ @Override
+ public MesMdItemDO getItemByMdmItemId(Long mdmItemId) {
+ if (mdmItemId == null) {
+ return null;
+ }
+ return itemMapper.selectByMdmItemId(mdmItemId);
+ }
+
+ @Override
+ public MesMdItemDO validateItemExistsByMdmItemId(Long mdmItemId) {
+ MesMdItemDO item = getItemByMdmItemId(mdmItemId);
+ if (item == null) {
+ throw exception(MD_ITEM_NOT_EXISTS);
+ }
+ return item;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3