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 | 16 ++++++++++++++--
1 files changed, 14 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 b43e40f..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;
@@ -290,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
@@ -419,4 +431,4 @@
return item;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3