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/BEQLibrary/Unit.cpp |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/BEQLibrary/Unit.cpp b/SourceCode/Bond/BEQLibrary/Unit.cpp
index df10698..a5e49e2 100644
--- a/SourceCode/Bond/BEQLibrary/Unit.cpp
+++ b/SourceCode/Bond/BEQLibrary/Unit.cpp
@@ -62,6 +62,7 @@
 		m_listener.onRemoveAlarm = listener.onRemoveAlarm;
 		m_listener.onStepChanged = listener.onStepChanged;
 		m_listener.onDataChanged = listener.onDataChanged;
+		m_listener.onReqNotReady = listener.onReqNotReady;
 		m_listener.onReqLoad = listener.onReqLoad;
 		m_listener.onReqUnload = listener.onReqUnload;
 	}
@@ -212,6 +213,22 @@
 		return m_strAlarmText;
 	}
 
+	int CUnit::reqNotReady(int layer)
+	{
+		ASSERT(m_listener.onReqNotReady);
+		if (layer <= 0) return -1;
+		if (layer > m_nLayerCount) return -2;
+
+		// 状态改变才回调到上层
+		if (m_nLayerLoadState[layer - 1] != LAYER_NOT_READY) {
+			m_nLayerLoadState[layer - 1] = LAYER_NOT_READY;
+			m_listener.onReqNotReady(this, layer);
+			return 0;
+		}
+
+		return -3;
+	}
+
 	int CUnit::reqLoad(int layer)
 	{
 		ASSERT(m_listener.onReqLoad);

--
Gitblit v1.9.3