From 1f02773e3d0b5b09f2e5e583027e2718ce1bedfb Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 14 Dec 2022 18:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/shopOrder/ReportFormSearchMapper.xml  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
index 0fd52f4..e4b152c 100644
--- a/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ReportFormSearchMapper.xml
@@ -41,7 +41,12 @@
     </select>
 
     <select id="searchShopOrderItemWaste" resultType="com.gaotao.modules.shopOrder.entity.SearchShopOrderItemWasteData">
-        Select T.site,T.OrderNo,T.part_no,T.part_desc,T.status,T.type,sum(T.op_planned_qty) as op_planned_qty,sum(T.op_comp_qty) as op_comp_qty,T.order_planned_qty,T.order_comp_qty,T.ItemNo,T.OperationDesc,T.WorkCenterNo,T.work_center_desc,T.comp_part_no,T.comp_part_desc,T.KeyRMFlag,T.QPA,T.SAPBOMItemNo,T.UnitCost,T.UnitCost_Converted,T.closedate,T.createdate,-1 as SeqNo,T.closedate as SeqCreatedate,T.closedate as SeqClosedate,sum(qty_issued) as qty_issued,sum(T.qty_required) as qty_required,sum(T.qty_issued) - sum(T.qty_required)  as waste,(case when sum(T.qty_required)=0 then 9999       else (sum(T.qty_issued) - sum(T.qty_required)) / sum(T.qty_required) * 100.0       end) as wasterate ,sum(T.UnitCost_Converted * (T.qty_issued - T.qty_required)) as wasteValue,dbo.Get_SO_ExceptionReason(T.Site,T.OrderNo,T.ItemNo) as ExceptionReason
+        Select T.site,T.OrderNo,T.part_no,T.part_desc,T.status,T.type,sum(T.op_planned_qty) as op_planned_qty,sum(T.op_comp_qty) as op_comp_qty,
+        T.order_planned_qty,T.order_comp_qty,T.ItemNo,T.OperationDesc,T.WorkCenterNo,T.work_center_desc,T.comp_part_no,T.comp_part_desc,T.KeyRMFlag,
+        T.QPA,T.SAPBOMItemNo,T.UnitCost,T.UnitCost_Converted,T.closedate,T.createdate,-1 as SeqNo,T.closedate as SeqCreatedate,T.closedate as SeqClosedate,
+        sum(qty_issued) as qty_issued,sum(T.qty_required) as qty_required,sum(T.qty_issued) - sum(T.qty_required)  as waste,
+        (case when sum(T.qty_required)=0 then 9999       else (sum(T.qty_issued) - sum(T.qty_required)) / sum(T.qty_required) * 100.0       end) as wasterate
+        ,sum(T.UnitCost_Converted * (T.qty_issued - T.qty_required)) as wasteValue,dbo.Get_SO_ExceptionReason(T.Site,T.OrderNo,T.ItemNo) as ExceptionReason
         from dbo.view_so_oper_waste as T
         <where>
             AND T.site in  (Select Site from AccessSite where upper(UserID)=#{user}) and T.SAPStatus='L'