From bf8ce32bb2b9dc19588e75a47df2df2ee1e50085 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 30 Sep 2022 17:57:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=93=9D=E5=86=85?= =?UTF-8?q?=E8=83=86=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AluminumLinerkController.java | 3 ++- .../controller/AluminumTtankController.java | 2 +- .../controller/PreassembleController.java | 11 +++++++---- .../controller/AluminumLinerkController.class | Bin 6532 -> 6536 bytes .../controller/PreassembleController.class | Bin 3913 -> 3945 bytes .../target/classes/static/js/foamBox/index.js | 6 +++--- 6 files changed, 13 insertions(+), 9 deletions(-) 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 61667d5cabe350736cb5479e57f0d7882416af0d..c95d6eb5cc547eb75a1a35bb1d35a7d8bb155fbb 100644 GIT binary patch delta 44 zcmZoM?l9iqFU}Z0IY3;ApO1l=fq`KP0~^Cs1|EiKlWWDRSm!WsG0ffkN4$d(0PVdC AE&u=k delta 39 vcmeA$ZZY2AFU}Y}IY3;An~Q;ofq`KP0}sR0$&KPwtg{)o80Kt}=wJi@z=;Wq diff --git a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class index 925cfd8a7c504f7870aedf032af67e70dd888530..d742ed6d5c0709e1e5983cdac3a42ef53ff1bb57 100644 GIT binary patch delta 1180 zcmaKq%TE(g6vn@qwoGYn8e5;sxmzHRef(8T#tGM-aC^?J)KV89Gyr8Q@6&F_XXCWPGBvn75Elk%;#QD zFV4;^J(T|xBaP$(>L1NvNr)?p7;aR7kIj~Gx;!&@2m zTEj{{?oQs>0@sG@BX?bdQNuQ)cOT!j(6c=OCC%I+Mkvgk@8+2ak^Lsx3Oy>@0AMK+PC!dO23RPb^@Kig;ii<#NO} zW5gcrpm@vBPqu*~CU1esfn6(@q-8gmvQl;zM%&3asWXSK qG9LIVShJ6(Eb(eti9S>E|Em!*YN(WkRR6)kXnS}+#A>G44*vl*gL(r1 delta 1182 zcmb7?OK(z95Xb-LUhq;lX@u5VsvO7y1DV zacknnb(?CmE?l_NPvO?@V2uBB?=6C*3qx`)GiPT0znL>X1K$FL@4r8P0nm?mH#T9+ zg;QdM68DgkC?dBUF$NvgPBsf@{80`9-Ly9F>o>jR;MYZ)s5}F-l8hDndcq$e!anT- z^d&QRJ5M(+!DI(RgZwA0Q0%}?S^~SUn-Qu^jFvzOaE9MQU!+Has-VQdxFAm}+i7R7 zqJ?-Pu*a%Y3(29X%JWfERh5Xdr3CZ)%o<%LQN*qxsj(OPn7`kyZ+XJ>MCf6wzYsJK zH3#8iZiqJrvJe#Sx+Q1O1Gx*8Z%%D8IjSM}l z8TxF7{yIa}VyME)IXZmK6>QXyiF`tvnyGHi)OwW(a!oeyc-2jS_EnyGvHzB~IZ< zgX-!&=}Z~sg174On5{9=s9{TVtd)3yDIKr>QzK<+XxtOE`^W3E9;JPPRMys=`~y5z BZL|OY 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")); });