From c6a2b472cde9dff4d21b95637ee6d99a412c785c Mon Sep 17 00:00:00 2001
From: 高 <gao@gaodeMacBook-Pro.local>
Date: 星期六, 10 十月 2026 17:21:40 +0800
Subject: [PATCH] feat(mes,crm): 新增质检单批量导入、检测结果台账与开票导入
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/ipqc/MesQcIpqcMapper.java | 20 ++++++++++++++++++--
1 files changed, 18 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 43882b6..f3a4623 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,12 +7,13 @@
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;
/**
* MES 杩囩▼妫�楠屽崟锛圛PQC锛� Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesQcIpqcMapper extends BaseMapperX<MesQcIpqcDO> {
@@ -21,11 +22,12 @@
return selectPage(reqVO, new LambdaQueryWrapperX<MesQcIpqcDO>()
.likeIfPresent(MesQcIpqcDO::getCode, reqVO.getCode())
.eqIfPresent(MesQcIpqcDO::getType, reqVO.getType())
- .eqIfPresent(MesQcIpqcDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .likeIfPresent(MesQcIpqcDO::getBatchCode, reqVO.getBatchCode())
.eqIfPresent(MesQcIpqcDO::getItemId, reqVO.getItemId())
.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 itemId, String batchCode, Integer type,
+ LocalDateTime inspectDate) {
+ return selectList(new LambdaQueryWrapperX<MesQcIpqcDO>()
+ .eq(MesQcIpqcDO::getItemId, itemId)
+ .eq(MesQcIpqcDO::getBatchCode, batchCode)
+ .eq(MesQcIpqcDO::getType, type)
+ .eq(inspectDate != null, MesQcIpqcDO::getInspectDate, inspectDate)
+ .isNull(inspectDate == null, MesQcIpqcDO::getInspectDate)
+ .orderByAsc(MesQcIpqcDO::getId));
+ }
+
}
--
Gitblit v1.9.3