From 4dc00a72e6229e7fdcd6055132cfb4128da1774f Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 28 九月 2026 14:53:40 +0800
Subject: [PATCH] 宁夏万通需求：生产领料取消三个字段必填；来料检验质检方案与产品物料解绑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/indicator/MesQcIndicatorMapper.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/indicator/MesQcIndicatorMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/indicator/MesQcIndicatorMapper.java
index b13f2f2..406d9c1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/indicator/MesQcIndicatorMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/indicator/MesQcIndicatorMapper.java
@@ -8,11 +8,12 @@
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
+import java.util.Objects;
/**
* MES 璐ㄦ鎸囨爣 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesQcIndicatorMapper extends BaseMapperX<MesQcIndicatorDO> {
@@ -23,6 +24,7 @@
.likeIfPresent(MesQcIndicatorDO::getName, reqVO.getName())
.eqIfPresent(MesQcIndicatorDO::getType, reqVO.getType())
.eqIfPresent(MesQcIndicatorDO::getResultType, reqVO.getResultType())
+ .eqIfPresent(MesQcIndicatorDO::getItemType, reqVO.getItemType())
.orderByDesc(MesQcIndicatorDO::getId));
}
@@ -39,4 +41,34 @@
.orderByDesc(MesQcIndicatorDO::getId));
}
+ default List<MesQcIndicatorDO> selectListByItemType(Integer itemType) {
+ return selectList(new LambdaQueryWrapperX<MesQcIndicatorDO>()
+ .eq(MesQcIndicatorDO::getItemType, itemType)
+ .orderByAsc(MesQcIndicatorDO::getSortOrder)
+ .orderByAsc(MesQcIndicatorDO::getId));
+ }
+
+ default List<MesQcIndicatorDO> selectListByParentId(Long parentId) {
+ return selectList(new LambdaQueryWrapperX<MesQcIndicatorDO>()
+ .eq(MesQcIndicatorDO::getParentId, parentId)
+ .orderByAsc(MesQcIndicatorDO::getSortOrder)
+ .orderByAsc(MesQcIndicatorDO::getId));
+ }
+
+ default Long selectCountByParentId(Long parentId) {
+ return selectCount(new LambdaQueryWrapperX<MesQcIndicatorDO>()
+ .eq(MesQcIndicatorDO::getParentId, parentId));
+ }
+
+ /**
+ * 鍙栧悓绾ф渶澶х殑鎺掑簭鍙凤紱鍚岀骇娌℃湁璁板綍鏃惰繑鍥� null
+ */
+ default Integer selectMaxSortOrder(Long parentId) {
+ return selectListByParentId(parentId).stream()
+ .map(MesQcIndicatorDO::getSortOrder)
+ .filter(Objects::nonNull)
+ .max(Integer::compareTo)
+ .orElse(null);
+ }
+
}
--
Gitblit v1.9.3