#

Junjie

2024-12-24 8e5594bcd3ecffcdb4befd4e399f6bf18d0fdba9

 src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java

@@ -103,6 +103,11 @@
                continue;
            }

            if (shuttleProtocol.getWorkingMode() == 0) {
                //小车处于手动模式
                continue;
            }

            int currentLev = shuttleProtocol.getPoint().getZ();//小车当前层高
            String currentLocNo = shuttleProtocol.getCurrentLocNo();//小车当前库位号

@@ -316,16 +321,20 @@

            NyShuttleProtocol.NyShuttlePointClass point = null;
            if (shuttleProtocol.getPoint() == null) {
                BasShuttle basShuttle = basShuttleService.selectById(shuttle.getId());//小车如果没有数据，从数据库取数据
                if (basShuttle == null || basShuttle.getPoint() == null) {
                    continue;
                }
                point = JSON.parseObject(basShuttle.getPoint(), NyShuttleProtocol.NyShuttlePointClass.class);
                continue;
            }else {
                point = shuttleProtocol.getPoint();
            }

            if (point.getZ().equals(lev)) {
                if (shuttleProtocol.getChargState() == 1) {
                    continue;//充电中
                }

                if (shuttleProtocol.getSuspendState() == 1) {
                    continue;//管制中
                }

                levCount++;//目标楼层有车，数量增加
            }
        }