From 1bc33546a044cbc84dd9595c19dbcd9a4e309fc9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 10 一月 2026 14:06:10 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java
index 303144e..5aae91c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java
@@ -38,16 +38,18 @@
.orderByAsc(Sta::getStaNo)
);
for (Sta sta : list) {
- resultList.add(new ConveyorQueryResult(sta.getStaNo(), Boolean.TRUE));
+ resultList.add(new ConveyorQueryResult(sta.getStaNo()
+ , staService.hasWorkingAgv(sta.getId())));
}
} else {
for (String staNo : staNos) {
Sta sta = staService.selectByStaNo(staNo);
- if (null == sta) {
+ if (null == sta || !sta.getStatus().equals(StatusType.ENABLE.val)) {
resultList.add(new ConveyorQueryResult(staNo, Boolean.FALSE));
continue;
}
- resultList.add(new ConveyorQueryResult(staNo, Boolean.TRUE));
+ resultList.add(new ConveyorQueryResult(staNo
+ , staService.hasWorkingAgv(sta.getId())));
}
}
--
Gitblit v1.9.1