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> capacityLoad(String workCenter); + List> capacityLoadAllInfo(@Param("workCenter") String workCenter); + LinkedHashMap 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> 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, + \ No newline at end of file