#

Junjie

2024-04-10 114e3c8be67e4ebe05d2270a1815bfe0fbf442c5

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java

@@ -70,10 +70,7 @@
        if (null == shuttleProtocol) {
            return false;
        }
        if (!shuttleProtocol.getIdle()) {//设备不空闲
            return false;
        }
        if (!shuttleProtocol.getPakMk()) {
        if (!shuttleThread.isIdle()) {//设备不空闲
            return false;
        }
        if (motionService.count(new LambdaQueryWrapper<Motion>()
@@ -94,14 +91,6 @@

        LiftThread liftThread = null;
        LiftProtocol liftProtocol = null;

        //判断小车状态
        if (shuttleProtocol.getIdle()
                && shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.IDLE)
                && shuttleProtocol.getTaskNo() != 0
        ) {
            return false;
        }

        switch (Objects.requireNonNull(MotionCtgType.get(motion.getMotionCtgEl()))){
            case SHUTTLE_MOVE:

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java

@@ -374,6 +374,7 @@
                || this.shuttleProtocol.getPakMk() == null
                || this.shuttleProtocol.getErrorCode() == null
                || this.shuttleProtocol.getProtocolStatus() == null
                || this.shuttleProtocol.getTaskNo() == null
        ) {
            return false;
        }
@@ -382,6 +383,7 @@
                && this.shuttleProtocol.getPakMk()
                && this.shuttleProtocol.getErrorCode().equals("0")
                && this.shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.IDLE.id
                && this.shuttleProtocol.getTaskNo() == 0
                ;
        return res;
    }