#

Junjie

9 小时以前 909164aa1859fdf25330eb130bc90b8bd22e540b

 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java

@@ -696,6 +696,9 @@
                if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), stationProtocol.getTaskNo()) > 0) {
                    continue;
                }
                if (isWatchingCircleTransit(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
                    continue;
                }

                if (isWatchingCircleArrival(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
                    continue;
@@ -1284,6 +1287,15 @@
        return command != null && stationId != null && stationId.equals(command.getTargetStaNo());
    }

    private boolean isWatchingCircleTransit(Integer wrkNo, Integer stationId) {
        StationCommand command = getWatchCircleCommand(wrkNo);
        if (command == null || stationId == null || Objects.equals(stationId, command.getTargetStaNo())) {
            return false;
        }
        List<Integer> navigatePath = command.getNavigatePath();
        return navigatePath != null && navigatePath.contains(stationId);
    }

    private StationCommand getWatchCircleCommand(Integer wrkNo) {
        if (wrkNo == null || wrkNo <= 0) {
            return null;