From e6ad84e4c1eb933f7c801875973082f01f0baa92 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Tue, 7 Jun 2022 10:53:12 +0800
Subject: [PATCH] =?UTF-8?q?2022-06-07=20=E6=8E=92=E4=BA=A7=E7=9A=84FQC?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/schedule/ScheduleMapper.xml   | 4 ++--
 src/main/resources/mapper/schedule/SchedulingMapper.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index c440b37..bb3131c 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -90,7 +90,7 @@
         Left Join SORouting as S1 On T.Site=S1.Site and T.OrderNo=S1.OrderNo and T.PreItemNo=S1.ItemNo
         Left Join SORouting as S2 On T.Site=S2.Site and T.OrderNo=S2.OrderNo and T.NextItemNo=S2.ItemNo
         <where>
-            Round(T.QtyScheduled,3) <![CDATA[ < ]]> round(T.QtyRequired,3) and T.ClosedFlag = 'N'
+            Round(T.QtyScheduled,3) <![CDATA[ < ]]> round(T.QtyRequired,3) and T.ClosedFlag = 'N' AND T.WorkCenterNo <![CDATA[<>]]> 'FQC'
             <if test="username != null and username != ''">
                 and T.site in (Select Site from AccessSite where upper(UserID)=#{username})
             </if>
@@ -162,7 +162,7 @@
             <if test="site != null and site != ''">
                 AND E.Site like #{site}
             </if>
-            AND T.S_WorkCenterNo like #{workCenterNo}
+            AND T.S_WorkCenterNo like #{workCenterNo}  AND T.S_WorkCenterNo <![CDATA[<>]]> 'FQC'
             AND E.ResourceID like #{resourceId}
         </where>
         Order by E.S_ScheduledSeqNo
diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml
index 027dddc..21d38f4 100644
--- a/src/main/resources/mapper/schedule/SchedulingMapper.xml
+++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml
@@ -141,7 +141,7 @@
         LEFT JOIN SORouting as S1 On T.Site=S1.Site and T.OrderNo=S1.OrderNo and T.PreItemNo=S1.ItemNo
         LEFT JOIN SORouting as S2 On T.Site=S2.Site and T.OrderNo=S2.OrderNo and T.NextItemNo=S2.ItemNo
         <where>
-            AND T.ClosedFlag = 'N' and T.site = #{site}
+            AND T.ClosedFlag = 'N' and T.site = #{site} AND T.WorkCenterNo <![CDATA[<>]]> 'FQC'
             AND T.OrderNo<![CDATA[<>]]>'9999'
             AND isnull(D.Status,'')<![CDATA[<>]]>'已取消' and isnull(D.Status,'')<![CDATA[<>]]>'已计划' and isnull(D.Status,'')<![CDATA[<>]]>'已关闭'
             AND T.OrderNo = #{orderNo} AND  T.ItemNo = #{itemNo}