From 43da266068c3c0c8df42f5c5b4b7ec7f9e444107 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Thu, 4 Jun 2026 15:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduling/service/impl/WorkOrderServiceImpl.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
index 403c4d43f..bdb6f972b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
+++ b/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());
-                                    order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId())  + ",设备资源已不足");
-                                    yieldOrderService.updateById(order);
+                                    errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId())  + ",设备资源已不足");
+//                                    order.setStatus(YieldOrderEnum.STATUS_APS.getCode());
+//                                    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()