diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java index 5a96f11..76d4f3e 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumLinerkController.java @@ -145,7 +145,8 @@ public class AluminumLinerkController { @GetMapping("/getInventoryStatistics") @ResponseBody public String getInventoryStatistics() { - List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); + List mesMaterialStoreStatisticsList = + iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } diff --git a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java index fcbe050..a06a442 100644 --- a/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java +++ b/productionboard/src/main/java/com/productionboard/controller/AluminumTtankController.java @@ -79,7 +79,7 @@ public class AluminumTtankController { public String getMaterialProdutionStatisticsJson(){ List mesMaterialProductionStatisticsList = - iMesProductionDataService.getMesMaterialProductionStatisticsList("1006"); + iMesProductionDataService.getMesMaterialProductionStatisticsList("1003"); return JSONArray.toJSONString(mesMaterialProductionStatisticsList); } diff --git a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java index 815c5db..c43dfc9 100644 --- a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java +++ b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java @@ -44,7 +44,7 @@ public class PreassembleController { @GetMapping("/getTeamStatisticsJson") @ResponseBody public String getTeamStatisticsJson(){ - List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1001"); + List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("吸附内胆预装"); if(mesTeamStatisticsList.size()>0){ return JSONArray.toJSONString(mesTeamStatisticsList.get(0)); } @@ -60,7 +60,8 @@ public class PreassembleController { @GetMapping("/getHourProdutionJson") @ResponseBody public String getHourProdutionStatisticsJson(){ - List mesHourProdutionStatisticsList = iMesProductionDataService.getMesHourProdutionStatisticsList("1002"); + List mesHourProdutionStatisticsList = + iMesProductionDataService.getMesHourProdutionStatisticsList("1004"); if(mesHourProdutionStatisticsList.size()>0){ return JSONArray.toJSONString(mesHourProdutionStatisticsList); } @@ -77,7 +78,9 @@ public class PreassembleController { @ResponseBody public String getMaterialProdutionStatisticsJson(){ - List mesMaterialProductionStatisticsList = iMesProductionDataService.getMesMaterialProductionStatisticsList("1001"); + List mesMaterialProductionStatisticsList = + + iMesProductionDataService.getMesMaterialProductionStatisticsList("1004"); return JSONArray.toJSONString(mesMaterialProductionStatisticsList); } @@ -91,7 +94,7 @@ public class PreassembleController { @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1002"); + List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } diff --git a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class index 61667d5..c95d6eb 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class and b/productionboard/target/classes/com/productionboard/controller/AluminumLinerkController.class differ diff --git a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class index 925cfd8..d742ed6 100644 Binary files a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class and b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class differ diff --git a/productionboard/target/classes/static/js/foamBox/index.js b/productionboard/target/classes/static/js/foamBox/index.js index 18b021c..534791c 100644 --- a/productionboard/target/classes/static/js/foamBox/index.js +++ b/productionboard/target/classes/static/js/foamBox/index.js @@ -1,7 +1,7 @@ $(() => { //班组计划统计 - $.getJSON('/foamBox/getTeamStatisticsJson', function (result) { + $.getJSON(`/foamBox/getTeamStatisticsJson?ids=${ids}`, function (result) { onDutyPlan(result.planAmount, result.actualAmount, result.differenceAmount,) }); @@ -18,12 +18,12 @@ $(() => { }); //按型号统计产量 - $.getJSON('/foamBox/getMaterialProdutionJson', function (result) { + $.getJSON(`/foamBox/getMaterialProdutionJson?ids=${ids}`, function (result) { horizontalBarChart(result, document.getElementById("statisticalOutputByModel")); }); //小时产量 - $.getJSON('/foamBox/getHourProdutionJson', function (result) { + $.getJSON(`/foamBox/getHourProdutionJson?ids=${ids}`, function (result) { brokenLineAreaDiagram(result, document.getElementById("hourlyOutputStatistics")); });