功能修改-sjx

liweidong
sunjianxi 2 days ago
parent be37e933dd
commit 195c1f20b2
  1. 6
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@ -576,6 +576,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
isContainsOut = true;
}
} else {
log.info("当前订单是:" + order.getId() + ",工序是:" + craft.getId()+",进入设备匹配");
if ("设备".equals(mainProducerMap.get(craft.getPpsId()))) {
String glassCodeStr = null;
Map<String, Object> sameMap = new HashMap<>();
@ -811,8 +812,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
if (!isSchecuding) {
break;
}
log.info("当前订单是:" + order.getId() + ",工序是:" + craft.getId()+",设备匹配完成");
} else if ("人".equals(mainProducerMap.get(craft.getPpsId()))) {
log.info("当前订单是:" + order.getId() + ",工序是:" + craft.getId()+",进入人员匹配");
//匹配人资源
WorkPlanEntity workPlan = new WorkPlanEntity();
Map<String,Object> hourMap = new HashMap<>();
@ -941,7 +943,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workPlan.setPrepareTime(Double.valueOf(hourMap.get("prepareTime").toString()));
workPlan.setHourType(hourMap.get("hourType").toString());
workPlanList.add(workPlan);
log.info("当前订单是:" + order.getId() + ",工序是:" + craft.getId()+",人员匹配完成");
} else {
errorInfo.append("作业中心:" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺:" + craftAbilityMap.get(craft.getCaId()) + ",工序:" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力和设备能力;");
log.info("未匹配到设备和人力资源的工序是:" + craft.getPpsId());

Loading…
Cancel
Save