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/impl/SegmentServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
index a2df1e6..b8eca35 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
@@ -58,6 +58,16 @@
}
@Override
+ public Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo) {
+ return this.getOne(new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getTravelId, travelId)
+ .eq(Segment::getSerial, serial - 1)
+// .eq(Segment::getState, SegmentStateType.FINISH.toString())
+ .eq(Segment::getMemo, memo)
+ );
+ }
+
+ @Override
public List<Segment> getJustWaitingSeg(Long agvId) {
if (null == agvId) {
return null;
--
Gitblit v1.9.1