From 231ed27b0966c2fa3687b26a4e02184923e86de7 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Tue, 13 Dec 2022 13:22:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=9F=E8=8D=B7=E7=8E=87=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E5=88=86=E8=BD=A6=E9=97=B4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/anomaly/mapper/ReportMapper.java          |  2 +-
 .../anomaly/service/impl/ReportServiceImpl.java      |  5 ++++-
 anomaly/src/main/resources/mapper/ReportMapper.xml   | 12 +++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

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 3b15459f..350c3b29 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
@@ -255,7 +255,7 @@ public interface ReportMapper {
 
     List<Map<String, String>> customerDimensionFinishedTimeReportNotWorkCenter(Map paramMap);
 
-    Map<String, String> getCapacityLoadUNPlanHours();
+    Map<String, String> getCapacityLoadUNPlanHours(@Param("workCenter") String workCenter);
 
     /**
      * 项目齐套率报表
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 e7d3a029..45b3f4ee 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
@@ -1084,6 +1084,7 @@ public class ReportServiceImpl implements ReportService {
             result.put("capacityLoadList",capacityLoadList);
             Float planCapacity = 0f;
             Float standardCapacity = 0f;
+            Float standardMonthCapacity = 0f;
             ArrayList<HashMap<String, Object>> eightList = new ArrayList<>();
             ArrayList<Float> planHoursList = new ArrayList<>();
             ArrayList<Float> planUndoneHoursList = new ArrayList<>();
@@ -1112,6 +1113,7 @@ public class ReportServiceImpl implements ReportService {
                     planCapacity += Float.parseFloat(String.valueOf(et));
                 }
                 standardCapacity += Float.valueOf(String.valueOf(map.get("standardWeekCapacity")));
+                standardMonthCapacity += Float.valueOf(String.valueOf(map.get("standardMonthCapacity")));
                 //比率  计划工时 / 标准产能 * 100
                 ArrayList<String> rateList = new ArrayList<>();
                 rateList.add("0.00");
@@ -1129,10 +1131,11 @@ public class ReportServiceImpl implements ReportService {
                 eightList.add(resourceMap);
             }
 //            result.put("planCapacity",Math.round(planCapacity));
-            Map<String, String> capacityLoadUNPlanHours = reportMapper.getCapacityLoadUNPlanHours();
+            Map<String, String> capacityLoadUNPlanHours = reportMapper.getCapacityLoadUNPlanHours(workCenter);
             result.put("planCapacity",capacityLoadUNPlanHours.get("tardinessWork"));
 
             result.put("standardCapacity",Math.round(standardCapacity));
+            result.put("standardMonthCapacity",Math.round(standardMonthCapacity));
             //八个柱状图
             result.put("eightList",eightList);
             //中心 计划工时、未完成工时List
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index a8a04c69..aa7ce717 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -2808,10 +2808,16 @@ SELECT zab.CREATED_DATE_TIME,
         SELECT Vie.* FROM customer_Dimension_FinishedTime_Report Vie
     </select>
     <select id="getCapacityLoadUNPlanHours" resultType="java.util.Map">
-        SELECT CEIL(SUM(CASE WHEN ZSD.DISPATCH_STATUS NOT IN ('COMPLETE','CANCEL')
-                                 THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-                             ELSE 0 END)) "tardinessWork"
+        SELECT CEIL(SUM(CASE
+                            WHEN ZSD.DISPATCH_STATUS NOT IN ('COMPLETE', 'CANCEL')
+                                THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
+                            ELSE 0 END)) "tardinessWork"
         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
+        <if test="workCenter != null and workCenter != ''">
+            WHERE wct.DESCRIPTION = #{workCenter}
+        </if>
     </select>
     <select id="projectAlignmentRateReport" resultType="java.util.Map" parameterType="java.util.HashMap">
         SELECT * FROM PROJECT_ALIGNMENT_RATE_REPORT PARR