1

zhang

昨天 60edff747d52eb42aadb036e3fbd580252de4c05

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

@@ -1362,6 +1362,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 +1386,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 +1417,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 +1630,8 @@
                task.setUpdateTime(now);
                if (!taskService.updateById(task)) {
                    log.error("Task [{}] 更新失败 ！！！", task.getSeqNum());
                } else {
                    report(task, null, TaskReportStsType.END);
                }
            }
        }
@@ -1674,11 +1680,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)) {