From 0cb7a42d8c7b62b6b537b14d5082969b972bed62 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Mon, 7 Nov 2022 11:00:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E8=BF=BD=E6=BA=AF?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ReportMapper.xml    | 64 +++----------------
 1 file changed, 10 insertions(+), 54 deletions(-)

diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 87e675c0..76c72d4e 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -1014,66 +1014,22 @@
     </select>
 
     <select id="itemTraceScheduleReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
-        SELECT cf.VALUE ITEM_NUMBER,
-        cf2.VALUE WORK_ORDER,
-        zsd.SHOP_ORDER SHOP_ORDER,
-        s.SFC SFC,
-        i.ITEM ITEM,
-        it.DESCRIPTION ITEM_DESCRIPTION,
-        WIP.COMPONENT_DESCRIPTION COMPONENT_DESCRIPTION,
-        zsd.DESCRIPTION OPERATION_DESCRIPTION,
-        zsd.BLANKING_SIZE BLANKING_SIZE,
-        PL.INVENTORY INVENTORY,
-        zsd.START_DATE ACTUAL_START_DATE,
-        zsd.ACTUAL_COMPLETE_DATE ACTUAL_COMPLETE_DATE
-        FROM (SELECT COMP.*, STAT.START_DATE
-        FROM (SELECT *
-        FROM (SELECT sd.SFC SFC,
-        sd.SHOP_ORDER SHOP_ORDER,
-        sd.SITE SITE,
-        sd.BLANKING_SIZE BLANKING_SIZE,
-        sd.ACTUAL_COMPLETE_DATE ACTUAL_COMPLETE_DATE,
-        ot.DESCRIPTION DESCRIPTION,
-        row_number() over (PARTITION BY sd.SFC ORDER BY sd.ACTUAL_COMPLETE_DATE DESC)
-        AS NEWINDEX
-        FROM Z_SFC_DISPATCH sd
-        INNER JOIN OPERATION o ON o.SITE = sd.SITE
-        AND o.OPERATION = sd.OPERATION AND o.CURRENT_REVISION = 'true'
-        LEFT JOIN OPERATION_T ot ON ot.OPERATION_BO = o.HANDLE
-        WHERE sd.DISPATCH_STATUS = 'COMPLETE'
-        AND ot.DESCRIPTION = '下料'
-        )
-        WHERE NEWINDEX = '1') COMP
-        LEFT JOIN (SELECT sd2.SFC, MIN(sd2.ACTUAL_START_DATE) START_DATE
-        FROM Z_SFC_DISPATCH sd2
-        WHERE sd2.DISPATCH_STATUS = 'COMPLETE'
-        GROUP BY sd2.SFC) STAT ON COMP.SFC = STAT.SFC) zsd
-        LEFT JOIN SFC s ON s.SFC = zsd.SFC AND s.SITE = zsd.SITE
-        LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
-        LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'ITEM_NUMBER'
-        LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
-        LEFT JOIN ITEM i On i.HANDLE = so.ITEM_BO AND I.SITE = SO.SITE
-        LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE
-        LEFT JOIN (SELECT S.SFC,
-        LISTAGG(ct.DESCRIPTION, ',') WITHIN GROUP (ORDER BY S.SFC ) COMPONENT_DESCRIPTION
-        FROM SFC S
-        LEFT JOIN SFC_BOM SB ON SB.SFC_BO = S.HANDLE
-        LEFT JOIN BOM_COMPONENT BC ON BC.BOM_BO = SB.BOM_BO
-        LEFT JOIN ITEM CP ON CP.HANDLE = BC.COMPONENT_GBO
-        LEFT JOIN ITEM_T ct ON CT.ITEM_BO = CP.HANDLE AND CT.LOCALE = 'zh'
-        GROUP BY S.SFC) WIP ON WIP.SFC = s.SFC
-        LEFT JOIN Z_PRINT_LOG PL ON PL.ITEM_BO = it.ITEM_BO AND PL.PRINT_TEMPLATE = 'INV'
+        SELECT * FROM ITEM_TRACE_SCHEDULE_REPORT ITSR
         <where>
-            zsd.SITE = #{site}
-            AND PL.INVENTORY IS NOT NULL
+            1=1
             <if test="shopOrder != null and shopOrder != ''">
-                AND zsd.SHOP_ORDER = #{shopOrder}
+                AND ITSR.SHOP_ORDER = #{shopOrder}
             </if>
             <if test="sfc != null and sfc != ''">
-                AND s.SFC = #{sfc}
+                AND ITSR.SFC = #{sfc}
+            </if>
+            <if test="item != null and item != ''">
+                AND ITSR.ITEM = #{item}
+            </if>
+            <if test="itemDescription != null and itemDescription != ''">
+                AND ITSR.ITEM_DESCRIPTION = #{itemDescription}
             </if>
         </where>
-        ORDER BY SFC DESC
     </select>
     <select id="resourceTaskDetailReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
         SELECT WIP.*,