#

Junjie

2023-09-20 944994450e3ba369e218e24c3f5ef3996f5c183c

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2393,7 +2393,8 @@
            if (liftProtocol == null) {
                return false;
            }
            if (!liftProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {

            if (!liftProtocol.isIdle()) {
                return false;
            }

@@ -2417,6 +2418,10 @@
                //提升机不在小车楼层
                //调度提升机

                if (liftProtocol.getToken() != 0) {
                    return false;//提升机令牌被占用
                }

                //获取提升机命令，调度提升机到源站位置
                NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_CAR.id, sourceLiftSta.getStaNo(), sourceLiftSta.getStaNo(), wrkMast.getWrkNo());


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

@@ -172,6 +172,7 @@
                || this.model == null
                || this.deviceError == null
                || this.pakMk == null
                || this.token == null
        ){
            return false;
        }
@@ -181,14 +182,14 @@
                && this.model
                && !this.pakMk
                && !this.deviceError
                && this.token == 0
                ;
        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