From e50f15f04776d14cc849cc0a10b6cb6453e0b0c2 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 25 Jan 2024 15:56:26 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/production/SoScheduledListMapper.xml   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml
index bf2c082..cb0a458 100644
--- a/src/main/resources/mapper/production/SoScheduledListMapper.xml
+++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml
@@ -218,16 +218,18 @@
 
 
       <select id="getLiuhuaView" resultType="LiuhuaViewData">
-   select a.site,a.orderNo,a.SeqNo,Round(a.QtyRequired,2) QtyRequired,Round(a.QtyReported,2) QtyReported,Round(a.QtyApprove,2) QtyApprove,Convert( varchar(20),Convert( DECIMAL(20,1),isnull((select sum(QtyApprove) from SOScheduledRouting  where materSeqNo =a.SeqNo and Site= a.site
-        and dbo.Get_ProductionLineDesc(site,dbo.Get_WorkCenter_ProLineNo(site,S_WorkCenterNo)) LIKE '%检验%'),0)*100/a.QtyApprove))+'%' as liuhuaWancheng,
+   select a.site,a.orderNo,a.SeqNo,Round(a.QtyRequired,2) QtyRequired,Round(a.QtyReported,2) QtyReported,Round(a.QtyApprove,2) QtyApprove,
+   Convert( varchar(20),Convert( DECIMAL(20,1),a.QtyReported*100/a.QtyRequired))+'%' as liuhuaWancheng,
         S_ScheduledDate as ScheduledDate,S_ShiftNo as shiftNo,dbo.Get_OperatorDesc(a.site,a.operatorId) as operatorName,a.partNo,dbo.Get_Part_SpecDesc(a.site,a.partNo) partSpec,
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'修边'),0),3))+'%' as xiubianWancheng,
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'烘烤'),0),3))+'%' as hongkaoWancheng,
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'检验'),0),3))+'%' as jianyanWancheng,
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'加工'),0),3))+'%' as jiagongWancheng,
         Convert( varchar(20),Round(isnull(dbo.Get_liuhuaView_wanchenglv(a.site,a.SeqNo,'包装'),0),3))+'%' as baozhuangWancheng,
+        (select top 1 StatisticDate from sfdc where AssJobSeqNo=a.SeqNo) as firstReportDate,
         dbo.Get_OperatorDesc(a.site,a.operatorId) OperatorDesc
         from SOScheduledRouting a
+        left join shoporder b on a.site=b.site and a.orderNo=b.orderNo
     <where>
             AND a.scheduleType='日计划派工单'
             and a.QtyReported>0