Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs

zjj

2025-06-09 80d97d40c44165674ee0168be5f08c8ca52d3c06

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java

@@ -160,7 +160,7 @@

            // 同楼层直接计算到目标库位
            //当前穿梭车线程到当前车子所在楼层的目标库位距离
            List<NavigateNode> currentShuttlePath = navigateUtils.calc(
            List<NavigateNode> currentShuttlePath = navigateUtils.calcWhiteList(
                    currentLocNo
                    , locNo
                    , NavigationMapType.DFX.id
@@ -485,9 +485,9 @@
                continue;
            }

            if(!shuttleThread.isDeviceIdle()) {
                continue;
            }
//            if(!shuttleThread.isDeviceIdle()) {
//                continue;
//            }

            if(shuttleProtocol.getCurrentLocNo() == null) {
                continue;