From 51a7308d348afa5b28a0f928dc7e4d186b2e8709 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Mon, 17 Oct 2022 08:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BA=A7=E8=83=BD=E8=B4=9F?=
 =?UTF-8?q?=E8=8D=B7=E7=9C=8B=E6=9D=BF=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ReportMapper.xml    | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 8d053eb9..031de070 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -1940,7 +1940,8 @@
     </select>
     <select id="capacityLoad" resultType="java.util.Map">
         --设备产能负荷看板看板接口
-        SELECT WIP.* FROM (WITH WEEK AS (
+        SELECT WIP.*
+        FROM (WITH WEEK AS (
         SELECT TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW')         WEEK0,
         TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 1 WEEK1,
         TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW') + 7 * 2 WEEK2,
@@ -1955,8 +1956,20 @@
         SELECT wct.DESCRIPTION     "descripion",
         rt.RESOURCE_TYPE    "resourceType",
         rt.DESCRIPTION      "resourceDescription",
+        row_number() over(ORDER BY case
+        when rt.RESOURCE_TYPE = 'HJ_6106HJH1' then 1
+        when rt.RESOURCE_TYPE = 'JJ_6106SLJ2' then 2
+        when rt.RESOURCE_TYPE = 'JJ_6106SXJ4' then 3
+        when rt.RESOURCE_TYPE = 'JJ_6106SLJ2' then 4
+        when rt.RESOURCE_TYPE = 'JJ_6106SXJ1' then 5
+        when rt.RESOURCE_TYPE = 'JJ_6106LJJ2' then 6
+        when rt.RESOURCE_TYPE = 'JJ_6106LTJ1' then 7
+        when rt.RESOURCE_TYPE = 'RC_6202PQF' then 8
+        ELSE 9 END  ASC) ROWW,
         SUM(CASE
-        WHEN SYSDATE > ZSD.PLANNED_COMP_DATE AND zsd.DISPATCH_STATUS != 'COMPLETE' THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+        WHEN TO_DATE(TRUNC(TO_DATE(TO_CHAR(sysdate, 'yyyy-MM-dd'), 'yyyy-MM-dd'), 'IW')) >
+        (ZSD.PLANNED_COMP_DATE + 8 / 24)
+        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
         ELSE 0 END) "tardinessWork",
         SUM(CASE
         WHEN ZSD.PLANNED_COMP_DATE >= TO_DATE(WEEK.WEEK0) AND ZSD.PLANNED_COMP_DATE &lt;= TO_DATE(WEEK.WEEK1)
@@ -1999,7 +2012,7 @@
         AND zsd.DISPATCH_STATUS != 'COMPLETE' THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
         ELSE 0 END) "planUndoneHours",
         MAX(CF.VALUE)       "standardWeekCapacity",
-        MAX(CF2.VALUE)       "standardMonthCapacity"
+        MAX(CF2.VALUE)      "standardMonthCapacity"
         FROM Z_SFC_DISPATCH ZSD
         LEFT JOIN WORK_CENTER wc ON zsd.WORK_CENTER = wc.WORK_CENTER
         LEFT JOIN WORK_CENTER_T wct ON wc.HANDLE = wct.WORK_CENTER_BO
@@ -2007,18 +2020,27 @@
         CROSS JOIN WEEK
         LEFT JOIN OPERATION O ON O.RESOURCE_TYPE_BO = rt.HANDLE AND O.SITE = rt.SITE
         LEFT JOIN CUSTOM_FIELDS CF ON CF.ATTRIBUTE = 'WEEK_CAPACITY'
-        AND CF.HANDLE = 'OperationBO:1000,' || o.OPERATION || ',1.0'
+        AND CF.HANDLE = o.HANDLE
         LEFT JOIN CUSTOM_FIELDS CF2 ON CF2.ATTRIBUTE = 'MONTH_CAPACITY'
-        AND CF2.HANDLE = 'OperationBO:1000,' || o.OPERATION || ',1.0'
+        AND CF2.HANDLE = o.HANDLE
         WHERE zsd.DISPATCH_STATUS != 'CANCEL'
+        AND (rt.RESOURCE_TYPE = 'HJ_6106HJH1'
+        OR rt.RESOURCE_TYPE = 'RC_6202PQF'
+        OR rt.RESOURCE_TYPE = 'JJ_6106SXJ4'
+        OR rt.RESOURCE_TYPE = 'JJ_6106SXJ2'
+        OR rt.RESOURCE_TYPE = 'JJ_6106SXJ1'
+        OR rt.RESOURCE_TYPE = 'JJ_6106SLJ2'
+        OR rt.RESOURCE_TYPE = 'JJ_6106LTJ1'
+        OR rt.RESOURCE_TYPE = 'JJ_6106LJJ2')
         AND CF.VALUE IS NOT NULL
         AND CF2.VALUE IS NOT NULL
         <if test="workCenter != null and workCenter != ''">
             AND  wc.WORK_CENTER = #{workCenter}
         </if>
         GROUP BY wct.DESCRIPTION, rt.RESOURCE_TYPE, rt.DESCRIPTION
-        ORDER BY "planCapacity1" DESC ) WIP
+        ) WIP
         WHERE 8 >= ROWNUM
+        ORDER BY ROWW
     </select>
     <select id="sixShopOrderQTY" resultType="java.util.LinkedHashMap">
         SELECT COUNT(WIP.SHOP_ORDER) "shopOrderQTY",