From 39efc87b3794f957aad73acf3a430b84e3a19b27 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 30 一月 2026 16:32:20 +0800
Subject: [PATCH] Merge branch 'rcs_master' into ctu_conveyor
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java
index 8afdba0..276355d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaServiceImpl.java
@@ -113,7 +113,6 @@
.orderByDesc(Segment::getId).last("LIMIT 1"));
if (null == lastSeg) {
return false;
-// continue;
}
Travel travel = travelService.getById(lastSeg.getTravelId());
if (travel.getState().equals(TravelStateType.FINISH.toString())) {
@@ -128,7 +127,16 @@
&& (segment.getPosType().equals(TaskPosDto.PosType.ORI_STA.toString())
|| segment.getPosType().equals(TaskPosDto.PosType.DEST_STA.toString()))
) {
- return true;
+ return 0 < staReserveService.count(new LambdaQueryWrapper<StaReserve>()
+ .eq(StaReserve::getStaId, staId)
+ .eq(StaReserve::getTaskId, segment.getTaskId())
+ .eq(StaReserve::getSegmentId, segment.getId())
+ .eq(StaReserve::getState, StaReserveStateType.WAITING.toString())
+// .eq(StaReserve::getType, StaReserveType.IN.toString())
+ .eq(StaReserve::getStatus, StatusType.ENABLE.val)
+ .orderByDesc(StaReserve::getUpdateTime)
+// .last("limit 1")
+ );
}
}
}
--
Gitblit v1.9.1