From bfc9e3dec34e108e2b4c3d0bfe19c5c16914fdff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 23 六月 2025 13:46:30 +0800
Subject: [PATCH] 1. 配方管理类添加关键字查询（PPID和描述）

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

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 3752e2f..76c0f91 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);
@@ -223,7 +223,7 @@
 		int decodeVCREventReport(CStep* pStep, const char* pszData, size_t size);
 		int decodePanelDataReport(CStep* pStep, const char* pszData, size_t size);
 		int decodeFacDataReport(CStep* pStep, const char* pszData, size_t size);
-		int decodePanelDataRequest(CStep* pStep, const char* pszData, size_t size);
+		int decodeJobDataRequest(CStep* pStep, const char* pszData, size_t size);
 		BOOL compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS);
 		void setProcessState(PROCESS_STATE state);
 

--
Gitblit v1.9.3