From 1864f916e0359d0814416cf94feda3a3662ed193 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 05 九月 2025 16:39:29 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 2ff23fc..de1bcc9 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
@@ -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:
@@ -1680,12 +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)) {
@@ -1697,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);
--
Gitblit v1.9.1