From 5b686555ac1b0a632fb1da7fd5ec717e79041c37 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 22 一月 2026 10:12:43 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 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 4eca108..7ea801d 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
@@ -154,6 +154,19 @@
}
@Override
+ public Segment getCurrWaitingSeg(Long travelId, Long agvId) {
+ List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getTravelId, travelId)
+ .eq(Segment::getAgvId, agvId)
+ .eq(Segment::getState, SegmentStateType.WAITING.toString())
+ .orderByDesc(Segment::getId)
+ );
+ if (Cools.isEmpty(segments)) {
+ }
+ return segments.stream().findFirst().orElse(null);
+ }
+
+ @Override
public Segment getCurrRunningSeg(Long agvId, Long codeId) {
List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
.eq(Segment::getAgvId, agvId)
@@ -161,9 +174,7 @@
.eq(Segment::getEndNode, codeId)
.orderByDesc(Segment::getId)
);
-
if (Cools.isEmpty(segments)) {
-
}
return segments.stream().findFirst().orElse(null);
}
@@ -171,21 +182,6 @@
@Override
public List<Integer> selectUsedBackpacks(Long travelId, Long agvId) {
return this.baseMapper.selectUsedBackpacks(agvId, travelId);
- }
-
- @Override // todo
- public Segment hasRollerWaitingNow(Long travelId, Long agvId, Long codeId, TaskPosDto.PosType posType) {
- List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
- .eq(Segment::getTravelId, travelId)
- .eq(Segment::getAgvId, agvId)
- .eq(Segment::getState, SegmentStateType.WAITING.toString())
- .eq(Segment::getEndNode, codeId)
- .eq(Segment::getPosType, posType.toString())
- .eq(Segment::getRollerWaiting, 1)
- .orderByDesc(Segment::getId)
- );
-
- return null;
}
@Override //todo
@@ -204,7 +200,7 @@
return segments.get(0);
}
- @Override // todo
+ @Override
public Boolean isRollerWaiting(Long agvId) {
return 0 < this.count(new LambdaQueryWrapper<Segment>()
.eq(Segment::getAgvId, agvId)
--
Gitblit v1.9.1