From fd0dc8eec755272d9b5adfd58369195db55173c4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 25 六月 2025 10:36:12 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 5 ++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 4 ++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/ActionStsType.java | 1 +
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index b309815..05b6777 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -1244,10 +1244,13 @@
sortedList.add(actionList.get(i));
}
}
+ Action action = actionList.get(lastActionIndex);
+ action.setActionSts(ActionStsType.NEXT.val());
+ actionService.updateById(action);
actionList = sortedList;
}
- Action shang = actionService.getOne(new LambdaQueryWrapper<Action>().eq(Action::getAgvId, agvId).eq(Action::getActionSts, ActionStsType.PREPARE.val()).eq(Action::getActionType, ActionTypeType.ReadyReleaseToAgvSite.val()).orderByDesc(Action::getId));
+ Action shang = actionService.getOne(new LambdaQueryWrapper<Action>().eq(Action::getAgvId, agvId).eq(Action::getActionSts, ActionStsType.NEXT.val()).eq(Action::getActionType, ActionTypeType.ReadyReleaseToAgvSite.val()).ne(Action::getGroupId,actionGroupId));
if (shang != null) {
int turnCornerIdx = actionSorter.findFirstActionIndex(actionList, ActionTypeType.TurnCorner.val());
if (turnCornerIdx == -1) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
index ed819ef..0921679 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -384,6 +384,10 @@
// block vehicle info
Long blockAgvId = agvService.getAgvId(blockAgvNo);
+ if (agvDetailService.selectMajorByAgvId(blockAgvId).getRecentCode()==null){
+ log.info(blockAgvNo + "灏忚溅涓嶅湪瀹氫綅");
+ return null;
+ }
String blockAgvCode = codeService.getCacheById(agvDetailService.selectMajorByAgvId(blockAgvId).getRecentCode()).getData();
// create new jam if already notify the avoid vehicle
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/ActionStsType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/ActionStsType.java
index db6930c..8544818 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/ActionStsType.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/ActionStsType.java
@@ -14,6 +14,7 @@
ISSUED,
FINISH,
EXPIRED,
+ NEXT,
;
ActionStsType() {
--
Gitblit v1.9.1