From 74951023b54f1789d1244fe923219d467487d771 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期一, 26 一月 2026 09:03:42 +0800
Subject: [PATCH] agv增加一个新单号防重复 ，增加一个手动呼叫agv
---
src/main/java/com/zy/asrs/task/AgvScheduler.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvScheduler.java b/src/main/java/com/zy/asrs/task/AgvScheduler.java
index 727dd07..2d988a7 100644
--- a/src/main/java/com/zy/asrs/task/AgvScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvScheduler.java
@@ -645,17 +645,19 @@
*/
private String queryAgvOrderStatus(Task agvTask, String displayTaskId) {
try {
- // 鏋勫缓璁㈠崟ID锛屾牸寮忎负 "T" + wrkNo
- String orderId = null;
- if (agvTask.getWrkNo() != null) {
- orderId = "T" + agvTask.getWrkNo();
- } else {
- String errorMsg = String.format("鏌ヨAGV璁㈠崟鐘舵�佸け璐ワ細浠诲姟ID锛�%s锛寃rkNo涓虹┖", displayTaskId);
- log.warn("鏌ヨAGV璁㈠崟鐘舵�佸け璐� - 浠诲姟ID锛歿}锛寋}", displayTaskId, errorMsg);
- agvTask.setErrorMemo(errorMsg);
- agvTask.setErrorTime(new Date());
- taskService.updateById(agvTask);
- return null;
+ // 鏋勫缓璁㈠崟ID锛屼紭鍏堜娇鐢╝gvWrkNo锛屽鏋滀负绌哄垯浣跨敤T+wrkNo锛堝悜鍚庡吋瀹癸級
+ String orderId = agvTask.getAgvWrkNo();
+ if (orderId == null || orderId.isEmpty()) {
+ if (agvTask.getWrkNo() != null) {
+ orderId = "T" + agvTask.getWrkNo();
+ } else {
+ String errorMsg = String.format("鏌ヨAGV璁㈠崟鐘舵�佸け璐ワ細浠诲姟ID锛�%s锛宎gvWrkNo鍜寃rkNo閮戒负绌�", displayTaskId);
+ log.warn("鏌ヨAGV璁㈠崟鐘舵�佸け璐� - 浠诲姟ID锛歿}锛寋}", displayTaskId, errorMsg);
+ agvTask.setErrorMemo2(errorMsg);
+ agvTask.setErrorTime2(new Date());
+ taskService.updateById(agvTask);
+ return null;
+ }
}
// 鏋勫缓璇锋眰JSON
--
Gitblit v1.9.1