#

Junjie

10 小时以前 802e2b36bb16d3f169b00652ccc65fd361082451

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

@@ -753,11 +753,7 @@
        if (!Objects.equals(dispatchStationId, wrkMast.getStaNo())
                && isCurrentOutOrderStation(currentStationId, outOrderStationIds)
                && isWatchingCircleArrival(wrkMast.getWrkNo(), currentStationId)) {
            Integer circleTarget = resolveNextCircleOrderTarget(currentStationId, outOrderStationIds);
            if (circleTarget == null) {
                return null;
            }
            return new OutOrderDispatchDecision(circleTarget, true);
            return new OutOrderDispatchDecision(dispatchStationId, true);
        }
        return new OutOrderDispatchDecision(dispatchStationId, false);
    }
@@ -802,8 +798,7 @@
        if (seq == null) {
            toTarget = currentBatchSeq.equals(wrkMast.getBatchSeq());
        } else {
            toTarget = Integer.valueOf(seq + 1).equals(wrkMast.getBatchSeq())
                    && currentBatchSeq.equals(wrkMast.getBatchSeq());
            toTarget = Integer.valueOf(seq + 1).equals(wrkMast.getBatchSeq());
        }
        if (toTarget) {
            if (hasReachableOutReleaseSlot(currentStationId, wrkMast.getStaNo())) {