From 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 13 一月 2025 09:38:29 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index 88dc08e..9074ef0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -25,6 +25,8 @@
public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {
@Autowired
+ private BusService busService;
+ @Autowired
private CodeService codeService;
@Autowired
private LocService locService;
@@ -94,6 +96,7 @@
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
+ busService.checkoutComplete(task.getBusId());
return Boolean.TRUE;
}
@@ -112,6 +115,7 @@
if (!this.updateById(task)) {
throw new CoolException(BaseRes.ERROR);
}
+ busService.checkoutComplete(task.getBusId());
return Boolean.TRUE;
}
@@ -176,7 +180,7 @@
}
@Override
- public List<Task> findRunningTasksByAgv(Long agvId) {
+ public List<Task> findTransportTasksByAgv(Long agvId) {
if (null == agvId) {
return new ArrayList<>();
}
@@ -187,13 +191,16 @@
}
@Override
- public Task findLatestTask(Long agvId) {
+ public Task findLatestTask(Long agvId, TaskStsType taskSts) {
LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>()
.orderByDesc(Task::getCreateTime)
.last("limit 0, 1");
if (null != agvId) {
wrapper.eq(Task::getAgvId, agvId);
}
+ if (null != taskSts) {
+ wrapper.eq(Task::getTaskSts, taskSts.val());
+ }
return this.list(wrapper).stream().findFirst().orElse(null);
}
--
Gitblit v1.9.1