|
@@ -374,6 +374,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
//本道工序的可选设备
|
|
|
List<ApsCraftRouteStepEquDo> apsCraftRouteStepEquDos = apsCraftRouteStepEquDoList.stream().filter(crse -> apsCraftRouteStepDo1.getId().equals(crse.getCraftstepid())).collect(Collectors.toList());
|
|
|
if (apsCraftRouteStepEquDos.size() == 0) {
|
|
|
+ log.info("工艺路线ID " + craftrouteid + " 步骤ID " + apsCraftRouteStepDo1.getId() + " 没可选设备,总" + apsCraftRouteStepEquDoList.size());
|
|
|
return R.error("工艺步骤" + apsCraftRouteStepDo1.getProcessname() + "没可选设备");
|
|
|
}
|
|
|
List<String> equIdList = new ArrayList<>();//设备
|
|
@@ -546,6 +547,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
//本道工序的可选设备
|
|
|
List<ApsCraftRouteStepEquDo> apsCraftRouteStepEquDos = apsCraftRouteStepEquDoList.stream().filter(fcrse -> apsCraftRouteStepDo.getId().equals(fcrse.getCraftstepid())).collect(Collectors.toList());
|
|
|
if (apsCraftRouteStepEquDos.size() == 0) {
|
|
|
+ log.info("工艺路线ID " + craftrouteid + " 步骤ID " + apsCraftRouteStepDo.getId() + " 没可选设备,总" + apsCraftRouteStepEquDoList.size());
|
|
|
return R.error("工艺步骤" + apsCraftRouteStepDo.getProcessname() + "没可选设备");
|
|
|
}
|
|
|
List<String> equIdList = new ArrayList<>();//设备
|
|
@@ -875,6 +877,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
//本道工序的可选设备
|
|
|
List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(hcrse -> apsProcessOperationDo1.getId().equals(hcrse.getMainid())).collect(Collectors.toList());
|
|
|
if (apsProcessOperationEquDos1.size() == 0) {
|
|
|
+ log.info("历史计划ID " + newblankid + " 作业ID " + apsProcessOperationDo1.getId() + " 没可选设备,总" + apsProcessOperationEquDos.size());
|
|
|
return R.error("工艺步骤" + apsProcessOperationDo1.getProcessname() + "没可选设备");
|
|
|
}
|
|
|
for (ApsProcessOperationEquDo apsProcessOperationEquDo : apsProcessOperationEquDos1) {
|
|
@@ -1061,6 +1064,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
//本道工序的可选设备
|
|
|
List<ApsProcessOperationEquDo> apsProcessOperationEquDos1 = apsProcessOperationEquDos.stream().filter(hffomd -> apsProcessOperationDo.getId().equals(hffomd.getMainid())).collect(Collectors.toList());
|
|
|
if (apsProcessOperationEquDos1.size() == 0) {
|
|
|
+ log.info("历史计划ID " + newblankid + " 作业ID " + apsProcessOperationDo.getId() + " 没可选设备,总" + apsProcessOperationEquDos.size());
|
|
|
return R.error("工艺步骤" + apsProcessOperationDo.getProcessname() + "没可选设备");
|
|
|
}
|
|
|
for (ApsProcessOperationEquDo apsProcessOperationEquDo : apsProcessOperationEquDos1) {
|