Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master in...

luxiaotao1123

2024-04-11 74be59f7ae8fe0a4435dc0b532e9a5ba32ab56de

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java

@@ -68,11 +68,8 @@
            return false;
        }

        //提升机处于自动、就绪、空闲
        if (!(liftProtocol.getModel()
                && liftProtocol.getReady()
                && !liftProtocol.getRun())
        ) {
        //判断提升机是否空闲
        if (!liftThread.isIdle()) {
            return false;
        }