From 56fd8f57fcc763ae079ae752d82e41b38d7d9e5f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 16 六月 2025 10:50:16 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index cb1a615..a9dfdf7 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);
@@ -181,6 +185,8 @@
 		// 指定槽位是否可以放置玻璃
 		BOOL canPlaceGlassInSlot(const short slotIndex);
 
+		// 手动移除物料
+		int removeGlass(int slotNo);
 
 	// 以下为从CC-Link读取到的Bit标志位检测函数
 	public:
@@ -210,6 +216,8 @@
 		int decodeFetchedOutJobReport(CStep* pStep, int port, const char* pszData, size_t size);
 		int decodeStoredJobReport(CStep* pStep, int port, const char* pszData, size_t size);
 		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 addJobDataB(CJobDataB* pJobDataB);
 		int removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
 		CJobDataB* getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);

--
Gitblit v1.9.3