#

luxiaotao1123

2024-10-28 209c77e72cee736f65c7471b5cfb81c07f32b965

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java

@@ -161,6 +161,31 @@
        return laneService.search(codeService.getById(codeId).getData());
    }

    @Override
    public List<Task> findRunningTasksByLaneHash(String laneHash) {
        if (Cools.isEmpty(laneHash)) {
            return new ArrayList<>();
        }
        return this.list(new LambdaQueryWrapper<Task>()
                .in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
                .and(i -> {
                    i.eq(Task::getOriLaneHash, laneHash).or().eq(Task::getDestLaneHash, laneHash);
                })

        );
    }

    @Override
    public List<Task> findRunningTasksByAgv(Long agvId) {
        if (null == agvId) {
            return new ArrayList<>();
        }
        LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>().eq(Task::getAgvId, agvId);
        wrapper.in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val());
        wrapper.notIn(Task::getTaskType, TaskTypeType.MOVE.val(), TaskTypeType.TO_CHARGE.val(), TaskTypeType.TO_STANDBY.val());
        return this.list(wrapper);
    }

    @Transactional
    public void maintainLocSts(Task task, Boolean complete) {
        Loc oriLoc = null; Loc destLoc = null;