排产功能修改-sjx

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

@@ -854,10 +854,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             workPlanList.add(workPlan);
 
                         } else {
-                            //未匹配到设备和人力资源，将工序状态改为6，标识为未排产
-                            craft.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
-                            yieldOrderCraftService.updateById(craft);
                             log.info("未匹配到设备和人力资源的工序是：" + craft.getPpsId());
+                            order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力和设备能力");
+                            order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
+                            yieldOrderService.updateById(order);
+                            isSchecuding = false;
+                            break;
                         }
                     }