From 72e86336b940ea4f3233272a5bf04eee0c35e677 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 25 Dec 2024 14:43:19 +0800
Subject: [PATCH] =?UTF-8?q?2024-12-25=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/pms/QcMapper.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 42d2ddd..f7a27b4 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3374,7 +3374,9 @@
         type_flag1,
         type_flag2,
         type_flag3,
-        type_flag4
+        type_flag4,
+        c.shiftno as shiftNo,
+        c.shiftdesc as shiftDesc
         FROM SOScheduledRouting AS a
         inner join ShopOrder as t ON t.Site = a.Site AND t.OrderNo = a.SOOrderNo
         inner join WorkCenterResource as w ON w.Site = a.Site AND w.WorkCenterNo = a.S_WorkCenterNo and w.ResourceID = a.S_ResourceID
@@ -3382,6 +3384,7 @@
         left join department as d on d.site = p.site and d.DepartmentID = p.DefaultDepartmentID
         left join WorkCenter as w2 on w2.Site = a.Site AND w2.WorkCenterNo = a.S_WorkCenterNo
         left join users as u on a.site = u.site and a.CreatedBy = u.UserID
+        LEFT JOIN calendar_datetype_shift as c ON a.Site = c.site AND a.ShiftId = c.ID
         WHERE
         a.site in (select site from eam_access_site where username = #{query.userName})
         <if test="query.cancelFlag == null or query.cancelFlag == ''">
@@ -3429,6 +3432,9 @@
         <if test="query.inspectionTypeNo != null and query.inspectionTypeNo != '' and query.inspectionTypeNo == '末件检'">
             AND a.type_flag4 = 'Y'
         </if>
+        <if test="query.shiftDesc != null and query.shiftDesc != ''">
+            AND c.shiftdesc = #{query.shiftDesc}
+        </if>
     </select>
 
     <select id="searchPartInfo" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData" resultType="com.xujie.sys.modules.pms.data.QcFAIRecordData">