From 11a8b077ecafe933681d92464b22da124884e336 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 5 Jul 2024 14:20:30 +0800
Subject: [PATCH] =?UTF-8?q?2024-07-05=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/QcFAIRecordData.java |  9 +++++
 src/main/resources/mapper/pms/QcMapper.xml    | 37 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
index 3cd0b7c..19f351b 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
@@ -255,6 +255,7 @@ public class QcFAIRecordData extends QueryPage {
     private String refInfo2;
     private String refInfo3;
     private String refInfo4;
+    private String refInfo5;
     private String orderRef1;
     private String orderRef2;
     private String orderRef3;
@@ -263,6 +264,14 @@ public class QcFAIRecordData extends QueryPage {
     private String warehouseId;
     private String warehouseName;
 
+    public String getRefInfo5() {
+        return refInfo5;
+    }
+
+    public void setRefInfo5(String refInfo5) {
+        this.refInfo5 = refInfo5;
+    }
+
     public String getWarehouseId() {
         return warehouseId;
     }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index a15ddbb..955de98 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -2263,6 +2263,7 @@
         ref_info2,
         ref_info3,
         ref_info4,
+        ref_info5,
         warehouse_id,
         dbo.Get_WareHouseDesc(site, warehouse_id) as warehouseName
         FROM qc_iqc_record
@@ -2323,6 +2324,27 @@
             <if test = "query.warehouseName != null and query.warehouseName != ''">
                 AND  dbo.Get_WareHouseDesc(site, warehouse_id) LIKE '%' + #{query.warehouseName} + '%'
             </if>
+            <if test = "query.receiptNo != null and query.receiptNo != ''">
+                AND receipt_no LIKE '%' + #{query.receiptNo} + '%'
+            </if>
+            <if test = "query.receiptItemNo != null and query.receiptItemNo != ''">
+                AND receipt_item_no = #{query.receiptItemNo}
+            </if>
+            <if test = "query.refInfo1 != null and query.refInfo1 != ''">
+                AND ref_info1 LIKE '%' + #{query.refInfo1} + '%'
+            </if>
+            <if test = "query.refInfo2 != null and query.refInfo2 != ''">
+                AND ref_info2 LIKE '%' + #{query.refInfo2} + '%'
+            </if>
+            <if test = "query.refInfo3 != null and query.refInfo3 != ''">
+                AND ref_info3 LIKE '%' + #{query.refInfo3} + '%'
+            </if>
+            <if test = "query.refInfo4 != null and query.refInfo4 != ''">
+                AND ref_info4 LIKE '%' + #{query.refInfo4} + '%'
+            </if>
+            <if test = "query.refInfo5 != null and query.refInfo5 != ''">
+                AND ref_info5 LIKE '%' + #{query.refInfo5} + '%'
+            </if>
         </where>
         ORDER BY
         CASE WHEN state = '待检验' THEN 1
@@ -3590,6 +3612,21 @@
             <if test="query.endDate2 != null">
                 AND #{query.endDate2} >= create_date
             </if>
+            <if test = "query.orderRef1 != null and query.orderRef1 != ''">
+                AND order_ref1 LIKE '%' + #{query.orderRef1} + '%'
+            </if>
+            <if test = "query.orderRef2 != null and query.orderRef2 != ''">
+                AND order_ref2 LIKE '%' + #{query.orderRef2} + '%'
+            </if>
+            <if test = "query.orderRef3 != null and query.orderRef3 != ''">
+                AND order_ref3 LIKE '%' + #{query.orderRef3} + '%'
+            </if>
+            <if test = "query.orderRef4 != null and query.orderRef4 != ''">
+                AND order_ref4 LIKE '%' + #{query.orderRef4} + '%'
+            </if>
+            <if test = "query.orderRef5 != null and query.orderRef5 != ''">
+                AND order_ref5 LIKE '%' + #{query.orderRef5} + '%'
+            </if>
         </where>
         ORDER BY
         CASE WHEN state = '待检验' THEN 1