From 40ba28b2189cc09ac020b7898a5382c06eb7879a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 22 Jan 2024 11:31:29 +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

---
 .../production/entity/LiuhuaViewData.java      |  8 +++++---
 .../production/SoScheduledListMapper.xml       | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java b/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java
index c9431f9..618edc6 100644
--- a/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java
+++ b/src/main/java/com/heai/modules/production/entity/LiuhuaViewData.java
@@ -16,12 +16,14 @@ public class LiuhuaViewData extends QueryPage {
     private String orderNo;
     private String partSpec;
     private String partNo;
-    private String qtyRequired;
-    private String qtyReported;
+    private Float qtyRequired;
+    private Float qtyReported;
+    private Float qtyApprove;
     private String shiftNo;
     private Integer seqNo;
+    private String operatorDesc;
 
-    private Float liuhuaWancheng;
+    private String liuhuaWancheng;
     private String xiubianWancheng;
     private String hongkaoWancheng;
     private String jianyanWancheng;
diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml
index f113f7d..bf2c082 100644
--- a/src/main/resources/mapper/production/SoScheduledListMapper.xml
+++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml
@@ -218,14 +218,15 @@
 
 
       <select id="getLiuhuaView" resultType="LiuhuaViewData">
-        select a.site,a.orderNo,a.SeqNo,a.QtyRequired,a.QtyReported,Round(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.QtyReported,2) 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),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,
         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,
-        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'修边'),0),3) as xiubianWancheng,
-        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'烘烤'),0),3) as hongkaoWancheng,
-        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'检验'),0),3) as jianyanWancheng,
-        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'加工'),0),3) as jiagongWancheng,
-        Round(isnull(dbo.Get_liuhuaView_hegelv(a.site,a.SeqNo,'包装'),0),3) as baozhuangWancheng
+        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,
+        dbo.Get_OperatorDesc(a.site,a.operatorId) OperatorDesc
         from SOScheduledRouting a
     <where>
             AND a.scheduleType='日计划派工单'
@@ -251,6 +252,9 @@
             <if test="query.endDate != null ">
                 AND  #{query.endDate} >=  DATEADD(dd, -1, a.S_ScheduledDate)
             </if>
+              <if test="query.operatorDesc != null and query.operatorDesc != '' ">
+                and  dbo.Get_OperatorDesc(a.site,a.operatorId) like #{query.operatorDesc}
+            </if>
    </where>
     </select>
 </mapper>
\ No newline at end of file