Commit 03ad0796 authored by 李驰骋's avatar 李驰骋

未找到可排设备时,提示具体异常

parent 8c149b1f
...@@ -125,7 +125,7 @@ public class GreedyAlg implements IAlgorithm{ ...@@ -125,7 +125,7 @@ public class GreedyAlg implements IAlgorithm{
List<EvaluateOptionalEquipmentResult> evaluateResultList = selectionResult.getSelectList(); List<EvaluateOptionalEquipmentResult> evaluateResultList = selectionResult.getSelectList();
if(task.isOutsourced()){ if(task.isOutsourced()){
//查询外委作业单元 //查询外委作业单元
Optional<Resource> equipmentResource = this.resources.stream().filter(s-> IMdWorkunitService.OUTSOURCE_WORKUNIT_CODE.equals(((Equipment)s).getWorkUnitCode())).findFirst(); Optional<Resource> equipmentResource = this.resources.stream().filter(s-> IMdWorkunitService.OUTSOURCE_WORKUNIT_ID.equals(((Equipment)s).getId())).findFirst();
if(!equipmentResource.isPresent()){ if(!equipmentResource.isPresent()){
task.setScheduleStatus(ScheduleStatus.InadequateTime); task.setScheduleStatus(ScheduleStatus.InadequateTime);
task.getJob().setScheduleStatus(ScheduleStatus.InadequateTime); task.getJob().setScheduleStatus(ScheduleStatus.InadequateTime);
...@@ -157,6 +157,8 @@ public class GreedyAlg implements IAlgorithm{ ...@@ -157,6 +157,8 @@ public class GreedyAlg implements IAlgorithm{
task.getJob().setScheduleStatus(ScheduleStatus.InadequateTime); task.getJob().setScheduleStatus(ScheduleStatus.InadequateTime);
if(selectionResult.getCause() == EquipmentSelectionResult.EquipmentSelectionCause.UN_MATCH){ if(selectionResult.getCause() == EquipmentSelectionResult.EquipmentSelectionCause.UN_MATCH){
task.getJob().setScheduleDesc(String.format("工序%s,未匹配到可排产设备", task.getProcessName())); task.getJob().setScheduleDesc(String.format("工序%s,未匹配到可排产设备", task.getProcessName()));
}else if(selectionResult.getCause() == EquipmentSelectionResult.EquipmentSelectionCause.UN_EQUIPMENT){
task.getJob().setScheduleDesc(String.format("工序%s,未找到可排产设备", task.getProcessName()));
}else { }else {
StringBuffer temp = new StringBuffer(); StringBuffer temp = new StringBuffer();
task.getOptionalEquipments().forEach(s -> { task.getOptionalEquipments().forEach(s -> {
......
...@@ -29,7 +29,10 @@ public class EquipmentSelectionStrategyImpl implements EquipmentSelectionStrateg ...@@ -29,7 +29,10 @@ public class EquipmentSelectionStrategyImpl implements EquipmentSelectionStrateg
//必选设备逻辑添加 //必选设备逻辑添加
List<Equipment> matchEquipments = this.matchEquipment(task, task.getOptionalEquipments()); List<Equipment> matchEquipments = this.matchEquipment(task, task.getOptionalEquipments());
List<TaskSchedulingContext.TaskSchedulingResultContext> taskSchResults = new ArrayList<>(); List<TaskSchedulingContext.TaskSchedulingResultContext> taskSchResults = new ArrayList<>();
if(matchEquipments.isEmpty()&&!task.getOptionalEquipments().isEmpty()){ if(task.getOptionalEquipments().isEmpty()){
rst.setCause(EquipmentSelectionResult.EquipmentSelectionCause.UN_EQUIPMENT);
return rst;
}else if(matchEquipments.isEmpty()){
rst.setCause(EquipmentSelectionResult.EquipmentSelectionCause.UN_MATCH); rst.setCause(EquipmentSelectionResult.EquipmentSelectionCause.UN_MATCH);
return rst; return rst;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment