From 8e9f5a0e5bfeec63e9faa75dbafc1632dff46e16 Mon Sep 17 00:00:00 2001
From: zangzhipeng <lybluers@163.com>
Date: Thu, 4 Jun 2026 11:26:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E8=BD=AC=E5=8E=82=E5=86=85?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/pojo/entity/WorkPlan.java    |  2 ++
 .../service/impl/WorkOrderRunServiceImpl.java | 32 +++----------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java
index 4ffc32b0c..283c4ea41 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java
@@ -127,11 +127,13 @@ public class WorkPlan extends BaseEntity {
 	/**
 	 * 是否外协
 	 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@Schema(description = "是否外协")
 	private String oem;
 	/**
 	 * 外协商
 	 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@Schema(description = "外协商")
 	private Long ocId;
 	/**
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 8bbe0f81a..65442237b 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
@@ -440,30 +440,10 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                         wp.setSubsidiaryTeam(null);
                         wp.setOem("0");
                         wp.setCaId(wpr.getCaId());
+                        wp.setOcId(null);
                         wpList.add(wp);
                     }
 
-                    // 转厂内审批通过后，将第一道外协工序之后所有工序的 加工班组/计划开始时间/计划结束时间 置空
-                    if (!wpList.isEmpty()) {
-                        WorkPlan firstInternalPlan = wpList.stream()
-                                .min(Comparator.comparing(WorkPlan::getOrders)).get();
-                        List<WorkPlan> allPlans = workPlanMapper.selectList(
-                                new LambdaQueryWrapper<WorkPlan>().eq(WorkPlan::getWoId, wo.getId()));
-                        List<WorkPlan> tailPlans = new ArrayList<>();
-                        for (WorkPlan plan : allPlans) {
-                            if (plan.getOrders().compareTo(firstInternalPlan.getOrders()) > 0
-                                    && wpList.stream().noneMatch(w -> w.getId().equals(plan.getId()))) {
-                                plan.setMakeTeam(null);
-                                plan.setPlanStartTime(null);
-                                plan.setPlanEndTime(null);
-                                tailPlans.add(plan);
-                            }
-                        }
-                        if (!tailPlans.isEmpty()) {
-                            workPlanMapper.updateById(tailPlans);
-                        }
-                    }
-
                     if (wpList.isEmpty()) {
                         throw new ServiceException("未选择转回工序，请走外协交件流程！");
                     }
@@ -510,13 +490,6 @@ 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.setOem("0");
-                    wo.setOcId(null);
-                    wo.setOemOut("0");
-                    workOrderMapper.updateById(wo);
-
-                    wo = workOrderMapper.selectById(wo.getId());
 
                     //更改订单调度员和计划员
                     TeamSet makeTeam = teamSetMapper.selectById(wo.getTsId());
@@ -550,6 +523,9 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     }
                     //修改生产订单状态为已收回待排产
                     yo.setStatus(YieldOrderEnum.STATUS_OUTSOURCING_WAITING.getCode());
+
+                    // 更新车间作业计划
+                    workPlanMapper.updateById(wpList);
                 }
             } else if (WorkOrderRun.RUN_TYPE_3.equals(workOrderRun.getRunType())) {
                 //验证同工单下的车间订单