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

---
 .../service/impl/WorkOrderRunServiceImpl.java | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 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 99318e844..2799440f1 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
@@ -413,6 +413,14 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     for (WorkPlanRun wpr : wprList) {
                         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);
+                            wp.setPlanEndTime(null);
+                        }
+
                         //如果不是勾选工序不处理
                         if (!wpr.getHandle()) {
                             continue;
@@ -422,18 +430,18 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                         if (nextWorkPlan == null) {
                             throw new ServiceException("未找到下道工序，工序ID：" + wp.getNextWpId());
                         }
-                        BsProcessSetEntity bsProcessSetEntity = processSetMapper.selectOne(new LambdaQueryWrapper<BsProcessSetEntity>()
-                                .eq(BsProcessSetEntity::getId, nextWorkPlan.getPpsId()));
-                        if (nextWorkPlan.getMakeTeam() != null && bsProcessSetEntity != null && !"1".equalsIgnoreCase(bsProcessSetEntity.getIsDispatch())) {
-                            teamSet = teamSetMapper.selectOne(new LambdaQueryWrapper<TeamSet>()
-                                    .eq(TeamSet::getId, nextWorkPlan.getMakeTeam()));
-                        }
-                        wp.setMakeTeam(teamSet == null ? null : teamSet.getId());
+//                        BsProcessSetEntity bsProcessSetEntity = processSetMapper.selectOne(new LambdaQueryWrapper<BsProcessSetEntity>()
+//                                .eq(BsProcessSetEntity::getId, nextWorkPlan.getPpsId()));
+//                        if (nextWorkPlan.getMakeTeam() != null && bsProcessSetEntity != null && !"1".equalsIgnoreCase(bsProcessSetEntity.getIsDispatch())) {
+//                            teamSet = teamSetMapper.selectOne(new LambdaQueryWrapper<TeamSet>()
+//                                    .eq(TeamSet::getId, nextWorkPlan.getMakeTeam()));
+//                        }
+//                        wp.setMakeTeam(teamSet == null ? null : teamSet.getId());
+
+                        // 工序信息重置，重新排产
                         wp.setOem(null);
-                        wp.setPlanStartTime(null);
                         wp.setUnqualifiedQty(0d);
                         wp.setWorkQty(0d);
-                        wp.setPlanEndTime(null);
                         wp.setSubsidiaryTeam(null);
                         wp.setOem("0");
                         wp.setCaId(wpr.getCaId());