From b9d36dbee82e137bd85e75d07c0b5517e4c43391 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Mon, 7 Nov 2022 09:58:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BA=A7=E8=83=BD=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E7=9C=8B=E6=9D=BF=E8=AE=A2=E5=8D=95=E5=B7=A5=E6=97=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreverwin/mesnac/anomaly/mapper/ReportMapper.java   | 2 ++
 .../mesnac/anomaly/service/impl/ReportServiceImpl.java   | 5 ++++-
 anomaly/src/main/resources/mapper/ReportMapper.xml       | 9 +++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
index 338d672d..3c041b8c 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java
@@ -253,4 +253,6 @@ public interface ReportMapper {
 
     List<Map<String, String>> customerDimensionFinishedTimeReportNotWorkCenter(Map paramMap);
 
+    Map<String, String> getCapacityLoadUNPlanHours();
+
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
index 119dca8e..aa2dbf97 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
@@ -1097,7 +1097,10 @@ public class ReportServiceImpl implements ReportService {
                 planUndoneHoursList.add(Float.valueOf(String.valueOf(map.get("planUndoneHours"))));
                 eightList.add(resourceMap);
             }
-            result.put("planCapacity",Math.round(planCapacity));
+//            result.put("planCapacity",Math.round(planCapacity));
+            Map<String, String> capacityLoadUNPlanHours = reportMapper.getCapacityLoadUNPlanHours();
+            result.put("planCapacity",capacityLoadUNPlanHours.get("tardinessWork"));
+
             result.put("standardCapacity",Math.round(standardCapacity));
             //八个柱状图
             result.put("eightList",eightList);
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index b8a69ba6..87e675c0 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -2810,5 +2810,14 @@ SELECT zab.CREATED_DATE_TIME,
     <select id="customerDimensionFinishedTimeReportNotWorkCenter" resultType="java.util.Map">
         SELECT Vie.* FROM customer_Dimension_FinishedTime_Report Vie
     </select>
+    <select id="getCapacityLoadUNPlanHours" resultType="java.util.Map">
+        SELECT CEIL(SUM(CASE
+                            WHEN ZSD.DISPATCH_STATUS != 'COMPLETE'
+                        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+                            WHEN ZSD.DISPATCH_STATUS != 'CANCEL'
+                        THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+                            ELSE 0 END)) "tardinessWork"
+        FROM Z_SFC_DISPATCH ZSD
+    </select>
 
 </mapper>
\ No newline at end of file