2024-12-25

优化

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">