From d6ea82f1901ab331271413f96b7d07e7f73a3dac Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Sat, 28 Jan 2023 10:51:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=9F=E8=8D=B7=E6=8A=A5=E8=A1=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index acc7f66f..f1777924 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -1520,6 +1520,7 @@
             SELECT O.OPERATION "operation",
             OT.DESCRIPTION "operationDescription",
             RT.DESCRIPTION,
+            O.SAP_SORT,
             SUM(CASE
             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
@@ -1561,8 +1562,8 @@
             <if test="workCenter != null and workCenter != ''">
                 AND ZSD.WORK_CENTER = #{workCenter}
             </if>
-            GROUP BY O.OPERATION,OT.DESCRIPTION,WCT.DESCRIPTION,RT.DESCRIPTION
-            ORDER BY O.OPERATION ASC ) WIP
+            GROUP BY O.OPERATION,OT.DESCRIPTION,WCT.DESCRIPTION,RT.DESCRIPTION, O.SAP_SORT
+            ORDER BY WCT.DESCRIPTION,O.SAP_SORT ) WIP
             LEFT JOIN OPERATION OP ON OP.OPERATION = WIP."operation" AND CURRENT_REVISION = 'true'
             LEFT JOIN CUSTOM_FIELDS CF ON CF.ATTRIBUTE ='WEEK_CAPACITY' AND CF.HANDLE = OP.HANDLE
             <where>
@@ -1572,8 +1573,9 @@
             </if>
             <if test="operationDescription != null and operationDescription != ''">
                 AND WIP."operationDescription" = #{operationDescription}
-        </if>
+            </if>
         </where>
+
     </select>
     <select id="monthLoadRateReport" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         --资源负荷率报表(月维度)
@@ -1616,6 +1618,7 @@
         FROM DUAL)
         SELECT O.OPERATION "operation",
         OT.DESCRIPTION "operationDescription",
+        O.SAP_SORT,
         SUM(CASE
         WHEN  TO_DATE(TRUNC(SYSDATE)) > (ZSD.PLANNED_COMP_DATE + 8 / 24)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
@@ -1675,8 +1678,8 @@
         <if test="workCenter != null and workCenter != ''">
             AND ZSD.WORK_CENTER = #{workCenter}
         </if>
-        GROUP BY O.OPERATION,OT.DESCRIPTION,WCT.DESCRIPTION,RT.DESCRIPTION
-        ORDER BY O.OPERATION ASC  ) WIP
+        GROUP BY O.OPERATION,OT.DESCRIPTION,WCT.DESCRIPTION,RT.DESCRIPTION,O.SAP_SORT
+        ORDER BY WCT.DESCRIPTION,O.SAP_SORT ASC  ) WIP
         LEFT JOIN OPERATION OP ON OP.OPERATION = WIP."operation" AND CURRENT_REVISION = 'true'
         LEFT JOIN CUSTOM_FIELDS CF ON CF.ATTRIBUTE ='MONTH_CAPACITY' AND CF.HANDLE = OP.HANDLE
         LEFT JOIN CUSTOM_FIELDS CFD ON CFD.ATTRIBUTE = 'DAY_CAPACITY' AND CFD.HANDLE = OP.HANDLE
@@ -1720,7 +1723,7 @@
                 AND WIP."operationDescription" = #{operationDescription}
             </if>
         </where>
-        ORDER BY WIP.WORK_CENTER_DESCRIPTION,WIP."operation"
+        ORDER BY WIP.WORK_CENTER_DESCRIPTION,WIP.SAP_SORT
     </select>
     <select id="weekDeliveryRateReport" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         SELECT WIP.WORK_CENTER "workCenter",