外协订单单工序转厂内审批逻辑修改

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());