From 9727e63233078a009090807511e72b1869a78fff Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Tue, 11 Jan 2022 13:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E9=97=AE=E9=A2=98=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anomaly/src/main/resources/mapper/ReportMapper.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 2501e99a..24a0ae81 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -432,7 +432,7 @@
     </select>
 
     <select id="findQualityInspectionReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
-        SELECT  zab.CREATED_DATE_TIME,zab.ABNORMAL_NO ABNORMAL_NO,
+        SELECT  Szsd.PROD_HOURS* CFPT.VALUE*zab.PB_QTY PRICE,CFPT.VALUE PRICE_TIME,zab.CREATED_DATE_TIME,zab.ABNORMAL_NO ABNORMAL_NO,
                 dflt.DATA_TAG PRODUCT_CATEGORY,
                 dflt2.DATA_TAG DISCOVER,
                 i.ITEM ITEM ,it.DESCRIPTION ITEM_DESCRIPTION,
@@ -482,11 +482,15 @@
                  LEFT JOIN DATA_FIELD_LIST dfl2 ON dfl2.DATA_FIELD_BO = df2.HANDLE AND dfl2.DATA_VALUE = zab.DISCOVER
                  LEFT JOIN DATA_FIELD_LIST_T dflt2 ON dflt2.DATA_FIELD_LIST_BO = dfl2.HANDLE AND dflt2.LOCALE = #{locale}
 
-                 LEFT JOIN CUSTOM_FIELDS mapNo ON mapNo."ATTRIBUTE" = 'DWG_NO' AND mapNo.HANDLE = i.HANDLE
+                LEFT JOIN CUSTOM_FIELDS mapNo ON mapNo."ATTRIBUTE" = 'DWG_NO' AND mapNo.HANDLE = i.HANDLE
                  LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zab.SHOP_ORDER AND so.SITE = zab.SITE
-                 LEFT JOIN ROUTER r ON r.HANDLE = zabd.ROUTER_BO
                  LEFT JOIN CUSTOM_FIELDS itemNumber ON itemNumber.HANDLE = so.HANDLE AND itemNumber."ATTRIBUTE" = 'ITEM_NUMBER'
                  LEFT JOIN SFC s ON s.SFC = zab.SFC AND s.SITE = zab.SITE
+
+                LEFT JOIN Z_SFC_DISPATCH Szsd ON s.SFC = zab.SFC AND SUBSTR(Szsd.HANDLE,1,INSTR(Szsd.HANDLE,',',-1)-1) = SUBSTR(zabd.ROUTER_BO,1,INSTR(zabd.ROUTER_BO,',',-1)-1)
+                LEFT JOIN RESRCE RES ON RES.RESRCE = Szsd.RESRCE AND Szsd.SITE = RES.SITE
+                LEFT JOIN CUSTOM_FIELDS CFPT ON CFPT."ATTRIBUTE" = 'PRICE_TIME' AND CFPT.HANDLE = RES.HANDLE
+
                  LEFT JOIN SFC_ROUTING SR ON SR.SFC_BO  = S.HANDLE
                  LEFT JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO  = SR.HANDLE AND ST.IN_USE = 'true'
                  LEFT JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE  AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0)
@@ -525,7 +529,7 @@
                 AND zab.CREATED_DATE_TIME &lt;= TO_DATE(#{endDateTime}|| '15:59:59','YYYY-MM-DD HH24:MI:SS')
             </if>
         </where>
-        GROUP BY zab.CREATED_DATE_TIME ,zab.ABNORMAL_NO ,
+        GROUP BY zab.CREATED_DATE_TIME ,zab.ABNORMAL_NO ,CFPT.VALUE,
                  i.ITEM  ,it.DESCRIPTION ,itemNumber.VALUE ,zab.ITEM_NUMBER,
                  mapNo.VALUE ,zab.PB_DESCRIPTION ,zsd.EMPLOYEE_DESCRIPTION ,
                  zab."TYPE" ,zab.REPORT_SEND_USER_GROUP  ,zabd.DUTY_DEPART ,zabd.PRINCIPAL_USER,
@@ -535,7 +539,7 @@
                  zsd.EMPLOYEE_DESCRIPTION  ,ot.DESCRIPTION  ,
                  r2.RESRCE,r2.DESCRIPTION,zsd.RESOURCE_TYPE,
                  rt.DESCRIPTION, dflt.DATA_TAG,zabd.DUTY_CAUSE_TYPE,zabd.DUTY_TYPE ,zabd.DUTY_DEPART,zab.SFC,
-        znu.FULL_NAME,znu2.FULL_NAME,zab.RESPONSE_DATE_TIME,dflt2.DATA_TAG
+        znu.FULL_NAME,znu2.FULL_NAME,zab.RESPONSE_DATE_TIME,dflt2.DATA_TAG,Szsd.HANDLE, Szsd.PROD_HOURS
         ORDER BY zab.CREATED_DATE_TIME DESC
     </select>