#

Junjie

2023-11-04 eee04ea3285552407601d680bbaa7231f95bccf5

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

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

    /**
     * 独占令牌
     * 未被任务占据，令牌为0
     * 被任务占据，将任务号赋值给令牌
     */
    private Integer token = 0;

    /**
     * 任务命令
@@ -140,20 +147,22 @@

    // 是否处于空闲待命状态
    public Boolean isIdle(Short taskNo) {
        if(this.taskNo == null
                || this.busy == null
        if(this.busy == null
                || this.model == null
                || this.deviceError == null
                || this.pakMk == null
                || this.token == null
        ){
            return false;
        }

        boolean res = (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
                && !this.busy
        boolean res =
//                (this.taskNo.equals(this.completeTaskNo) || this.taskNo.intValue() == taskNo.intValue())
                !this.busy
                && this.model
                && this.pakMk.equals(true)
                && !this.pakMk
                && !this.deviceError
                && this.protocolStatusType.equals(LiftProtocolStatusType.IDLE)
                ;
        return res;
    }
@@ -165,23 +174,26 @@
                || this.model == null
                || this.deviceError == null
                || this.pakMk == null
                || this.token == null
        ){
            return false;
        }

        boolean res = this.taskNo == 0
                && !this.busy
        boolean res =
//                this.taskNo.equals(this.completeTaskNo)
                !this.busy
                && this.model
                && this.pakMk.equals(true)
                && !this.pakMk
                && !this.deviceError
                && this.token == 0
                && this.protocolStatusType.equals(LiftProtocolStatusType.IDLE)
                ;
        return res;
    }

    // 是否处于空闲待命状态，不判断任务号
    public Boolean isIdleNoTask() {
        if(this.taskNo == null
                || this.busy == null
        if(this.busy == null
                || this.model == null
                || this.deviceError == null
                || this.pakMk == null
@@ -191,7 +203,7 @@

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