#

vincentlu

2025-12-31 83b653947b73a9df562ab909921b6bac798f29de

#

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

@@ -368,7 +368,7 @@
                            });

                            // get placeSeg serial
                            int placeSegSerial = 9999;
                            int placeSegSerial;
                            // query placeSeg idx
                            int idx = -1;
                            for (int i = 0; i < destPosList.size(); i++) {

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

@@ -696,12 +696,13 @@
            if (!blockVehicleDto.isAvoidable()) {
                continue;
            }
            Long agvId = agvService.getAgvId(blockVehicleDto.getVehicle());
            // 当前vehicle正在进行避让作业
            if (!Cools.isEmpty(jamService.getUnfinishedAvoSegByAvo(blockVehicleDto.getVehicle(), null))) {
            if (!Cools.isEmpty(jamService.getUnfinishedAvoSegByAvo(agvId, null))) {
                continue;
            }
            // 当前vehicle正在进行滚筒输送线等待
            if () {
            if (segmentService.isRollerWaiting(agvId)) {
                continue;
            }
            return blockVehicleDto.getVehicle();

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

@@ -28,7 +28,7 @@
     * 阻塞任务 不管
     * 避让任务 未 完成
     */
    List<Jam> getUnfinishedAvoSegByAvo(String avoAgvNo, Segment currSeg);
    List<Jam> getUnfinishedAvoSegByAvo(Long avoAgvId, Segment currSeg);

    List<Jam> queryByAvoid(Long avoAgv, JamStateType jamState);


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

@@ -33,4 +33,6 @@

    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/impl/JamServiceImpl.java

@@ -77,9 +77,8 @@
    }

    @Override
    public List<Jam> getUnfinishedAvoSegByAvo(String avoAgvNo, Segment currSeg) {
        Long agvId = agvService.getAgvId(avoAgvNo);
        return this.baseMapper.selectUnfinishedAvoSegByAvo(agvId, null);
    public List<Jam> getUnfinishedAvoSegByAvo(Long avoAgvId, Segment currSeg) {
        return this.baseMapper.selectUnfinishedAvoSegByAvo(avoAgvId, null);
    }

    @Override

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

@@ -185,4 +185,13 @@
        return segments.get(0);
    }

    @Override
    public Boolean isRollerWaiting(Long agvId) {
        return 0 < this.count(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getAgvId, agvId)
                .eq(Segment::getState, SegmentStateType.WAITING.toString())
                .eq(Segment::getRollerWaiting, 1)
        );
    }

}