From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交

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

diff --git a/SourceCode/Bond/Servo/CPortStatusReport.h b/SourceCode/Bond/Servo/CPortStatusReport.h
index 4c6fa4b..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);

--
Gitblit v1.9.3