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 ++++- 1 files changed, 4 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) { -- Gitblit v1.9.1