From ad175fc046b5bc609c6e17c01c0e3daf55fe726c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Thu, 4 Nov 2021 16:08:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BB=A4=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ReportMapper.xml    | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 8af1c4de..aa83ee0e 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -794,7 +794,7 @@
     </select>
 
     <select id="findWorkOrderSchedule" parameterType="java.util.HashMap" resultType="java.util.HashMap">
-      SELECT *
+    SELECT *
     FROM (
              SELECT zsd.WORK_ORDER,
                     zsd.ITEM_NUMBER,
@@ -845,7 +845,14 @@
                                                   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'
-                               WHERE zsd.SITE = #{site}                           )
+                               WHERE zsd.SITE = #{site}
+                               <if test="workOrder != null and workOrder != ''">
+                                   AND cf2.VALUE = #{workOrder}
+                               </if>
+                               <if test="itemNumber != null and itemNumber != ''">
+                                   AND cf.VALUE = #{itemNumber}
+                               </if>
+                          )
                       GROUP BY SITE,WORK_ORDER, ITEM_NUMBER,WORK_CENTER
                   ) zsd
                  LEFT JOIN (
@@ -854,8 +861,15 @@
                  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'
-                 WHERE zsd.DISPATCH_STATUS != 'COMPLETE' AND zsd.DISPATCH_STATUS != 'CANCEL' AND zsd.SITE= #{site}                 GROUP BY cf2.VALUE, cf.VALUE,zsd.WORK_CENTER
-             	 ) zsd2 ON zsd2.WORK_ORDER || zsd2.ITEM_NUMBER = zsd.WORK_ORDER || zsd.ITEM_NUMBER AND zsd2.WORK_CENTER = zsd.WORK_CENTER
+                 WHERE zsd.DISPATCH_STATUS != 'COMPLETE' AND zsd.DISPATCH_STATUS != 'CANCEL' AND zsd.SITE= #{site}
+                 <if test="workOrder != null and workOrder != ''">
+                     AND cf2.VALUE = #{workOrder}
+                 </if>
+                 <if test="itemNumber != null and itemNumber != ''">
+                     AND cf.VALUE = #{itemNumber}
+                 </if>
+                 GROUP BY cf2.VALUE, cf.VALUE,zsd.WORK_CENTER
+             	 ) zsd2 ON zsd2.WORK_CENTER = zsd.WORK_CENTER AND zsd2.WORK_ORDER || zsd2.ITEM_NUMBER = zsd.WORK_ORDER || zsd.ITEM_NUMBER
                  LEFT JOIN (
                  SELECT cf2.VALUE WORK_ORDER, cf.VALUE ITEM_NUMBER, COUNT(zsd.HANDLE) QTY,zsd.WORK_CENTER
                  FROM Z_SFC_DISPATCH zsd
@@ -863,8 +877,14 @@
                  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'
                  WHERE zsd.SITE = #{site}
+                 <if test="workOrder != null and workOrder != ''">
+                     AND cf2.VALUE = #{workOrder}
+                 </if>
+                 <if test="itemNumber != null and itemNumber != ''">
+                     AND cf.VALUE = #{itemNumber}
+                 </if>
                  GROUP BY cf2.VALUE, cf.VALUE,zsd.WORK_CENTER
-             	) zsd3 ON zsd3.WORK_ORDER || zsd3.ITEM_NUMBER = zsd.WORK_ORDER || zsd.ITEM_NUMBER AND zsd3.WORK_CENTER = zsd.WORK_CENTER AND zsd3.WORK_CENTER = zsd.WORK_CENTER
+             	) zsd3 ON zsd3.WORK_CENTER = zsd.WORK_CENTER AND zsd3.WORK_ORDER || zsd3.ITEM_NUMBER = zsd.WORK_ORDER || zsd.ITEM_NUMBER
              	INNER JOIN WORK_CENTER  wc ON wc.WORK_CENTER = zsd.WORK_CENTER AND wc.SITE = zsd.SITE
              	LEFT JOIN WORK_CENTER_T wct ON wct.WORK_CENTER_BO = wc.HANDLE AND wct.LOCALE = 'zh'
             	WHERE (zsd.WORK_ORDER IS NOT NULL OR zsd.ITEM_NUMBER IS NOT NULL)
@@ -874,12 +894,6 @@
             <if test="workCenter != null and workCenter != ''">
                 AND (WORK_CENTER = #{workCenter} OR WORK_CENTER_DESCRIPTION = #{workCenter})
             </if>
-            <if test="workOrder != null and workOrder != ''">
-                AND WORK_ORDER = #{workOrder}
-            </if>
-            <if test="itemNumber != null and itemNumber != ''">
-                AND ITEM_NUMBER = #{itemNumber}
-            </if>
             <if test="isCompleted != null and isCompleted != ''">
                 AND IS_COMPLETE = #{isCompleted}
             </if>
@@ -889,7 +903,6 @@
             <if test="endDateTime != null and endDateTime != ''">
                 AND CREATED_DATE_TIME &lt;= TO_DATE(#{endDateTime}|| '15:59:59','YYYY-MM-DD HH24:MI:SS')
             </if>
-
         </where>
         ORDER BY CREATED_DATE_TIME ASC
     </select>