负荷率看板分车间接口

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());
         }

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);
 

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;

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>