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/CPortStatusReport.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPortStatusReport.h b/SourceCode/Bond/Servo/CPortStatusReport.h
index 526c94a..fb73f36 100644
--- a/SourceCode/Bond/Servo/CPortStatusReport.h
+++ b/SourceCode/Bond/Servo/CPortStatusReport.h
@@ -14,6 +14,7 @@
 	public:
 		void copyEx(CPortStatusReport& other);
 		short getPortStatus();
+		void setPortStatus(short status);
 		short getCassetteSequenceNo();
 		std::string& getCassetteId();
 		short getLoadingCassetteType();
@@ -28,6 +29,9 @@
 	public:
 		bool canPickFromPort();
 		bool isJobExistenceSlot();
+		short getJobExistenceSlot();
+		void setJobExistenceSlot(short map);
+		void setCassetteId(const char* pszId);
 
 	private:
 		void WriteString(CArchive& ar, std::string& string);
@@ -40,7 +44,7 @@
 		short m_nJobExistenceSlot[12];		// 12 * 16 = 192 个slot是否存在glass
 		short m_nLoadingCassetteType;		// 1: Actual Cassette 2 : Empty Cassette
 		short m_nQTimeFlag;
-		short m_nCassetteMappingState;		// 1: mapping use  2: mapping not use
+		short m_nCassetteMappingState;		// 1: mapping use, 2: mapping not use
 		short m_nCassetteStatus;
 	};
 }

--
Gitblit v1.9.3