From f2631e786cc1c939e0a0698eadee76fd3d9a1fa9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 10 一月 2025 16:39:41 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
index d213f35..b217b39 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -3,17 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.R;
-import com.zy.acs.manager.manager.entity.Agv;
-import com.zy.acs.manager.manager.entity.AgvDetail;
-import com.zy.acs.manager.manager.entity.Code;
-import com.zy.acs.manager.manager.entity.Task;
+import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.enums.TaskTypeType;
-import com.zy.acs.manager.manager.service.AgvDetailService;
-import com.zy.acs.manager.manager.service.AgvService;
-import com.zy.acs.manager.manager.service.CodeService;
-import com.zy.acs.manager.manager.service.TaskService;
+import com.zy.acs.manager.manager.enums.TravelStateType;
+import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +50,7 @@
@Autowired
private MapService mapService;
@Autowired
- private LaneService laneService;
+ private TravelService travelService;
@Autowired
private AllocateService allocateService;
@Autowired
@@ -66,17 +61,23 @@
}
private void patrolOfMove(String agvNo) {
- Agv agv = agvService.selectByUuid(agvNo);
- AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agv.getId());
- if (taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getAgvId, agv.getId())
- .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
- ) > 0) {
+ Long agvId = agvService.getAgvId(agvNo);
+ AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agvId);
+ if (0 < travelService.count(new LambdaQueryWrapper<Travel>()
+ .eq(Travel::getAgvId, agvId)
+ .eq(Travel::getState, TravelStateType.RUNNING.toString()))) {
return;
}
- if (!agvService.judgeEnable(agv.getId())) {
+// if (taskService.count(new LambdaQueryWrapper<Task>()
+// .eq(Task::getAgvId, agvId)
+// .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
+// ) > 0) {
+// return;
+// }
+ if (!agvService.judgeEnable(agvId)) {
return;
}
+ Agv agv = agvService.getById(agvId);
Code destinationCode = this.getDestinationCode(agv, agvDetail);
if (null == destinationCode) {
return;
--
Gitblit v1.9.1