From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/StaReserveService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 45a32cd..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,13 +14,16 @@
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 currTask, StaReserveType staReserveType);
+ Boolean rollbackWaitingToReserved(Sta sta, Task task, StaReserveType staReserveType);
void confirmStaReserve(Sta sta, Task task, Integer qty, StaReserveType type);
void cancelStaReserve(Sta sta, Task task, Integer qty, StaReserveType type);
+
+ void allocateCallBack(Task task, Long agvId);
+
}
--
Gitblit v1.9.1