From 1e7d5dbd645902e5178a4ce82aa4bc8734f0f8ce Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 26 八月 2026 14:56:57 +0800
Subject: [PATCH] feat: 质检添加采购合同号、工单编号、销售单号搜索

---
 src/main/resources/mapper/quality/QualityInspectMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 48d8102..9875edf 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -43,11 +43,20 @@
         <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
             AND qi.supplier like concat('%',#{qualityInspect.supplier},'%')
         </if>
+        <if test="qualityInspect.inspectType == 0 and qualityInspect.purchaseContractNo != null and qualityInspect.purchaseContractNo != '' ">
+            AND pl.purchase_contract_number like concat('%',#{qualityInspect.purchaseContractNo},'%')
+        </if>
         <if test="qualityInspect.customer != null and qualityInspect.customer != '' ">
             AND qi.customer like concat('%',#{qualityInspect.customer},'%')
         </if>
         <if test="qualityInspect.process != null and qualityInspect.process != '' ">
             AND qi.process like concat('%',#{qualityInspect.process},'%')
+        </if>
+        <if test="qualityInspect.inspectType != 0 and qualityInspect.workOrderNo != null and qualityInspect.workOrderNo != '' ">
+            AND pot.work_order_no like concat('%',#{qualityInspect.workOrderNo},'%')
+        </if>
+        <if test="qualityInspect.inspectType != 0 and qualityInspect.salesContractNo != null and qualityInspect.salesContractNo != '' ">
+            AND po_sales.sales_contract_no like concat('%',#{qualityInspect.salesContractNo},'%')
         </if>
         <if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
             AND qi.product_name like concat('%',#{qualityInspect.productName},'%')
@@ -58,7 +67,7 @@
         <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
             AND qi.check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
         </if>
-        ORDER BY qi.create_time DESC
+        ORDER BY coalesce(qi.check_time, qi.create_time) DESC
     </select>
 
     <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">

--
Gitblit v1.9.3