#

Junjie

2023-09-26 58365ea8a02e8adee1b56948085998107f9a80b3

 src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java

@@ -494,6 +494,17 @@
        return res;
    }

    // 是否处于空闲待命状态
    public Boolean isIdleNoCharge(int taskNo) {
        boolean res = this.free == ShuttleStatusType.IDLE.id
                && !this.pakMk
                && this.errState == 0
                && (this.taskNo == 0 || this.taskNo == taskNo)
                && this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
                ;
        return res;
    }

    // 是否满足充电状态
    public Boolean isRequireCharge() {
        if (this.free == null || this.pakMk == null || this.errState == null || this.taskNo == null) {
@@ -524,7 +535,7 @@
                if (chargeLine == null) {
                    return false;
                }
                return this.getPowerPercent() < chargeLine || this.minCellVoltage < 2900;
                return this.getPowerPercent() < chargeLine;
            } catch (Exception e) {
                News.error("fail", e);
                return false;