From bc9d77f6061a5c7f7deceaabc7c5ed6c17ad8c2f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 14:19:37 +0800
Subject: [PATCH] fix(wm/productissue): 修复物料匹配校验逻辑并迁移至 MDM 物料服务
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java
index fb69ac4..890312b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java
@@ -7,6 +7,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -26,6 +27,7 @@
.eqIfPresent(MesQcIpqcDO::getCheckResult, reqVO.getCheckResult())
.eqIfPresent(MesQcIpqcDO::getStatus, reqVO.getStatus())
.eqIfPresent(MesQcIpqcDO::getInspectorUserId, reqVO.getInspectorUserId())
+ .betweenIfPresent(MesQcIpqcDO::getInspectDate, reqVO.getInspectDate())
.orderByDesc(MesQcIpqcDO::getId));
}
@@ -40,4 +42,18 @@
.orderByDesc(MesQcIpqcDO::getId));
}
+ /**
+ * 鎸夊鍏ュ幓閲嶉敭鏌ヨ锛氬悓涓� 鐢熶骇宸ュ崟 + 妫�楠岀被鍨� + 宸ヤ綅 + 妫�娴嬫棩鏈� 瑙嗕负鍚屼竴鎵硅繃绋嬫楠屾暟鎹�
+ */
+ default List<MesQcIpqcDO> selectListByImportKey(Long workOrderId, Integer type, Long workstationId,
+ LocalDateTime inspectDate) {
+ return selectList(new LambdaQueryWrapperX<MesQcIpqcDO>()
+ .eq(MesQcIpqcDO::getWorkOrderId, workOrderId)
+ .eq(MesQcIpqcDO::getType, type)
+ .eq(MesQcIpqcDO::getWorkstationId, workstationId)
+ .eq(inspectDate != null, MesQcIpqcDO::getInspectDate, inspectDate)
+ .isNull(inspectDate == null, MesQcIpqcDO::getInspectDate)
+ .orderByAsc(MesQcIpqcDO::getId));
+ }
+
}
--
Gitblit v1.9.3