From f81c0ff58a4f5df9a62703c4361d1a5adc63570f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 22 一月 2026 10:44:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 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 343256d..fd87fb8 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
@@ -73,6 +73,7 @@
.eq(Segment::getSerial, serial - 1)
.eq(Segment::getState, SegmentStateType.FINISH.toString())
.orderByDesc(Segment::getId)
+ .last("limit 1")
);
}
@@ -127,9 +128,10 @@
public Boolean cancel(Long segmentId, Long userId) {
Date now = new Date();
Segment segment = this.getById(segmentId);
+ Long travelId = segment.getTravelId();
String groupId = segment.getGroupId();
// update segment list
- List<Segment> segmentList = this.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupId));
+ List<Segment> segmentList = this.list(new LambdaQueryWrapper<Segment>().eq(Segment::getTravelId, travelId));
for (Segment seg : segmentList) {
Task task = taskService.getById(segment.getTaskId());
if (task != null &&
@@ -144,28 +146,58 @@
}
this.processNext(segmentList);
// update action list
- actionService.updateStsByGroupId(groupId, ActionStsType.EXPIRED.val());
+ if (!Cools.isEmpty(groupId)) {
+ actionService.updateStsByGroupId(groupId, ActionStsType.EXPIRED.val());
+ }
return Boolean.TRUE;
}
@Override
- public Segment getCurrRunningSeg(Long agvId, Long codeId) {
+ 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.RUNNING.toString())
- .eq(Segment::getEndNode, codeId)
+ .eq(Segment::getState, SegmentStateType.WAITING.toString())
.orderByDesc(Segment::getId)
);
-
if (Cools.isEmpty(segments)) {
-
}
return segments.stream().findFirst().orElse(null);
}
@Override
- public int countRemainingBackpack(Long travelId, Long agvId) {
- return this.baseMapper.countRemainingBackpack(agvId, travelId);
+ public Segment getCurrRunningSeg(Long travelId, Long agvId, Long codeId) {
+ if (null == agvId) {
+ return null;
+ }
+ LambdaQueryWrapper<Segment> wrapper = new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getAgvId, agvId)
+ .eq(Segment::getState, SegmentStateType.RUNNING.toString());
+ if (null != travelId) {
+ wrapper.eq(Segment::getTravelId, travelId);
+ }
+ if (null != codeId) {
+ wrapper.eq(Segment::getEndNode, codeId);
+ }
+ wrapper.orderByDesc(Segment::getId);
+ List<Segment> segments = this.list(wrapper);
+ if (Cools.isEmpty(segments)) {
+ }
+ return segments.stream().findFirst().orElse(null);
+ }
+
+ @Override
+ public List<Integer> selectUsedBackpacks(Long travelId, Long agvId) {
+ return this.baseMapper.selectUsedBackpacks(agvId, travelId);
+ }
+
+ @Override
+ public Boolean isRollerWaiting(Long agvId) {
+ return 0 < this.count(new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getAgvId, agvId)
+ .eq(Segment::getState, SegmentStateType.WAITING.toString())
+ .eq(Segment::getRollerWaiting, 1)
+ );
}
}
--
Gitblit v1.9.1