From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
index 02803e3..a18a2dd 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
@@ -12,7 +12,9 @@
Segment getNextStepOfInit(Long travelId, Integer serial);
- Segment getJustWaitingSeg(Long agvId);
+ Segment getPreviousStepOfFinish(Long travelId, Integer serial);
+
+ List<Segment> getJustWaitingSeg(Long agvId);
List<Segment> getSamePos(List<Segment> segmentList);
@@ -20,4 +22,16 @@
List<String> getGroupNo(SegmentStateType state, Long agvId, String groupNo);
+ List<Segment> getRunningByEndCode(Long codeId);
+
+ Boolean cancel(Long segmentId, Long userId);
+
+ Segment getCurrWaitingSeg(Long travelId, Long agvId);
+
+ Segment getCurrRunningSeg(Long travelId, Long agvId, Long codeId);
+
+ List<Integer> selectUsedBackpacks(Long travelId, Long agvId);
+
+ Boolean isRollerWaiting(Long agvId);
+
}
--
Gitblit v1.9.1