From b4d0d8f406a78a0ae8579425c858a8111ca0a5a1 Mon Sep 17 00:00:00 2001
From: zangzhipeng <lybluers@163.com>
Date: Sat, 6 Jun 2026 10:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E8=AE=A2=E5=8D=95=E5=8D=95?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=BD=AC=E5=8E=82=E5=86=85=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../produce/service/impl/WorkOrderRunServiceImpl.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
index 2799440f1..c4774b7bf 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
@@ -414,7 +414,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                         wp = workPlanMapper.selectOne(new LambdaQueryWrapper<WorkPlan>()
                                 .eq(WorkPlan::getId, wpr.getWpId()));
 
-                        // 如果是外协工序，且未报工，清空班组和时间，便于排产
+                        // 如果工序未到报工状态，清空班组和时间，便于排产重新分配
                         if (wp.getStatus().compareTo(WorkPlan.STATUS_WORK_OK) < 0) {
                             wp.setMakeTeam(null);
                             wp.setPlanStartTime(null);
@@ -495,8 +495,10 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     int days = ProcessCycleEnum.BC_TYPE_CYCLE_HEAT.getValue();
                     Date date = DateUtil.plusDays(wo.getSendDownTime(), days);
                     wo.setPlanEndDate(DateUtil.format(date, DateUtil.PATTERN_DATETIME));
-                    // 车间订单状态修改为【未下达】
-                    wo.setRunStatus(WorkOrder.RUN_STATUS_NORMAL);
+                    // 如果当前工序的加工班组和外协商为空，则等待排产，整单状态变为未开始
+                    if (wo.getTsId() == null && wo.getOcId() == null) {
+                        wo.setRunStatus(WorkOrder.RUN_STATUS_NORMAL);
+                    }
 
                     //更改订单调度员和计划员
 //                    TeamSet makeTeam = teamSetMapper.selectById(wo.getTsId());