#

luxiaotao1123

2021-01-04 c02a4946db2784e93d366f428b534bb04aa71172

#

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

@@ -379,7 +379,7 @@
                    }
                    //  判断堆垛机状态等待确认
                    if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
                            && crnProtocol.statusType == CrnStatusType.WAITING
                            && crnProtocol.getTaskFinish() == 1  // todo:luxiaotao 等待确认
                            && crnProtocol.forkPosType == CrnForkPosType.HOME) {

                        // 命令下发区 --------------------------------------------------------------------------
@@ -677,7 +677,8 @@
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) { continue; }
            //  状态：等待确认 并且  任务完成位 = 1
            if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
            if (crnProtocol.getTaskFinish() == 1    // todo:luxiaotao 等待确认
                    && crnProtocol.getTaskNo() != 0) {
                // 获取入库待确认工作档
                WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
                if (wrkMast == null) {