#

Junjie

2024-04-07 08c96e4b797573fd64b42a52a2f9b9805d59d3e3

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java

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

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

@@ -218,11 +215,8 @@

        switch (Objects.requireNonNull(MotionCtgType.get(motion.getMotionCtgEl()))){
            case LIFT_MOVE:
                // 判断提升机是否自动、空闲、准备就绪、链条没有转动、没有未就绪报错
                if (!liftProtocol.getModel()
                        || liftProtocol.getRun()
                        || !liftProtocol.getReady()
                ) {
                // 判断提升机是否空闲
                if (!liftThread.isIdle()) {
                    return false;
                }

@@ -231,11 +225,8 @@
                }
                break;
            case LIFT_WITH_GOODS:
                // 判断提升机是否自动、空闲、准备就绪、链条没有转动、没有未就绪报错
                if (!liftProtocol.getModel()
                        || liftProtocol.getRun()
                        || !liftProtocol.getReady()
                ) {
                // 判断提升机是否空闲
                if (!liftThread.isIdle()) {
                    return false;
                }

@@ -249,11 +240,8 @@

                break;
            case LIFT_WITH_SHUTTLE:
                // 判断提升机是否自动、空闲、准备就绪、链条没有转动、没有未就绪报错
                if (!liftProtocol.getModel()
                        || liftProtocol.getRun()
                        || !liftProtocol.getReady()
                ) {
                // 判断提升机是否空闲
                if (!liftThread.isIdle()) {
                    return false;
                }

@@ -267,11 +255,8 @@
                }
                break;
            case LIFT_WITH_GOODS_AND_SHUTTLE:
                // 判断提升机是否自动、空闲、准备就绪、链条没有转动、没有未就绪报错
                if (!liftProtocol.getModel()
                        || liftProtocol.getRun()
                        || !liftProtocol.getReady()
                ) {
                // 判断提升机是否空闲
                if (!liftThread.isIdle()) {
                    return false;
                }