From 98eff55c7eed88af444cbc40f472b4df3a840364 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Mon, 1 Jun 2026 10:47:19 +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       | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 0b85573b5..415ad875f 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
@@ -490,7 +490,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     //把加工班组为空的删掉
                     List<WorkPlanEntity> emptyWorkPlanList = workPlanService.list(Wrappers.<WorkPlanEntity>lambdaQuery().eq(WorkPlanEntity::getWoId,oldWorkOrder.getId()).isNull(WorkPlanEntity::getMakeTeam).isNull(WorkPlanEntity::getFactStartTime));
                     List<Long> ids = emptyWorkPlanList.stream().map(BaseEntity::getId).collect(Collectors.toList());
-                    workPlanService.deleteLogic(ids);
+                    if(CollectionUtils.isNotEmpty(ids)){
+                        workPlanService.deleteLogic(ids);
+                    }
                     //查询已经加工完的
                     List<WorkPlanEntity> oldWorkPlanList = workPlanService.list(Wrappers.<WorkPlanEntity>lambdaQuery().eq(WorkPlanEntity::getWoId,oldWorkOrder.getId()).orderByAsc(WorkPlanEntity::getOrders));
                     List<Long> ppsIds = oldWorkPlanList.stream().map(WorkPlanEntity::getPpsId).collect(Collectors.toList());
@@ -575,8 +577,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             isContainsOut = true;
                         }
                     } else {
-                        log.info("当前订单是：" + order.getId() + ",工序是：" + craft.getId()+",进入设备匹配");
                         if ("设备".equals(mainProducerMap.get(craft.getPpsId()))) {
+                            log.info("当前订单是：" + order.getId() + ",工序是：" + craft.getId()+",进入设备匹配");
                             String glassCodeStr = null;
                             Map<String, Object> sameMap = new HashMap<>();
                             //同炉同槽