pakMk

Junjie

2023-08-01 464a427f477a15bd505ee43c325db45b8ee46b7a

pakMk

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

@@ -115,7 +115,7 @@
    /**
     * 作业标记
     */
    private Boolean pakMk = true;
    private Boolean pakMk = false;

    /**
     * 任务命令
@@ -152,7 +152,7 @@
        boolean res = (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
                && !this.busy
                && this.model
                && this.pakMk.equals(true)
                && !this.pakMk
                && !this.deviceError
                ;
        return res;
@@ -172,7 +172,7 @@
        boolean res = this.taskNo == 0
                && !this.busy
                && this.model
                && this.pakMk.equals(true)
                && !this.pakMk
                && !this.deviceError
                ;
        return res;
@@ -191,7 +191,7 @@

        boolean res = !this.busy
                && this.model
                && this.pakMk.equals(true)
                && !this.pakMk
                && !this.deviceError
                ;
        return res;

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

@@ -396,7 +396,7 @@
    // 是否处于空闲待命状态
    public Boolean isIdle() {
        boolean res = this.free == ShuttleStatusType.IDLE.id
                && this.pakMk.equals(true)
                && !this.pakMk
                && this.errState == 0
                && this.taskNo == 0
                && this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
@@ -421,7 +421,7 @@
    // 是否处于空闲待命状态，传入的taskNo和当前taskNo相同时允许放行
    public Boolean isIdle(int taskNo) {
        boolean res = this.free == ShuttleStatusType.IDLE.id
                && this.pakMk.equals(true)
                && !this.pakMk
                && this.errState == 0
                && (this.taskNo == 0 || this.taskNo == taskNo)
                && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
@@ -443,7 +443,7 @@
    // 是否处于空闲待命状态
    public Boolean isIdleNoCharge() {
        boolean res = this.free == ShuttleStatusType.IDLE.id
                && this.pakMk.equals(true)
                && !this.pakMk
                && this.errState == 0
                && this.taskNo == 0
                && this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
@@ -458,7 +458,7 @@
        }

        boolean res = this.free == ShuttleStatusType.IDLE.id
                && this.pakMk
                && !this.pakMk
                && this.errState == 0
                && this.taskNo == 0
                && this.protocolStatusType.id == ShuttleProtocolStatusType.IDLE.id