Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master in...

luxiaotao1123

2024-04-10 a40b27c3e22a152d7514d3148835238c23be303e

 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;
    }