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/dal/mysql/md/item/MesMdItemMapper.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
index 764c5b6..fa88c4d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
@@ -26,14 +26,19 @@
@Mapper
public interface MesMdItemMapper extends BaseMapperX<MesMdItemDO> {
- default PageResult<MesMdItemDO> selectPage(MesMdItemPageReqVO reqVO, Collection<Long> itemTypeIds) {
- return selectPage(reqVO, new LambdaQueryWrapperX<MesMdItemDO>()
+ default PageResult<MesMdItemDO> selectPage(MesMdItemPageReqVO reqVO, Collection<Long> itemTypeIds,
+ Collection<Long> excludedItemTypeIds) {
+ LambdaQueryWrapperX<MesMdItemDO> query = new LambdaQueryWrapperX<MesMdItemDO>()
.inIfPresent(MesMdItemDO::getId, reqVO.getIds())
.likeIfPresent(MesMdItemDO::getCode, reqVO.getCode())
.likeIfPresent(MesMdItemDO::getName, reqVO.getName())
.inIfPresent(MesMdItemDO::getItemTypeId, itemTypeIds)
.eqIfPresent(MesMdItemDO::getStatus, reqVO.getStatus())
- .betweenIfPresent(MesMdItemDO::getCreateTime, reqVO.getCreateTime())
+ .betweenIfPresent(MesMdItemDO::getCreateTime, reqVO.getCreateTime());
+ if (CollUtil.isNotEmpty(excludedItemTypeIds)) {
+ query.notIn(MesMdItemDO::getItemTypeId, excludedItemTypeIds);
+ }
+ return selectPage(reqVO, query
.orderByAsc(MesMdItemDO::getSort)
.orderByDesc(MesMdItemDO::getId));
}
--
Gitblit v1.9.3