#

luxiaotao1123

1 天以前 788c049b641607b4288f76b57dd73230bf882177

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java

@@ -165,7 +165,7 @@
        task.setAgvId(agv.getId());
        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        List<Task> lastTasks = taskService.list(new LambdaQueryWrapper<Task>().orderByDesc(Task::getId));
        task.setSeqNum(Utils.generateSeqNum(Cools.isEmpty(lastTasks)?null:lastTasks.get(0).getSeqNum()));
        task.setSeqNum(Utils.generateSeqNum(Cools.isEmpty(lastTasks)?null:lastTasks.get(0).getSeqNum())); // todo

        task.setTaskType(param.getTaskMode().val());
        task.setTaskSts(TaskStsType.WAITING.val());

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java

@@ -50,6 +50,8 @@
    private AgvAreaDispatcher agvAreaDispatcher;
    @Autowired
    private SegmentService segmentService;
    @Autowired
    private TravelService travelService;

    /**
     * get available agv list which is idle
@@ -220,8 +222,12 @@
//            if (taskCnt == 0) {
//                continue;
//            }
            // in TransferStationHandler.hasDelayAtSta

            // in TransferStationHandler.hasDelayAtSta todo
            Travel runningTravel = travelService.findRunningTravel(agvId);
            if (null == runningTravel) {
                continue;
            }
            segmentService.hasRollerWaitingNow(runningTravel.getId(), agvId, sta.getCode(), TaskPosDto.PosType.ORI_STA)
            Segment currSeg = segmentService.getRollerWaiting(agvId, sta.getCode(), TaskPosDto.PosType.ORI_STA);
            if (null == currSeg) {
                continue;

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java

@@ -31,6 +31,8 @@

    List<Integer> selectUsedBackpacks(Long travelId, Long agvId);

    Segment hasRollerWaitingNow(Long travelId, Long agvId, Long codeId, TaskPosDto.PosType posType);

    Segment getRollerWaiting(Long agvId, Long codeId, TaskPosDto.PosType posType);

    Boolean isRollerWaiting(Long agvId);

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TravelService.java

@@ -9,4 +9,6 @@

    void finishAll(Long agvId);

    Travel findRunningTravel(Long agvId);

}

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

@@ -173,7 +173,22 @@
        return this.baseMapper.selectUsedBackpacks(agvId, travelId);
    }

    @Override
    @Override // todo
    public Segment hasRollerWaitingNow(Long travelId, Long agvId, Long codeId, TaskPosDto.PosType posType) {
        List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getTravelId, travelId)
                .eq(Segment::getAgvId, agvId)
                .eq(Segment::getState, SegmentStateType.WAITING.toString())
                .eq(Segment::getEndNode, codeId)
                .eq(Segment::getPosType, posType.toString())
                .eq(Segment::getRollerWaiting, 1)
                .orderByDesc(Segment::getId)
        );

        return null;
    }

    @Override   //todo
    public Segment getRollerWaiting(Long agvId, Long codeId, TaskPosDto.PosType posType) {
        List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getAgvId, agvId)
@@ -189,7 +204,7 @@
        return segments.get(0);
    }

    @Override
    @Override   // todo
    public Boolean isRollerWaiting(Long agvId) {
        return 0 < this.count(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getAgvId, agvId)

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

@@ -60,4 +60,14 @@
        }
    }

    @Override
    public Travel findRunningTravel(Long agvId) {
        return this.getOne(new LambdaQueryWrapper<Travel>()
                .eq(Travel::getAgvId, agvId)
                .eq(Travel::getState, TravelStateType.RUNNING.toString())
                .orderByDesc(Travel::getCreateTime)
                .last("limit 1")
        );
    }

}