dubin
22 小时以前 28c1186f7e00f24c21a0abc79684e58ac1245ae4
时间调整
1个文件已修改
11 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
                        }
                        // 命令下发区 --------------------------------------------------------------------------
                        // 下发站点信息
@@ -2098,6 +2104,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);