分派逻辑修改

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java

@@ -174,8 +174,8 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 			} else if (partAssign != null && partAssign.getOemId() != null) {
 				// 指定外协商生产
 				oemCustomer = oemService.getById(partAssign.getOemId());
-			} else if (partAssign != null && partAssign.getLimitType().equals(BsAssignEntity.MUST)) {
-				if (partAssign.getPointType().equals(BsAssignEntity.IN_FACTORY)) {
+			} else if (partAssign != null && partAssign.getLimitType().equals(BsAssignEntity.MUST.toString())) {
+				if (partAssign.getPointType().equals(BsAssignEntity.IN_FACTORY.toString())) {
 					// 必须厂内生产
 					workCenter = this.inPlantDistribution(hostAbilityId, workCenterMap, yieldOrder, BsWorkCenterEntity.LIMIT_TYPE_MUST);
 				} else {

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

@@ -446,6 +446,14 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         Long curWoId = woIds.get(0);
         List<WorkPlan> wpList = workPlanService.list(Wrappers.lambdaQuery(WorkPlan.class).eq(WorkPlan::getWoId, curWoId));
         List<WorkOrderRun> workOrderRuns = workOrderRunService.list(Wrappers.lambdaQuery(WorkOrderRun.class).eq(WorkOrderRun::getWoId, curWoId));
+        // 校验是否可以转外协
+        for (WorkOrderRun workOrderRun : workOrderRuns) {
+            if (Objects.equals(workOrderRun.getRunStatus(), WorkOrderRun.RUN_STATUS_UNDER)) {
+                throw new ServiceException("【" + workOrderRun.getWoCode() + "】订单等待外协审批中！！！");
+            } else if (Objects.equals(workOrderRun.getRunStatus(), WorkOrderRun.RUN_STATUS_ISSUED)) {
+                throw new ServiceException("【" + workOrderRun.getWoCode() + "】订单正在外协中！！！");
+            }
+        }
         List<WorkPlanRunVO> wprList = new ArrayList<>(wpList.size());
         // 拿出第一个单子对应的可以派外协的工序
         String proName = "";