From 9923a4562e8dfac0c32fd2e90f60ca2c5fb79b89 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 29 十二月 2025 11:25:11 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 7 +++----
1 files changed, 3 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 c3eaf34..7398f70 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
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.ActionStsType;
@@ -11,7 +11,6 @@
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.mapper.SegmentMapper;
import com.zy.acs.manager.manager.service.*;
-import com.zy.acs.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -150,12 +149,12 @@
}
@Override
- public Segment getCurrRunningSeg(Long agvId, String qrCode) {
- Code codeId = codeService.getCacheByData(qrCode);
+ public Segment getCurrRunningSeg(Long agvId, Long codeId) {
List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
.eq(Segment::getAgvId, agvId)
.eq(Segment::getState, SegmentStateType.RUNNING.toString())
.eq(Segment::getEndNode, codeId)
+ .orderByDesc(Segment::getId)
);
if (Cools.isEmpty(segments)) {
--
Gitblit v1.9.1