功能修改-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -651,11 +651,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                 }
 
                                 if (CollectionUtils.isEmpty(equipResourceList)) {
-                                    order.setStatus(YieldOrderEnum.STATUS_APS.getCode());
+                                    errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId())  + ",设备资源已不足");
-                                    order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId())  + ",设备资源已不足");
+//                                    order.setStatus(YieldOrderEnum.STATUS_APS.getCode());
-                                    yieldOrderService.updateById(order);
+//                                    order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId())  + ",设备资源已不足");
+//                                    yieldOrderService.updateById(order);
                                     isSchecuding = false;
-                                    break;
+                                    continue;
                                 }
                                 //设备资源按照时间段分组并按时间排序，然后再每个组内按照剩余产能倒序排序
                                 Map<LocalDateTime, List<EquipResourceEntity>> equipResourceMap = equipResourceList.stream()