From 95eddb57868c2663d71d606d2a24edf543773b72 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Fri, 5 Jun 2026 13:45:44 +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           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7e0efb302..36e2d51a3 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
@@ -631,8 +631,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                 LambdaQueryWrapper<EquipResourceEntity> wrapper = new LambdaQueryWrapper<>();
                                 wrapper.eq(EquipResourceEntity::getCraftId, craft.getCaId())
                                         .eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId())
-                                        .ge(EquipResourceEntity::getStartTime, dateTime)
                                         .eq(EquipResourceEntity::getIsUsed, 0)
+                                        .ge(EquipResourceEntity::getStartTime, dateTime)
                                         .in(EquipResourceEntity::getEquipOrder, entry.getKey());
                                 //返工订单需要原班组加工
                                 if(StringUtils.isNotEmpty(order.getReworkCode())){