From e2bbbae80c232e386d7f06daab2a1daf2229bbc1 Mon Sep 17 00:00:00 2001
From: yy <yy123>
Date: 星期二, 30 十二月 2025 13:14:07 +0800
Subject: [PATCH] Merge branch 'whxr' of http://47.97.1.152:5880/r/rcs-flow into whxr
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java | 4 +++-
1 files changed, 3 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 1d38f7f..39115c1 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,7 @@
Segment getNextStepOfInit(Long travelId, Integer serial);
- Segment getPreviousStepOfFinish(Long travelId, Integer serial);
+ Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo);
List<Segment> getJustWaitingSeg(Long agvId);
@@ -24,4 +24,6 @@
List<Segment> getRunningByEndCode(Long codeId);
+ Boolean cancel(Long segmentId, Long userId);
+
}
--
Gitblit v1.9.1