From 507d28f90ec6772b3e4d73a57aad59263031112b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 21 三月 2025 08:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jbly' into jbly
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 737f465..2a721d2 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,6 +12,8 @@
Segment getNextStepOfInit(Long travelId, Integer serial);
+ Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo);
+
List<Segment> getJustWaitingSeg(Long agvId);
List<Segment> getSamePos(List<Segment> segmentList);
@@ -20,4 +22,6 @@
List<String> getGroupNo(SegmentStateType state, Long agvId, String groupNo);
+ List<Segment> getRunningByEndCode(Long codeId);
+
}
--
Gitblit v1.9.1