From 5a66d26a2899a2450a50f00d09c728ae151715be Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 23 七月 2025 11:19:42 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/CLoadPort.h b/SourceCode/Bond/Servo/CLoadPort.h
index b8279c2..12776df 100644
--- a/SourceCode/Bond/Servo/CLoadPort.h
+++ b/SourceCode/Bond/Servo/CLoadPort.h
@@ -37,7 +37,8 @@
 		void localSetCessetteType(CassetteType type);
 		void localSetTransferMode(TransferMode mode);
 		void localAutoChangeEnable(BOOL bEnable);
-		short getCassetteMap();
+		short getScanCassetteMap();
+		short getDownloadCassetteMap();
 
 	public:
 		short getNextCassetteSequenceNo();
@@ -57,6 +58,7 @@
 		int getCassetteMappingState();
 		int getCassetteStatus();
 		int testGenerateGlassList(MaterialsType type);
+		int generateGlassList(short map);
 		int testGenerateGlassListFromConfig(const SERVO::PortConfig& config);
 
 	public:
@@ -80,6 +82,7 @@
 			CJobDataA* pJobDataA,
 			ONWRITED onWritedBlock);
 		CStep* getCassetteCtrlCmdStep();
+		void setCompareMapsBeforeProceeding(BOOL bCompare);
 
 	private:
 		int decodePortStatusReport(CStep* pStep, const char* pszData, size_t size);
@@ -94,6 +97,9 @@
 		BOOL m_bAutoChangeEnable;
 		CPortStatusReport m_portStatusReport;
 		int m_nNextCassetteSequenceNo;
+
+		// 在开始工艺前是否先需要先比较map
+		BOOL m_isCompareMapsBeforeProceeding;
 	};
 }
 

--
Gitblit v1.9.3