From 69e6f36a3fb8f2763ea353b96e1f40aa3e785b5b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 18:06:04 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
index ba9cc14..911276d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
@@ -211,8 +211,8 @@
}
@Override
- public void allocateCallBack(Sta sta, Task task, Long agvId) {
- if (Cools.isEmpty(sta, task, agvId)) {
+ public void allocateCallBack(Task task, Long agvId) {
+ if (Cools.isEmpty(task, agvId)) {
return;
}
TaskTypeType taskType = TaskTypeType.get(task.getTaskTypeEl());
@@ -226,7 +226,7 @@
case LOC_TO_STA:
inStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
.eq(StaReserve::getTaskId, task.getId())
- .eq(StaReserve::getStaId, sta.getId())
+ .eq(StaReserve::getStaId, task.getDestSta())
.eq(StaReserve::getType, StaReserveType.IN.toString())
.eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
// .gt(StaReserve::getExpireTime, now)
@@ -238,7 +238,7 @@
case STA_TO_LOC:
outStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
.eq(StaReserve::getTaskId, task.getId())
- .eq(StaReserve::getStaId, sta.getId())
+ .eq(StaReserve::getStaId, task.getOriSta())
.eq(StaReserve::getType, StaReserveType.OUT.toString())
.eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
// .gt(StaReserve::getExpireTime, now)
@@ -250,14 +250,14 @@
case STA_TO_STA:
inStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
.eq(StaReserve::getTaskId, task.getId())
- .eq(StaReserve::getStaId, sta.getId())
+ .eq(StaReserve::getStaId, task.getDestSta())
.eq(StaReserve::getType, StaReserveType.IN.toString())
.eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
// .gt(StaReserve::getExpireTime, now)
);
outStaReserve = this.getOne(new LambdaQueryWrapper<StaReserve>()
.eq(StaReserve::getTaskId, task.getId())
- .eq(StaReserve::getStaId, sta.getId())
+ .eq(StaReserve::getStaId, task.getOriSta())
.eq(StaReserve::getType, StaReserveType.OUT.toString())
.eq(StaReserve::getState, StaReserveStateType.RESERVED.toString())
// .gt(StaReserve::getExpireTime, now)
@@ -276,14 +276,14 @@
inStaReserve.setAgvId(agvId);
inStaReserve.setUpdateTime(now);
if (!this.updateById(inStaReserve)) {
- throw new CoolException("Sta[" + sta.getStaNo() + "] reserve failed");
+ throw new CoolException("failed to update sta reserve");
}
}
if (null != outStaReserve) {
outStaReserve.setAgvId(agvId);
outStaReserve.setUpdateTime(now);
if (!this.updateById(outStaReserve)) {
- throw new CoolException("Sta[" + sta.getStaNo() + "] reserve failed");
+ throw new CoolException("failed to update sta reserve");
}
}
}
--
Gitblit v1.9.1