From 7f1610d98fa352f17fc8a53597c4bb2a86f277ca Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 22 一月 2026 11:26:58 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 835bdad..b4d9a7b 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
@@ -6,6 +6,7 @@
import com.zy.acs.manager.core.integrate.dto.ConveyorQueryParam;
import com.zy.acs.manager.core.integrate.dto.ConveyorQueryResult;
import com.zy.acs.manager.manager.entity.Sta;
+import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.StaService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -38,8 +39,16 @@
.orderByAsc(Sta::getStaNo)
);
for (Sta sta : list) {
- resultList.add(new ConveyorQueryResult(sta.getStaNo()
- , !staService.hasWorkingAgv(sta.getId())));
+ Long staId = sta.getId();
+ boolean conveyable = !staService.hasWorkingAgv(staId);
+ String taskNo = null;
+ if (conveyable) {
+ Task task = staService.checkoutTask(staId);
+ if (null != task) {
+ taskNo = task.getSeqNum();
+ }
+ }
+ resultList.add(new ConveyorQueryResult(sta.getStaNo(), conveyable, taskNo));
}
} else {
for (String staNo : staNos) {
@@ -48,8 +57,16 @@
resultList.add(new ConveyorQueryResult(staNo, Boolean.FALSE));
continue;
}
- resultList.add(new ConveyorQueryResult(staNo
- , !staService.hasWorkingAgv(sta.getId())));
+ Long staId = sta.getId();
+ boolean conveyable = !staService.hasWorkingAgv(staId);
+ String taskNo = null;
+ if (conveyable) {
+ Task task = staService.checkoutTask(staId);
+ if (null != task) {
+ taskNo = task.getSeqNum();
+ }
+ }
+ resultList.add(new ConveyorQueryResult(staNo, conveyable, taskNo));
}
}
--
Gitblit v1.9.1