From fbc80648adf176fed54046c3aa52173b20e5d12e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 14:57:32 +0800
Subject: [PATCH] 宁夏万通需求：商机状态组改为非必填；过程检验单生产订单、工位改为非必填
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 890312b..d670725 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
@@ -48,9 +48,12 @@
default List<MesQcIpqcDO> selectListByImportKey(Long workOrderId, Integer type, Long workstationId,
LocalDateTime inspectDate) {
return selectList(new LambdaQueryWrapperX<MesQcIpqcDO>()
- .eq(MesQcIpqcDO::getWorkOrderId, workOrderId)
+ // 鐢熶骇宸ュ崟銆佸伐浣嶄负閫夊～锛氱暀绌烘椂姣斿鍏跺畠鍚屾牱鐣欑┖鐨勬楠屽崟
+ .eq(workOrderId != null, MesQcIpqcDO::getWorkOrderId, workOrderId)
+ .isNull(workOrderId == null, MesQcIpqcDO::getWorkOrderId)
.eq(MesQcIpqcDO::getType, type)
- .eq(MesQcIpqcDO::getWorkstationId, workstationId)
+ .eq(workstationId != null, MesQcIpqcDO::getWorkstationId, workstationId)
+ .isNull(workstationId == null, MesQcIpqcDO::getWorkstationId)
.eq(inspectDate != null, MesQcIpqcDO::getInspectDate, inspectDate)
.isNull(inspectDate == null, MesQcIpqcDO::getInspectDate)
.orderByAsc(MesQcIpqcDO::getId));
--
Gitblit v1.9.3