From 60edff747d52eb42aadb036e3fbd580252de4c05 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 28 八月 2025 08:15:54 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index f3acf60..4b68a79 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/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)) {
--
Gitblit v1.9.1