From b22c773435474fcdaea05c6239d9cc94bbfd499c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 04 二月 2026 13:56:31 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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..9091852 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,9 +6,9 @@
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;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,7 +22,7 @@
@Api(tags = "Open Api")
@RestController
@RequestMapping("/api/open")
-public class ConveyorController extends BaseController {
+public class ConveyorController {
@Autowired
private StaService staService;
@@ -38,16 +38,34 @@
.orderByAsc(Sta::getStaNo)
);
for (Sta sta : list) {
- resultList.add(new ConveyorQueryResult(sta.getStaNo(), Boolean.TRUE));
+ 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) {
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));
+ 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