#

luxiaotao1123

2020-08-11 e8e8f21bada107cb06caece564eb3b0d8eada973

#

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

@@ -507,26 +507,25 @@
                    log.error("堆垛机处于等待确认且任务完成状态，但未找到工作档。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
                    continue;
                }
                // 如果工作状态为3.吊车入库中，则修改为4.入库完成
                if (wrkMast.getWrkSts() == 3) {
                    Date now = new Date();
                // 入库 + 库位转移  ==> 4.入库完成
                if (wrkMast.getWrkSts() == 3 || (wrkMast.getWrkSts() == 12 && wrkMast.getIoType() == 11)){
                    wrkMast.setWrkSts(4L);
                    wrkMast.setCrnEndTime(now);
                    wrkMast.setModiTime(now);
                    // 修改成功后复位堆垛机
                    if (wrkMastMapper.updateById(wrkMast) > 0) {
                        // 命令下发区 -------------------------------------------------------------------------
                        // 复位
                        if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(3, new CrnCommand()))) {
                            log.error("堆垛机复位命令下发失败，工作号={}", wrkMast.getWrkNo());
                        }
                // 出库 + 拣料/盘点/并板出库中：12.吊车出库中 ==> 14.出库完成
                } else if (wrkMast.getWrkSts() == 12) {
                    wrkMast.setWrkSts(14L);
                }
                Date now = new Date();
                wrkMast.setCrnEndTime(now);
                wrkMast.setModiTime(now);
                // 修改成功后复位堆垛机
                if (wrkMastMapper.updateById(wrkMast) > 0) {
                    // 命令下发区 -------------------------------------------------------------------------
                    // 复位
                    if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(3, new CrnCommand()))) {
                        log.error("堆垛机复位命令下发失败，工作号={}", wrkMast.getWrkNo());
                    }
                }

            }



        }
    }


 src/main/java/com/zy/core/MainProcess.java

@@ -42,7 +42,6 @@
                    mainService.crnStnToOutStn();
                    // 入出库  ===>>  堆垛机入出库作业下发
                    mainService.crnIoExecute();

                    // 入库  ===>> 执行对工作档的入库完成
                    mainService.storeFinished();
                    // 更新堆垛机移动时工作档状态