From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/StaReserveService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/StaReserveService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/StaReserveService.java
index 77b84c3..18cc87a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/StaReserveService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/StaReserveService.java
@@ -1,6 +1,7 @@
package com.zy.acs.manager.manager.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.StaReserve;
import com.zy.acs.manager.manager.entity.Task;
@@ -13,7 +14,7 @@
StaReserve reserveStaOut(Sta sta, Task task, Integer qty);
- Boolean waitingStaReserve(Sta sta, Task task, Integer qty, StaReserveType type);
+ Boolean waitingStaReserve(Sta sta, Task task, Segment seg, Integer qty, StaReserveType type);
Boolean rollbackWaitingToReserved(Sta sta, Task task, StaReserveType staReserveType);
@@ -22,4 +23,7 @@
void cancelStaReserve(Sta sta, Task task, Integer qty, StaReserveType type);
+
+ void allocateCallBack(Task task, Long agvId);
+
}
--
Gitblit v1.9.1