功能修改-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -555,7 +555,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             totalTime = totalTime + outsourceProcess.getDays() * 24 *60;
                         } else {
                             prevProcessEnd = prevProcessEnd.plusDays(3);
-                            totalTime = totalTime + 3 * 24 * 60;
+                            totalTime = totalTime + 1 * 24 * 60;
                         }
                         WorkPlanEntity workPlan = new WorkPlanEntity();
                         workPlan.setWoId(order.getId());
@@ -1022,6 +1022,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     }
                     for(WorkPlanEntity workPlan : workPlanList){
                         workPlan.setWoId(workOrder.getId());
+                        log.info("工序是否外协为：" + workPlan.getOem() +",外协商id是：" + workPlan.getOcId() + ",工时是：" + workPlan.getHourQuota());
+                        if("0".equals(workPlan.getOem()) && workPlan.getOcId() == null && workPlan.getHourQuota() == 0){
+                            workPlan.setPlanStartTime(null);
+                            workPlan.setPlanEndTime(null);
+                        }
                         workPlanService.save(workPlan);
                     }