change - 吸附内胆预装数据监控平台产量、库存统计

productionboard/src/main/java/com/productionboard/controller/PreassembleController.java

@@ -44,9 +44,14 @@ public class PreassembleController {
     @GetMapping("/getTeamStatisticsJson")
     @ResponseBody
     public String getTeamStatisticsJson(){
-        List<MesTeamStatistics> mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("吸附内胆预装");
+        List<MesTeamStatistics> 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<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("L001");
+        List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1004");
         return JSONArray.toJSONString(mesMaterialStoreStatisticsList);
     }
 

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":
+            case "1004":
-                break;
+                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;