侧面出库完成上报执行状态替代plc码盘完成信号交互

pang.jiabao

4 天以前 3b17ccf3fd001cbec7a8bac368f07cd9237faae8

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

@@ -182,6 +182,7 @@
                        storageEscalationParam.setBarcode(BoxNo);
                        storageEscalationParam.setMatIdList(staProtocol.getMatIdList());
                        storageEscalationParam.setFullPlt(staProtocol.isFullPlt() ? 1 : 0);
                        storageEscalationParam.setMpHigh((short) (staProtocol.getSiteId() < 200 ? 1 :staProtocol.isHigh() ? 2 : staProtocol.isLow() ? 1 : 0));    // 高度，侧面码盘的高度 低1，高2
                        log.info("组托入库={}", storageEscalationParam);
                        TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam);
                        if (taskWrk == null) {
@@ -193,7 +194,7 @@
                            }
                        }
                        if (back) {
                            staProtocol.setWorkNo((short)9991);
                            staProtocol.setWorkNo((short) 9991);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -238,34 +239,72 @@
                        staProtocol = staProtocol.clone();
                    }
                    if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
                        // 查询工作档
                        TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), String.valueOf(crnStn.getStaNo() - 1));
                        if (taskWrk == null) {
                            continue;
                        }
                        log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                        staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                        staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                        if (!Cools.isEmpty(taskWrk.getType())) {
                            staProtocol.setHeight(taskWrk.getType());
                        }
                        boolean offer = false;
                        try {
                            offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                        } catch (Exception e) {
                            log.error("下发输送线任务失败：异常:" + e);
                            log.error("下发输送线任务失败：异常:offer:" + offer);
                        }
                        if (offer) {
                            log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                            taskWrk.setStatus(5);
                            taskWrk.setWrkSts(14);
                            taskWrk.setCompleteTime(new Date());
                            taskWrkService.updateById(taskWrk);

                        if (crnStn.getStaNo() >= 200) {
                            // 查询工作档
                            TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), String.valueOf(crnStn.getStaNo() + 2));
                            if (taskWrk == null) {
                                continue;
                            }
                            log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                            staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                            staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                            staProtocol.setBarcode(taskWrk.getBarcode());
                            if (!Cools.isEmpty(taskWrk.getType())) {
                                staProtocol.setHeight(taskWrk.getType());
                            }
                            boolean offer = false;
                            try {
                                offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
//                                staProtocol.setMp(taskWrk.getMp());
//                                staProtocol.setLx(taskWrk.getLx());
//                                staProtocol.setLev(taskWrk.getLev());
//                                MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
                            } catch (Exception e) {
                                log.error("下发输送线任务失败：异常:" + e);
                                log.error("下发输送线任务失败：异常:offer:" + offer);
                            }
                            if (offer) {
                                log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                                taskWrk.setStatus(5);
                                taskWrk.setWrkSts(14);
                                taskWrk.setCompleteTime(new Date());
                                taskWrkService.updateById(taskWrk);
                                // 侧面出库完成 上报执行状态
                                toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
                            } else {
                                log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
                            }
                        } else {
                            log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
                            // 查询工作档
                            TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), String.valueOf(crnStn.getStaNo() - 1));
                            if (taskWrk == null) {
                                continue;
                            }
                            log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                            staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                            staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                            if (!Cools.isEmpty(taskWrk.getType())) {
                                staProtocol.setHeight(taskWrk.getType());
                            }
                            boolean offer = false;
                            try {
                                offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                            } catch (Exception e) {
                                log.error("下发输送线任务失败：异常:" + e);
                                log.error("下发输送线任务失败：异常:offer:" + offer);
                            }
                            if (offer) {
                                log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                                taskWrk.setStatus(5);
                                taskWrk.setWrkSts(14);
                                taskWrk.setCompleteTime(new Date());
                                taskWrkService.updateById(taskWrk);

                            } else {
                                log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
                            }
                        }

//                            }
                    }
                } catch (Exception e) {
@@ -360,16 +399,16 @@
                    continue;
                }

//                LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
//                if (!locMast.getLocSts().equals("O")) {
//                    if (taskWrk.getWrkSts() == 2) {
//                        log.error("入库WMS分配库位{}有误，库位状态为{}", locMast.getLocNo(), locMast.getLocSts());
//                        taskWrk.setWrkSts(5);
//                        taskWrk.setMemo("WMS分配库位有误");
//                        taskWrkService.updateById(taskWrk);
//                    }
//                    continue;
//                }
                LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                if (!locMast.getLocSts().equals("O")) {
                    if (taskWrk.getWrkSts() == 2) {
                        log.error("入库WMS分配库位{}有误，库位状态为{}", locMast.getLocNo(), locMast.getLocSts());
                        taskWrk.setWrkSts(5);
                        taskWrk.setMemo("WMS分配库位有误");
                        taskWrkService.updateById(taskWrk);
                    }
                    continue;
                }

                // 堆垛机控制过滤
                if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {