捡料

Junjie

2023-07-25 1f290b785adec6e9409adf2c9241bdd01eacf0ee

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

@@ -22,7 +22,7 @@
    /**
     * 提升机内部二维码
     */
    private Short barcode = 1699;
    private Short barcode = 1661;

    /**
     * 任务号
@@ -246,6 +246,29 @@
    }

    // 是否处于空闲待命状态
    public Boolean isIdle(Short taskNo) {
        if(this.taskNo == null
                || this.liftLock == null
                || this.ready == null
                || this.running == null
                || this.mode == null
                || this.pakMk == null
        ){
            return false;
        }

        boolean res = (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
                && !this.liftLock
//                && this.ready
                && !this.running
                && this.mode
                && this.pakMk.equals(true)
                && !this.securityMk
                ;
        return res;
    }

    // 是否处于空闲待命状态
    public Boolean isIdle() {
        if(this.taskNo == null
                || this.liftLock == null
@@ -268,6 +291,28 @@
        return res;
    }

    // 是否处于空闲待命状态，不判断任务号
    public Boolean isIdleNoTask() {
        if(this.taskNo == null
                || this.liftLock == null
                || this.ready == null
                || this.running == null
                || this.mode == null
                || this.pakMk == null
        ){
            return false;
        }

        boolean res = !this.liftLock
//                && this.ready
                && !this.running
                && this.mode
                && this.pakMk
                && !this.securityMk
                ;
        return res;
    }

    public void setPositionArrivalFeedback(Short position) {
        Short lev = null;
        switch (position) {