1

zhang

昨天 1864f916e0359d0814416cf94feda3a3662ed193

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -1093,9 +1093,8 @@
                                ActionTypeType.ReadyTakeFromAgvSite.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now,    // 工作时间
                                destSta.getStaTypeIsCheck() == 1 ? 2 : 0,
                                destSta.getStaNo()
                                now    // 工作时间

                        ));
                        // 计算货叉工作方向
                        staWorkDirection = mapService.calculateAgvWorkDirectionByStation(destStaWorkDirection, lastDirection);
@@ -1112,7 +1111,9 @@
                                ActionTypeType.ReadyReleaseToConveyorSta.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now    // 工作时间
                                now,    // 工作时间
                                destSta.getStaTypeIsCheck() == 1 ? 2 : 0,
                                destSta.getStaNo()
                        ));
                        break;
                    case TO_CHARGE:
@@ -1362,6 +1363,9 @@
                                .setQrCode(action.getCode())
                                .bodySync(body -> body.setHeight((short) Double.parseDouble(action.getParams())))
                        );
                        if (!Cools.isEmpty(action.getAskType()) && (action.getAskType() == 1 || action.getAskType() == 2)) {
                            flag = askSta(action.getAskType(), action.getAskSta());
                        }
                        break;
                    case ReadyTakeFromAgvSite:
                        agvAction.add(new AgvActionItem<>(ReadyTakeFromAgvSite.class)
@@ -1383,6 +1387,9 @@
                                .setQrCode(action.getCode())
                                .bodySync(body -> body.setHeight((short) Double.parseDouble(action.getParams())))
                        );
                        if (!Cools.isEmpty(action.getAskType()) && (action.getAskType() == 1 || action.getAskType() == 2)) {
                            flag = askSta(action.getAskType(), action.getAskSta());
                        }
                        break;
                    case ReadyReleaseToAgvSite:
                        agvAction.add(new AgvActionItem<>(ReadyReleaseToAgvSite.class)
@@ -1411,9 +1418,7 @@
                    default:
                        break;
                }
                if (!Cools.isEmpty(action.getAskType()) && (action.getAskType() == 1 || action.getAskType() == 2)) {
                    flag = askSta(action.getAskType(), action.getAskSta());
                }

            }
            if (!flag) {
                log.error("任务组 [{}] 动作指令下发失败 ,向输送线询问报错！！！", actionGroupId);
@@ -1626,6 +1631,8 @@
                task.setUpdateTime(now);
                if (!taskService.updateById(task)) {
                    log.error("Task [{}] 更新失败 ！！！", task.getSeqNum());
                } else {
                    report(task, null, TaskReportStsType.END);
                }
            }
        }
@@ -1674,11 +1681,14 @@
        }
        TaskReport taskReport = new TaskReport();
        taskReport.setAgvId(task.getAgvId());
        taskReport.setAgvNo(task.getAgvId$());
        taskReport.setBusNo(task.getBusId$());
        taskReport.setCreateTime(new Date());
        taskReport.setCompleted(0);
        taskReport.setQrCode(qrCode);
        taskReport.setReportTimes(0);
        taskReport.setTaskSts(taskReportStsType.status);
        taskReport.setEventType(taskReportStsType.name);
        taskReport.setSeqNum(task.getSeqNum());
        taskReport.setZpallet(task.getZpallet());
        if (!taskReportService.save(taskReport)) {
@@ -1690,10 +1700,10 @@

    private boolean askSta(Integer askType, String askSta) {
        log.info("来询问输送线了，{}，{}", askType, askSta);
        String wmsUrl = configService.getVal("WMS_URL", String.class);
        String wmsUrl = configService.getVal("WCS_URL", String.class);
        String wmsPath = configService.getVal("WMS_STA", String.class);
        if (Cools.isEmpty(wmsPath) || Cools.isEmpty(wmsUrl)) {
            return true;
            return false;
        }
        Integer time = configService.getVal("TIMEOUT", Integer.class, 5);
        //Integer times = configService.getVal("REPORT_TIMES", Integer.class, 2);