From 88f79bdd26d0e9f0f811bd3c608ee76ef85c38d4 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 14:41:06 +0800
Subject: [PATCH] 出库时判断有没有正在执行的agv
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 6254a79..08cee4e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1289,8 +1289,19 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
//鍒ゆ柇鏄惁鏈夋鍦ㄦ墽琛屼腑鐨凙GV浠诲姟
- List<AgvTask> agvTasks = agvTaskService.selectList(new EntityWrapper<AgvTask>().eq("wrk_sts", 302).eq("source_sta_no", String.valueOf(staProtocol.getSiteId())));
- if (agvTasks != null && agvTasks.size() > 0) {
+ List<AgvTask> OUTagvTasks = agvTaskService.selectList(new EntityWrapper<AgvTask>()
+ .eq("wrk_sts", 302)
+ .eq("source_sta_no", String.valueOf(staProtocol.getSiteId()))
+ );
+ //鍒ゆ柇鏄惁鏈夋鍦ㄦ墽琛屼腑鐨凙GV浠诲姟
+ List<AgvTask> INagvTasks = agvTaskService.selectList(new EntityWrapper<AgvTask>()
+ .eq("wrk_sts", 302)
+ .eq("sta_no", String.valueOf(staProtocol.getSiteId()))
+ );
+ if (OUTagvTasks != null && OUTagvTasks.size() > 0) {
+ continue;
+ }
+ if (INagvTasks != null && INagvTasks.size() > 0) {
continue;
}
// 鍫嗗灈鏈烘帶鍒惰繃婊�
--
Gitblit v1.9.1