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 |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 d6177fd..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
@@ -26,8 +26,12 @@
 
     Boolean cancel(Long segmentId, Long userId);
 
-    Segment getCurrRunningSeg(Long agvId, Long codeId);
+    Segment getCurrWaitingSeg(Long travelId, Long agvId);
 
-    int countRemainingBackpack(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