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/CWriteStep.h |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CWriteStep.h b/SourceCode/Bond/Servo/CWriteStep.h
index 6bb6b30..e8e66cf 100644
--- a/SourceCode/Bond/Servo/CWriteStep.h
+++ b/SourceCode/Bond/Servo/CWriteStep.h
@@ -19,8 +19,14 @@
 		virtual void getAttributeVector(CAttributeVector& attrubutes);
 		virtual int onComplete();
 		virtual int onTimeout();
+		virtual int onReadRetDataError();
 		inline void nextStep();
 		inline void resetStep();
+		virtual void setRetDataDev(int dev, int size);
+
+	public:
+		int getReturnData(const char*& pszData);
+
 
 	protected:
 		HANDLE m_hWorkThreadHandle;
@@ -33,6 +39,12 @@
 		char m_szBuffer[1024];
 		int m_nWriteDataSize;
 		int m_nWriteDevNo;
+
+	protected:
+		// return code or data
+		char m_szReturnBuf[1024];
+		int m_nReturnDataSize;
+		int m_nReturnDevNo;
 	};
 }
 

--
Gitblit v1.9.3