From 7a60f2a3404220dcbc05e2e06fd7f3a6e51d5a4a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 19 六月 2025 15:37:20 +0800
Subject: [PATCH] 1.对Panel Data Request的响应；

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

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 3752e2f..8e45d80 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -176,16 +176,16 @@
 
 		// 获取玻璃物料
 		CGlass* getGlassFromSlot(int slotNo);
+		CGlass* getGlassWithCassette(int cassetteSequenceNo, int jobSequenceNo);
 		CGlass* getAnyGlass();
+		CGlass* getGlass(const char* pszGlassId);
+		CJobDataS* getJobDataSWithCassette(int cassetteSequenceNo, int jobSequenceNo);
 
 		// 验证玻璃和槽是否匹配
 		BOOL ValidateGlassSlotMatch();
 
 		// 是否有玻璃
 		BOOL hasGlass();
-
-		// 获取指定ID的glass
-		CGlass * getGlass(const char* pszGlassId);
 
 		// 指定槽位是否可以放置玻璃
 		BOOL canPlaceGlassInSlot(const short slotIndex);

--
Gitblit v1.9.3