堆垛机移库任务等待确认调整

dubin

4 天以前 eddc7010369c735de1c4931a46b9d87a1008ae1e

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

@@ -739,6 +739,12 @@
                    if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue()) && crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.forkPosType == CrnForkPosType.HOME) {
                        log.info("堆垛机出库完成 - 开始执行");

                        Date date = new Date();
                        long diffInMillis = date.getTime() - wrkMast.getCrnStrTime().getTime();
                        if (!(diffInMillis >= 30000)){
                            continue;
                        }

                        // 命令下发区 --------------------------------------------------------------------------

                        // 下发站点信息
@@ -2087,6 +2093,11 @@
            }
            //  状态：等待确认 并且  任务完成位 = 1
            if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
                if ((System.currentTimeMillis() - crnProtocol.getLastCommandTime()) < 1000 * 60) {
                    News.error("" + mark + " - 0" + " - 堆垛机指令等待确认完成过快异常，任务号:" + crnProtocol.getTaskNo());
                    continue;
                }

                News.warnNoLog("" + mark + " - 0" + " - 开始执行对工作档的完成操作，任务号:" + crnProtocol.getTaskNo());
                if (crnProtocol.getTaskNo() == 9999) {
                    crnThread.setResetFlag(true);
@@ -2098,6 +2109,11 @@
                    News.error("" + mark + " - 1" + " - 堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
                    continue;
                }
                Date date = new Date();
                long diffInMillis = date.getTime() - wrkMast.getCrnStrTime().getTime();
                if (!(diffInMillis >= 30000)){
                    continue;
                }
                // 入库 + 库位转移  ==> 4.入库完成
                if (wrkMast.getWrkSts() == 3) {
                    wrkMast.setWrkSts(4L);