|
@@ -343,6 +343,12 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
log.error("存在已完工的工序作业无法换线");
|
|
|
throw new CustomException("存在已完工的工序作业无法换线");
|
|
|
}
|
|
|
+ apsProcessOperationProcessEquDos.sort(Comparator.comparing(ApsProcessOperationProcessEquDo::getPlanstartdate));
|
|
|
+ if (apsProcessOperationProcessEquDos.get(0).getProcessdeviceid().equals(changingWiresVos.get(0).getEquId())
|
|
|
+ && apsProcessOperationProcessEquDos.get(0).getPlanstartdate().equals(changingWiresVos.get(0).getProcessingTime())) {
|
|
|
+ throw new CustomException("请修改计划开工时间或加工设备");
|
|
|
+ }
|
|
|
+
|
|
|
//对于换线作业的数据进行排序
|
|
|
Optional<Date> minDate = apsProcessOperationProcessEquDos.stream()
|
|
|
.map(ApsProcessOperationProcessEquDo::getPlanstartdate).min(Comparator.naturalOrder());
|