#

luxiaotao1123

2024-04-11 12bea86c9cb51f98fd5f2de904bb6a8d30e9e0e8

 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;
    }
@@ -441,6 +443,10 @@

    @Override
    public boolean isChargingCompleted() {
        if (this.shuttleProtocol.getBatteryPower() == null) {
            return false;
        }

        if (Integer.valueOf(this.shuttleProtocol.getBatteryPower()) >= 100) {
            return true;
        }