|
|
@ -44,7 +44,7 @@ public class PreassembleController {
|
|
|
|
@GetMapping("/getTeamStatisticsJson")
|
|
|
|
@GetMapping("/getTeamStatisticsJson")
|
|
|
|
@ResponseBody
|
|
|
|
@ResponseBody
|
|
|
|
public String getTeamStatisticsJson(){
|
|
|
|
public String getTeamStatisticsJson(){
|
|
|
|
List<MesTeamStatistics> mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("1001");
|
|
|
|
List<MesTeamStatistics> mesTeamStatisticsList = iMesProductionDataService.getMesTeamStatisticsList("吸附内胆预装");
|
|
|
|
if(mesTeamStatisticsList.size()>0){
|
|
|
|
if(mesTeamStatisticsList.size()>0){
|
|
|
|
return JSONArray.toJSONString(mesTeamStatisticsList.get(0));
|
|
|
|
return JSONArray.toJSONString(mesTeamStatisticsList.get(0));
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -60,7 +60,8 @@ public class PreassembleController {
|
|
|
|
@GetMapping("/getHourProdutionJson")
|
|
|
|
@GetMapping("/getHourProdutionJson")
|
|
|
|
@ResponseBody
|
|
|
|
@ResponseBody
|
|
|
|
public String getHourProdutionStatisticsJson(){
|
|
|
|
public String getHourProdutionStatisticsJson(){
|
|
|
|
List<MesHourProdutionStatistics> mesHourProdutionStatisticsList = iMesProductionDataService.getMesHourProdutionStatisticsList("1002");
|
|
|
|
List<MesHourProdutionStatistics> mesHourProdutionStatisticsList =
|
|
|
|
|
|
|
|
iMesProductionDataService.getMesHourProdutionStatisticsList("1004");
|
|
|
|
if(mesHourProdutionStatisticsList.size()>0){
|
|
|
|
if(mesHourProdutionStatisticsList.size()>0){
|
|
|
|
return JSONArray.toJSONString(mesHourProdutionStatisticsList);
|
|
|
|
return JSONArray.toJSONString(mesHourProdutionStatisticsList);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -77,7 +78,9 @@ public class PreassembleController {
|
|
|
|
@ResponseBody
|
|
|
|
@ResponseBody
|
|
|
|
public String getMaterialProdutionStatisticsJson(){
|
|
|
|
public String getMaterialProdutionStatisticsJson(){
|
|
|
|
|
|
|
|
|
|
|
|
List<MesMaterialProductionStatistics> mesMaterialProductionStatisticsList = iMesProductionDataService.getMesMaterialProductionStatisticsList("1001");
|
|
|
|
List<MesMaterialProductionStatistics> mesMaterialProductionStatisticsList =
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
iMesProductionDataService.getMesMaterialProductionStatisticsList("1004");
|
|
|
|
|
|
|
|
|
|
|
|
return JSONArray.toJSONString(mesMaterialProductionStatisticsList);
|
|
|
|
return JSONArray.toJSONString(mesMaterialProductionStatisticsList);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -91,7 +94,7 @@ public class PreassembleController {
|
|
|
|
@GetMapping("/getMaterialStoreJson")
|
|
|
|
@GetMapping("/getMaterialStoreJson")
|
|
|
|
@ResponseBody
|
|
|
|
@ResponseBody
|
|
|
|
public String getMesMaterialStoreStatisticsJson(){
|
|
|
|
public String getMesMaterialStoreStatisticsJson(){
|
|
|
|
List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1002");
|
|
|
|
List<MesMaterialStoreStatistics> mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("L001");
|
|
|
|
return JSONArray.toJSONString(mesMaterialStoreStatisticsList);
|
|
|
|
return JSONArray.toJSONString(mesMaterialStoreStatisticsList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|