From b033217d3193b2f5ebabb43cce4c7cb2776df6ee Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 10 一月 2026 13:23:38 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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..18fb10e 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
+import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.ActionStsType;
@@ -73,6 +74,7 @@
.eq(Segment::getSerial, serial - 1)
.eq(Segment::getState, SegmentStateType.FINISH.toString())
.orderByDesc(Segment::getId)
+ .last("limit 1")
);
}
@@ -127,9 +129,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,7 +147,9 @@
}
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;
}
@@ -164,8 +169,33 @@
}
@Override
- public int countRemainingBackpack(Long travelId, Long agvId) {
- return this.baseMapper.countRemainingBackpack(agvId, travelId);
+ public List<Integer> selectUsedBackpacks(Long travelId, Long agvId) {
+ return this.baseMapper.selectUsedBackpacks(agvId, travelId);
+ }
+
+ @Override
+ public Segment getRollerWaiting(Long agvId, Long codeId, TaskPosDto.PosType posType) {
+ List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
+ .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)
+ );
+ if (Cools.isEmpty(segments)) {
+ return null;
+ }
+ return segments.get(0);
+ }
+
+ @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