#

luxiaotao1123

2022-03-22 7e65fa0c00269e71f7b8f79563e304ddd36d19f6

#

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

@@ -569,6 +569,10 @@
                continue;
            }
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
                if(crnProtocol.getBay() ==1 && crnProtocol.getLevel()==1){
                    continue;
                }

                // 已经存在吊车执行任务时，则过滤
                if (wrkMastMapper.selectWorking(crn.getId()) != null) {
                    continue;
@@ -587,7 +591,7 @@
                // 命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setCrnNo(crn.getId()); // 堆垛机编号
                crnCommand.setTaskNo((short) 1); // 工作号
                crnCommand.setTaskNo((short) 9999); // 工作号
                crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式:  回原点
                crnCommand.setSourcePosX((short) 0);     // 源库位排
@@ -929,6 +933,10 @@
            if (crnProtocol == null) { continue; }
            //  状态：等待确认 并且  任务完成位 = 1
            if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
                if(crnProtocol.getTaskNo()==9999){
                    // 堆垛机复位
                    crnThread.setResetFlag(true);
                }else {
                // 获取入库待确认工作档
                WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
                if (wrkMast == null) {
@@ -949,6 +957,7 @@
                    // 堆垛机复位
                    crnThread.setResetFlag(true);
                }
                }

            }
        }