From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:43:40 +0800
Subject: [PATCH] 1.修复以下问题： ProceedWithCarrier 直接发 CCC_PROCESS_START：CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时，收到 ProceedWithCarrier 就调用 master.proceedWithCarrier（仅发送 Cassette Process Start，不校验 PJ/CJ 是否存在、SlotMap 是否验通过）。若 Host 流程异常（未下 PJ/CJ）或本地尚未准备好，会把设备推进加工态但无作业可跑。

---
 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