#

vincentlu

2026-01-04 352dff02940eaaa9422e54779c8a6a8e5a38110e

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

@@ -247,7 +247,7 @@
                insertSeg.setPosType(TaskPosDto.PosType.MOVE.toString());
                insertSeg.setState(SegmentStateType.WAITING.toString());
                if (!segmentService.save(insertSeg)) {
                    log.error("Segment [{}] failed to save ！！！", segment.getTravelId() + " - " + segment.getSerial());
                    log.error("Segment [{}] failed to save ！！！", insertSeg.getTravelId() + " - " + insertSeg.getSerial());
                }
                segmentList.add(insertSeg);

@@ -287,6 +287,7 @@
            log.error("TrafficService.trigger", e);
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

            throw new RuntimeException("trigger method caught an exception", e);
        }
    }

@@ -696,12 +697,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();