diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java index 9c98d99..cc837e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java @@ -47,7 +47,7 @@ public class AllBroadHTMLController { public String finalAssemblyProduction() { return "broad/finalAssemblyProductionData"; } - + //5 门体集存库位置 @GetMapping("/orderVisualization") public String orderVisualization() { return "broad/orderVisualization"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java index 82e6a3a..8c67f23 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java @@ -35,15 +35,14 @@ public class FPBroadController { @PostMapping("/selectOrderExecution") @ApiOperation("订单执行、生产统计") - private String selectOrderExecution() { return JSONArray.toJSONString(service.fp_selectOrderExecution()); } - @PostMapping("/selectOrderInfo") + @PostMapping("/selectFpOrderInfo") @ApiOperation("中间生产数量统计") - private String selectProductionStatistics() { - return JSONObject.toJSONString(service.selectplanCompletion("1005")); + private String selectFpOrderInfo() { + return JSONObject.toJSONString(service.selectFpOrderInfo()); } @PostMapping("/selectDeviceStation") @@ -73,11 +72,14 @@ public class FPBroadController { Set strings = map.keySet(); + + Map stateMap=new HashMap<>(); + for (String key:strings) { Process p = null; try { - p = Runtime.getRuntime().exec("/system/bin/ping -c 1 " + map.get(key)); + p = Runtime.getRuntime().exec("/system/bin/ping -c 1 10.10.60.176"); int status = p.waitFor(); System.out.println(status); @@ -95,5 +97,11 @@ public class FPBroadController { } + @PostMapping("/selectFpStock") + @ApiOperation("发泡库存统计") + public String selectFpStock(){ + + return JSONArray.toJSONString(service.selectFpStock()); + } } diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 1982cc9..0aa23ec 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -299,7 +299,7 @@ .display-blocks span:last-child { margin-right: 0; } - + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index 6d94a47..e9df33f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -44,6 +44,10 @@ public interface BroadDataMapper { List xk_selectStockOccupancy(); + List selectFpStock(); + + BoxPlanCompletion selectFpOrderInfo(); + /////////////////////////////////////////////////////////////////////////// // 6 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index aa57364..cc59a4f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -43,4 +43,8 @@ public interface IBroadDataService { List fp_selectStationHourInfo(); List xk_selectStockOccupancy(); + + List selectFpStock(); + + BoxPlanCompletion selectFpOrderInfo(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index 912f0c8..6f6f9b5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -70,6 +70,16 @@ public class BroadDataServiceImpl implements IBroadDataService public List fp_selectStationHourInfo() { return mapper.fp_selectStationHourInfo(); } + + @Override + public List selectFpStock() { + return mapper.selectFpStock(); + } + + @Override + public BoxPlanCompletion selectFpOrderInfo() { + return mapper.selectFpOrderInfo(); + } /////////////////////////////////////////////////////////////////////////// // 泡前库 /////////////////////////////////////////////////////////////////////////// diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 5435ab8..b9f6fa7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -181,6 +181,33 @@ + + - - insert into temp1 ( select row_number() over (order by CREATION_DATE) as row_number, CREATION_DATE as day