diff --git a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java index c43dfc9..7f9506b 100644 --- a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java +++ b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java @@ -44,9 +44,14 @@ public class PreassembleController { @GetMapping("/getTeamStatisticsJson") @ResponseBody public String getTeamStatisticsJson(){ - List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("吸附内胆预装"); + List mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1004"); if(mesTeamStatisticsList.size()>0){ - return JSONArray.toJSONString(mesTeamStatisticsList.get(0)); + MesTeamStatistics mesTeamStatistics = mesTeamStatisticsList.get(0); + mesTeamStatistics.setClassName("白班"); + int planAmount = Integer.parseInt(mesTeamStatistics.getPlanAmount() == null ? "0" : mesTeamStatistics.getPlanAmount()); + int actualAmount= Integer.parseInt(mesTeamStatistics.getActualAmount() == null ? "0" : mesTeamStatistics.getActualAmount()); + mesTeamStatistics.setDifferenceAmount((planAmount - actualAmount)+""); + return JSONArray.toJSONString(mesTeamStatistics); } return JSONArray.toJSONString(new MesTeamStatistics()); } @@ -94,7 +99,7 @@ public class PreassembleController { @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("L001"); + List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1004"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } diff --git a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java index 8e2df12..44e6d9c 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java @@ -52,8 +52,8 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { case "1001": adsorptionTankTeamStatistics = teamStatisticsMapper.getAdsorptionTankTeamStatistics(this.in_id); break; - case "1003": - break; + case "1004": + adsorptionTankTeamStatistics = teamStatisticsMapper.getAdsorptionTankTeamStatistics(this.in_id); default: break; } @@ -90,7 +90,8 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { case "1001": mesMaterialProductionStatistics = materialProductionStatisticsMapper.getMesMaterialProductionStatisticsList(this.in_id); break; - case "1003": + case "1004": + mesMaterialProductionStatistics = materialProductionStatisticsMapper.getMesMaterialProductionStatisticsList(this.in_id); break; default: break; @@ -114,7 +115,8 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { case "1001": mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics(this.in_id); break; - case "1003": + case "1004": + mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics(this.in_id); break; default: break; diff --git a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class index d742ed6..bbb34d6 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/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class index 1f0f6e8..975170c 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialProductionStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class index 87db1b4..bec182b 100644 Binary files a/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class and b/productionboard/target/classes/com/productionboard/entity/MesProduction/MesMaterialStoreStatistics.class differ diff --git a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class index f7e970b..720e5da 100644 Binary files a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class and b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class differ