From ba3868ccc33cf35de706a432b73d6747321cc4d9 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 5 Dec 2024 09:49:35 +0800
Subject: [PATCH] =?UTF-8?q?2024-12-05=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 6193e0e..1361a8f 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
@@ -293,6 +293,26 @@ public class QcFAIRecordData extends QueryPage {
 
     private String importantFlag;
 
+    private String shiftNo;
+
+    private String shiftDesc;
+
+    public String getShiftNo() {
+        return shiftNo;
+    }
+
+    public void setShiftNo(String shiftNo) {
+        this.shiftNo = shiftNo;
+    }
+
+    public String getShiftDesc() {
+        return shiftDesc;
+    }
+
+    public void setShiftDesc(String shiftDesc) {
+        this.shiftDesc = shiftDesc;
+    }
+
     public String getImportantFlag() {
         return importantFlag;
     }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 9165b2d..d599737 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1954,11 +1954,15 @@
         p.DefaultDepartmentID as departmentID,
         d.DepartmentName,
         a.create_by,
-        a.important_flag
+        a.important_flag,
+        c.shiftno as shiftNo,
+        c.shiftdesc as shiftDesc
         FROM qc_ipqc_record as a
         left join WorkCenter as w on w.Site = a.Site AND w.WorkCenterNo = a.work_center_no
         left join part as p on a.site = p.site and a.part_no = p.partNo
         left join department as d on d.site = p.site and d.DepartmentID = p.DefaultDepartmentID
+        left join SOScheduledRouting as b ON a.site = b.Site AND a.seq_no = b.BarcodeID
+        LEFT JOIN calendar_datetype_shift as c ON b.Site = c.site AND b.ShiftId = c.ID
         <where>
             a.site in (select site from eam_access_site where username = #{query.userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
@@ -2016,6 +2020,9 @@
             <if test = "query.workCenterDesc != null and query.workCenterDesc != ''">
                 AND w.WorkCenterDesc LIKE #{query.workCenterDesc}
             </if>
+            <if test = "query.shiftDesc != null and query.shiftDesc != ''">
+                AND c.shiftdesc LIKE #{query.shiftDesc}
+            </if>
         </where>
         ORDER BY
         CASE WHEN a.state = '待检验' THEN 1