From 26385d0154d36fd0c872ba4692b26ee34a0616d0 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Tue, 13 Dec 2022 12:18:01 +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/controller/ReportController.java      | 4 ++--
 .../foreverwin/mesnac/anomaly/mapper/ReportMapper.java   | 2 ++
 .../mesnac/anomaly/service/impl/ReportServiceImpl.java   | 6 +++++-
 anomaly/src/main/resources/mapper/ReportMapper.xml       | 9 +++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
index fae4cd63..61f252ba 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
@@ -649,9 +649,9 @@ public class ReportController {
      * @return
      */
     @GetMapping("/capacityLoad")
-    public R capacityLoad(String user){
+    public R capacityLoad(String workCenter){
         try {
-            return R.ok(reportService.capacityLoad(user));
+            return R.ok(reportService.capacityLoad(workCenter));
         } catch (Exception e) {
             return R.failed(e.getMessage());
         }
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 2f6e06c7..3b15459f 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
@@ -159,6 +159,8 @@ public interface ReportMapper {
      */
     List<Map<String, String>> capacityLoad(String workCenter);
 
+    List<Map<String, String>> capacityLoadAllInfo(@Param("workCenter") String workCenter);
+
 
     LinkedHashMap<String, String> sixShopOrderQTY(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 b2ccf95a..e7d3a029 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
@@ -1076,7 +1076,11 @@ public class ReportServiceImpl implements ReportService {
 
         List<Map<String, String>> capacityLoadList = null;
         try {
-            capacityLoadList = reportMapper.capacityLoad(workCenter);
+            if (workCenter != null){
+                capacityLoadList = reportMapper.capacityLoadAllInfo(workCenter);
+            }else {
+                capacityLoadList = reportMapper.capacityLoad(workCenter);
+            }
             result.put("capacityLoadList",capacityLoadList);
             Float planCapacity = 0f;
             Float standardCapacity = 0f;
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index f18847e6..a8a04c69 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -3200,6 +3200,15 @@ SELECT zab.CREATED_DATE_TIME,
         </if>
         </where>
     </select>
+    <select id="capacityLoadAllInfo" resultType="java.util.Map">
+        --设备产能负荷分车间所有设备看板
+        SELECT *
+        FROM CAPACITY_LOAD_BOARD_INFO_VIEW V
+        WHERE 1=1
+        <if test="workCenter != null and workCenter != ''">
+            AND  V."descripion" = #{workCenter}
+        </if>
+    </select>
 
 
 </mapper>
\ No newline at end of file