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 18c59003..a5c9097a 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 @@ -138,6 +138,11 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl workPlans = workPlanMapper.selectList(new LambdaQueryWrapper() .eq(WorkPlan::getWoId, workOrder.getId())); @@ -149,7 +154,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl 0) { //判断工序是否存在外协商,如果存在不进行二次分派 @@ -353,6 +358,8 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl workPlans, WorkPlan deliverablePlan, Date startTime, Date endTime, String deliverKey, Integer scrapQty, Integer testQty) { @@ -545,6 +554,9 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl() + .eq(WorkPlan::getId, deliverablePlan.getNextWpId())); + if (nextWorkPlan != null && nextWorkPlan.getMakeTeam() != null) { + if (Integer.valueOf(YieldOrderEnum.YIELD_TYPE_1.getCode()).equals(yieldOrder.getYieldType())) { + yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode()); + } else { + yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_SJ.getCode()); + } + } + //更新状态为已外协待排产 + yieldOrder.setStatus(YieldOrderEnum.STATUS_OUTSOURCING_WAITING.getCode()); + yieldOrderMapper.updateById(yieldOrder); + } + /** * 更新交件工序状态为报工完成,下工序可接收 *