From 980048d93f7ee401639d441d65f4f885749fd898 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 六月 2025 17:54:09 +0800
Subject: [PATCH] 1.Glass List页面修改为Slot并以Slot的形式展现数据，不论有无Glass

---
 SourceCode/Bond/Servo/CEquipment.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index cb1a615..8152520 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -150,6 +150,9 @@
 		// unitNo: 0:local; Others:unit No
 		int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);
 
+		// 获取指定的Slot
+		CSlot* getSlot(int index);
+
 		// 获取一个可用的槽位
 		CSlot* getAvailableSlot();
 
@@ -164,6 +167,7 @@
 
 		// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
 		CSlot* getProcessedSlot(MaterialsType putSlotType);
+		CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
 
 		// 获取玻璃物料
 		CGlass* getGlassFromSlot(int slotNo);

--
Gitblit v1.9.3