From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/CLoadPort.h b/SourceCode/Bond/Servo/CLoadPort.h
index 0910af3..12776df 100644
--- a/SourceCode/Bond/Servo/CLoadPort.h
+++ b/SourceCode/Bond/Servo/CLoadPort.h
@@ -37,6 +37,8 @@
 		void localSetCessetteType(CassetteType type);
 		void localSetTransferMode(TransferMode mode);
 		void localAutoChangeEnable(BOOL bEnable);
+		short getScanCassetteMap();
+		short getDownloadCassetteMap();
 
 	public:
 		short getNextCassetteSequenceNo();
@@ -56,6 +58,8 @@
 		int getCassetteMappingState();
 		int getCassetteStatus();
 		int testGenerateGlassList(MaterialsType type);
+		int generateGlassList(short map);
+		int testGenerateGlassListFromConfig(const SERVO::PortConfig& config);
 
 	public:
 		static std::string& getPortTypeDescription(PortType portType, std::string& strDescription);
@@ -75,8 +79,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);
@@ -91,6 +97,9 @@
 		BOOL m_bAutoChangeEnable;
 		CPortStatusReport m_portStatusReport;
 		int m_nNextCassetteSequenceNo;
+
+		// 在开始工艺前是否先需要先比较map
+		BOOL m_isCompareMapsBeforeProceeding;
 	};
 }
 

--
Gitblit v1.9.3