From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CLoadPort.h |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CLoadPort.h b/SourceCode/Bond/Servo/CLoadPort.h
index e0e42d0..523ab69 100644
--- a/SourceCode/Bond/Servo/CLoadPort.h
+++ b/SourceCode/Bond/Servo/CLoadPort.h
@@ -37,8 +37,13 @@
 		void localSetCessetteType(CassetteType type);
 		void localSetTransferMode(TransferMode mode);
 		void localAutoChangeEnable(BOOL bEnable);
+		short getScanCassetteMap();
+		short getDownloadCassetteMap();
 
 	public:
+		short getNextCassetteSequenceNo();
+		int getPortCassetteSnSeed();
+		void setPortCassetteSnSeed(int seed);
 		void setIndex(unsigned int index);
 		unsigned int getIndex();
 		BOOL isEnable();
@@ -54,7 +59,9 @@
 		int getQTimeFlag();
 		int getCassetteMappingState();
 		int getCassetteStatus();
-		int testGenerateGlassList(MaterialsType type, const char* pszPrefix, int startSuffix);
+		int testGenerateGlassList(MaterialsType type);
+		int generateGlassList(short map);
+		int testGenerateGlassListFromConfig(const SERVO::PortConfig& config);
 
 	public:
 		static std::string& getPortTypeDescription(PortType portType, std::string& strDescription);
@@ -74,8 +81,10 @@
 			int jobExistenceSize,
 			short slotProcess,
 			short jopCount,
-			CJobDataA* pJobDataA);
+			CJobDataA* pJobDataA,
+			ONWRITED onWritedBlock);
 		CStep* getCassetteCtrlCmdStep();
+		void setCompareMapsBeforeProceeding(BOOL bCompare);
 
 	private:
 		int decodePortStatusReport(CStep* pStep, const char* pszData, size_t size);
@@ -89,6 +98,10 @@
 		BOOL m_bEnable;
 		BOOL m_bAutoChangeEnable;
 		CPortStatusReport m_portStatusReport;
+		int m_nNextCassetteSequenceNo;
+
+		// 在开始工艺前是否先需要先比较map
+		BOOL m_isCompareMapsBeforeProceeding;
 	};
 }
 

--
Gitblit v1.9.3