From 46168fbb7c925b0ec04def176095e967720e684a Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期五, 16 一月 2026 15:22:07 +0800
Subject: [PATCH] agv查询修复
---
src/main/java/com/zy/asrs/task/AgvScheduler.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AgvScheduler.java b/src/main/java/com/zy/asrs/task/AgvScheduler.java
index 5eb5e6f..cd317c9 100644
--- a/src/main/java/com/zy/asrs/task/AgvScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvScheduler.java
@@ -146,6 +146,7 @@
Date now = new Date();
int completedCount = 0;
+ List<Task> completedTasks = new ArrayList<>();
for (WrkMast wrkMast : completedWrkMasts) {
// 鏌ユ壘瀵瑰簲鐨凙GV浠诲姟锛堜紭鍏堥�氳繃wrk_no鏌ヨ锛�
@@ -173,11 +174,22 @@
agvTask.setWrkSts(9L);
agvTask.setModiTime(now);
if (taskService.updateById(agvTask)) {
+ completedTasks.add(agvTask);
completedCount++;
log.info("鍏ュ簱浠诲姟宸ヤ綔妗ｅ凡鍏ュ簱鎴愬姛锛屽畬缁揂GV鍛煎彨鍗曪紝taskId锛歿}锛寃rkNo锛歿}锛宐arcode锛歿}",
agvTask.getId(), wrkMast.getWrkNo(), wrkMast.getBarcode());
}
}
+ }
+ }
+
+ // 绔嬪嵆灏嗗畬鎴愮殑AGV浠诲姟杞Щ鍒板巻鍙茶〃锛屼笉淇濈暀鍦═ask琛ㄤ腑
+ if (!completedTasks.isEmpty()) {
+ try {
+ agvHandler.moveTaskToHistory(completedTasks);
+ log.info("鍏ュ簱瀹屾垚锛屽凡灏唟}涓狝GV浠诲姟杞Щ鍒板巻鍙茶〃锛堜笉淇濈暀鍦═ask琛ㄤ腑锛�", completedTasks.size());
+ } catch (Exception e) {
+ log.error("鍏ュ簱瀹屾垚锛岃浆绉籄GV浠诲姟鍒板巻鍙茶〃澶辫触", e);
}
}
@@ -213,6 +225,7 @@
Date now = new Date();
int completedCount = 0;
+ List<Task> completedTasks = new ArrayList<>();
for (Task agvTask : agvTasks) {
boolean isCompleted = false;
@@ -288,11 +301,12 @@
}
}
- // 濡傛灉宸插畬鎴愶紝鏇存柊AGV浠诲姟鐘舵��
+ // 濡傛灉宸插畬鎴愶紝鏇存柊AGV浠诲姟鐘舵�佸苟鏀堕泦鍒板垪琛�
if (isCompleted) {
agvTask.setWrkSts(9L);
agvTask.setModiTime(now);
if (taskService.updateById(agvTask)) {
+ completedTasks.add(agvTask);
completedCount++;
log.info("{}锛屽畬缁揂GV鍛煎彨鍗曪紝taskId锛歿}锛寃rkNo锛歿}锛宐arcode锛歿}锛岀珯鐐癸細{}",
reason, agvTask.getId(), agvTask.getWrkNo(), agvTask.getBarcode(), agvTask.getStaNo());
@@ -300,6 +314,16 @@
}
}
+ // 绔嬪嵆灏嗗畬鎴愮殑AGV浠诲姟杞Щ鍒板巻鍙茶〃锛屼笉淇濈暀鍦═ask琛ㄤ腑
+ if (!completedTasks.isEmpty()) {
+ try {
+ agvHandler.moveTaskToHistory(completedTasks);
+ log.info("鍏ュ簱/鍑哄簱瀹屾垚锛屽凡灏唟}涓狝GV浠诲姟杞Щ鍒板巻鍙茶〃锛堜笉淇濈暀鍦═ask琛ㄤ腑锛�", completedTasks.size());
+ } catch (Exception e) {
+ log.error("鍏ュ簱/鍑哄簱瀹屾垚锛岃浆绉籄GV浠诲姟鍒板巻鍙茶〃澶辫触", e);
+ }
+ }
+
if (completedCount > 0) {
log.info("鏈妫�鏌ュ畬缁撲簡{}涓狝GV鍛煎彨鍗曪紙宸ヤ綔妗ｅ凡瀹屾垚鎴栧凡杞巻鍙叉。锛�", completedCount);
}
--
Gitblit v1.9.1