chen.llin
4 天以前 0a4438e34d8f726b9cf6251a5b447883b0b8da36
src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -678,9 +678,25 @@
//                    continue;
                }
                // 判断堆垛机出库站状态
                if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                boolean outStationAvailable = true;
                // 是否检查堆垛机出库站状态(true: 检查,false: 不检查)
                if (slaveProperties.isCheckOutStationStatus()) {
                    // 检查出库站状态
                    outStationAvailable =
                            //自动
                            staProtocol.isAutoing()
                            //!有物
                            && !staProtocol.isLoading()
                            //能出
                            && staDetl.getCanouting() != null
                            && staDetl.getCanouting().equals("Y")
                            //工作号
                            && staProtocol.getWorkNo() == 0
                            //可出
                            && staProtocol.isOutEnable();
                }
                // 出库站可用时继续执行
                if (outStationAvailable) {
                    // 堆垛机控制过滤
                    if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
//                        continue;