|
@@ -188,6 +188,7 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
|
|
|
cuttingToolPositionList = machineCuttingTools.stream().map(item->item.getCuttingToolPosition().replace("1.", "")).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
+
|
|
|
// 获取临时表订单所占刀位信息
|
|
|
List<OrderTask> orderTasks = orderTaskService.list();
|
|
|
List<String> orderTaskList = new ArrayList<>();
|
|
@@ -195,7 +196,8 @@ public class ToolTaskServiceImpl extends SuperCacheServiceImpl<ToolTaskMapper, T
|
|
|
orderTaskList = orderTasks.stream().map(item -> item.getCutGoalNo().replace("1.", "")).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
- //过滤进行中被锁定的刀位号
|
|
|
+
|
|
|
+ //过滤有任务的被锁定的刀位号
|
|
|
List<CuttingToolApply> cuttingToolApplies = cuttingToolApplyService.list(new LbqWrapper<CuttingToolApply>().ne(CuttingToolApply::getProcessStatus, "3"));
|
|
|
List<String> runApplyList = new ArrayList<>();
|
|
|
if(!cuttingToolApplies.isEmpty()){
|