#

luxiaotao1123

2020-08-11 4c362043cec8a44787a4658b0e09638a3baf2bc0

#

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

@@ -383,11 +383,14 @@
            if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
            } else {
                // 修改工作档状态 2=>3 todo:luxiaotao
//                Date now = new Date();
//                wrkMast.setWrkSts(3L);
//                wrkMast.setCrnStrTime(now);
//                wrkMast.setModiTime(now);
                // 修改工作档状态 2.设备上走 => 3.吊车入库中
                Date now = new Date();
                wrkMast.setWrkSts(3L);
                wrkMast.setCrnStrTime(now);
                wrkMast.setModiTime(now);
                if (wrkMastMapper.updateById(wrkMast) == 0) {
                    log.error("修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", wrkMast.getWrkNo());
                }
            }
        }
    }
@@ -439,6 +442,15 @@
                crnCommand.setDestinationPosZ(crnStn.getLev().shortValue());     // 目标库位层
                if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                    log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
                } else {
                    // 修改工作档状态 11.生成出库ID => 12.吊车出库中
                    Date now = new Date();
                    wrkMast.setWrkSts(12L);
                    wrkMast.setCrnStrTime(now);
                    wrkMast.setModiTime(now);
                    if (wrkMastMapper.updateById(wrkMast) == 0) {
                        log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", wrkMast.getWrkNo());
                    }
                }
            }
        }
@@ -529,23 +541,4 @@
        }
    }

    /**
     * 更新堆垛机移动时工作档状态
     */
    public void updateCrnMove() {
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            // todo
            if (crnProtocol.getStatusType() == CrnStatusType.FETCH_POSITION) {

                WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());


            }


        }
    }
}

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

@@ -44,8 +44,6 @@
                    mainService.crnIoExecute();
                    // 入库  ===>> 执行对工作档的入库完成
                    mainService.storeFinished();
                    // 更新堆垛机移动时工作档状态
                    mainService.updateCrnMove();

                    // 间隔
                    Thread.sleep(1500);