From bc64b3b45cf00885696aea4cfa97230390717012 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 17 六月 2025 15:38:59 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 ada2d61..d797b58 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
@@ -105,6 +105,16 @@
}
@Override
+ public List<Segment> getByAgvAndTaskAndBackpack(Long agvId,List<Long> taskIds, Integer backpack) {
+ return this.list(new LambdaQueryWrapper<Segment>()
+ .eq(Segment::getAgvId, agvId)
+ .eq(Segment::getBackpack, backpack)
+ .in(Segment::getTaskId, taskIds)
+ .orderByAsc(Segment::getSerial)
+ );
+ }
+
+ @Override
public List<String> getGroupNo(SegmentStateType state, Long agvId, String groupNo) {
return this.baseMapper.getGroupNo(state.toString(), agvId, groupNo);
}
@@ -131,7 +141,7 @@
for (Segment seg : segmentList) {
Task task = taskService.getById(segment.getTaskId());
if (task != null &&
- (!task.getTaskTypeEl().equals(TaskStsType.COMPLETE.toString()) || !task.getTaskTypeEl().equals(TaskStsType.CANCEL.toString()))) {
+ (!task.getTaskSts().equals(TaskStsType.COMPLETE.val()) && !task.getTaskSts().equals(TaskStsType.CANCEL.val()))) {
throw new CoolException("the task is not finish");
}
seg.setState(SegmentStateType.FINISH.toString());
--
Gitblit v1.9.1