功能修改-sjx

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

@@ -27,6 +27,7 @@ import org.springblade.desk.dashboard.service.IBsCraftAbilityService;
 import org.springblade.desk.dashboard.service.IBsProcessSetService;
 import org.springblade.desk.dashboard.service.IBsTeamSetService;
 import org.springblade.desk.order.mapper.YieldOrderCraftMapper;
+import org.springblade.desk.order.mapper.YieldOrderMapper;
 import org.springblade.desk.order.pojo.dto.YieldOrderAssignCount;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.pojo.entity.YieldOrderAssignDaily;
@@ -61,6 +62,7 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 	private final IYieldOrderAssignSteerService assignSteerService;
 	private final IBsProcessSetService processSetService;
 	private final IBsTeamSetService teamSetService;
+	private final YieldOrderMapper yieldOrderMapper;
 
 	@Override
 	public IPage<YieldOrderCraft> selectPage(IPage<YieldOrderCraft> page, YieldOrderCraft entity) {
@@ -267,6 +269,10 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl<YieldOrderCraftM
 			throw new ServiceException("自动分派失败，未找到合适的班组或者供应商！");
 		}
 
+		if(workCenter != null){
+			yieldOrder.setWorkCenterId(workCenter.getId());
+			yieldOrderMapper.updateById(yieldOrder);
+		}
 		// 分派成功，保存分派结果
 		this.saveOrUpdateBatch(dispatchCraftList);
 	}

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

@@ -814,6 +814,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                 List<PersonResourceEntity> personResourceList = personResourceService.list(wrapper);
                                 if (CollectionUtils.isNotEmpty(personResourceList)) {
                                     workPlan.setMakeTeam(personResourceList.get(0).getTeamId());
+                                }else{
+                                    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;
                                 }
                                 //需要人员资质的指定到人
                                 if (StringUtils.isNotEmpty(ability.getProductIdent())