From 0f55bea1971683f9f63a3dac7a0daca857856517 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sat, 11 Oct 2025 17:21:08 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-11=20=E6=8A=A5=E5=B7=A5=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=88=86=E5=8D=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/schedule/SchedulingMapper.xml      | 46 +++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml
index 8e3fb6f..8646732 100644
--- a/src/main/resources/mapper/schedule/SchedulingMapper.xml
+++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml
@@ -126,20 +126,50 @@
 
     <!--刷新FQC的排产工单数据-->
     <select id="getShopOrderByCon" parameterType="SearchScheduleData" resultType="ShopOrderOutData">
-        SELECT T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, T.OperationDesc itemDesc, D.NeedDate needDate, T.PartNo partNo, P.PartDescription partDesc,
-        P.Spec spec, T.WorkCenterNo workCenterNo, T.NextItemNo nextItemNo, S2.OperationDesc nextItemDesc, T.PreItemNo preItemNo,S1.OperationDesc preItemDesc,
-        S1.ScheduledFlag preScheduledFlag, T.QtyReported qtyReported, T.ScheduledFlag scheduledFlag, D.LotSize lotSize, D.EnterDate enterDate,
-        dbo.Get_SOOpsScheduleAvailResource(T.Site,T.OrderNo,T.WorkCenterNo,T.ItemNo) as AvailResource, ROUND(T.TimeRequired, 2) timeRequired,
+        SELECT
+        T.Site site,
+        T.OrderNo orderNo,
+        T.ItemNo itemNo,
+        T.OperationDesc itemDesc,
+        D.NeedDate needDate,
+        T.PartNo partNo,
+        P.PartDescription partDesc,
+        P.Spec spec,
+        T.WorkCenterNo workCenterNo,
+        T.NextItemNo nextItemNo,
+        S2.OperationDesc nextItemDesc,
+        T.PreItemNo preItemNo,
+        S1.OperationDesc preItemDesc,
+        S1.ScheduledFlag preScheduledFlag,
+        T.QtyReported qtyReported,
+        T.ScheduledFlag scheduledFlag,
+        D.LotSize lotSize,
+        D.EnterDate enterDate,
+        dbo.Get_SOOpsScheduleAvailResource(T.Site,T.OrderNo,T.WorkCenterNo,T.ItemNo) as AvailResource,
+        ROUND(T.TimeRequired, 2) timeRequired,
         dbo.getScheduleToPlanTime(D.LotSize, T.MachSetupTime, T.MachRunFactor, T.FactorUnit, T.Efficiency) scheduleToPlanTime,
-        D.CustomerID customerId, P.ConfigurationTemplateID customerName, T.MachRunFactor machRunFactor, T.MachSetupTime machSetupTime, T.FactorUnit factorUnit,
-        T.QtyScheduled qtyScheduled, (round(T.QtyRequired,3) - Round(T.QtyScheduled,3)) qtyToSchedule, Isnull(S1.QtyScheduled,0.0) qtyScheduledPreOps,
-        P.Remark custPartNo, S1.QtyApprove qtyApprovedPreOps, S1.PlanStartTime prePlanStartTime, S1.PlanFinishTime prePlanFinishTime, S2.ScheduledFlag nextScheduledFlag,
-        D.RoutingRevNo routingRevNo, T.Efficiency efficiency
+        D.CustomerID customerId,
+        P.ConfigurationTemplateID customerName,
+        T.MachRunFactor machRunFactor,
+        T.MachSetupTime machSetupTime,
+        T.FactorUnit factorUnit,
+        T.QtyScheduled qtyScheduled,
+        (round(T.QtyRequired,3) - Round(T.QtyScheduled,3)) qtyToSchedule,
+        Isnull(S1.QtyScheduled,0.0) qtyScheduledPreOps,
+        P.Remark custPartNo,
+        S1.QtyApprove qtyApprovedPreOps,
+        S1.PlanStartTime prePlanStartTime,
+        S1.PlanFinishTime prePlanFinishTime,
+        S2.ScheduledFlag nextScheduledFlag,
+        D.RoutingRevNo routingRevNo,
+        T.Efficiency efficiency,
+        w.WorkCenterDesc workCenterDesc
         from SORouting as T
         LEFT JOIN ShopOrder as D On T.Site=D.Site and T.OrderNo=D.OrderNo
         LEFT JOIN Part as P On T.Site=P.Site and T.PartNo=P.PartNo
         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
+        left join workcenter as w on T.site = w.site and T.WorkCenterNo = w.WorkCenterNo
         <where>
             AND T.ClosedFlag = 'N' and T.site = #{site} AND T.WorkCenterNo <![CDATA[<>]]> 'FQC'
             AND T.OrderNo<![CDATA[<>]]>'9999'