#

pang.jiabao

2024-08-07 dfafabacf23bf22181d7c3f3665e684be7921f7d

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

@@ -1055,8 +1055,10 @@
                    break;
//                    continue;
                }
                // 107无物才能出，其他有转运架才能出
                boolean loading = (staProtocol.getSiteId() == 107) != staProtocol.isLoading();
                // 判断堆垛机出库站状态
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                if (staProtocol.isAutoing() && loading && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                    // 命令下发区 --------------------------------------------------------------------------
                    log.warn("堆垛机出库命令下发："+staProtocol.getWorkNo()+","+staProtocol.isOutEnable()+","+staProtocol.getSiteId());
@@ -3042,11 +3044,11 @@

        if (wrkMast.getStaNo() == 104) {
            // 判断出库站点情况,可入，堆垛机可以取货，可出，堆垛机可以放货
            if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable()) {
            if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable() || !staProtocol105.isLoading()) {
                return;
            }
        } else if (wrkMast.getStaNo() == 107) {
            if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable()) {
            if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable() || staProtocol107.isLoading()) {
                return;
            }
        }