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/Equipment.cpp | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BEQLibrary/Equipment.cpp b/SourceCode/Bond/BEQLibrary/Equipment.cpp
index 144c390..d956042 100644
--- a/SourceCode/Bond/BEQLibrary/Equipment.cpp
+++ b/SourceCode/Bond/BEQLibrary/Equipment.cpp
@@ -144,6 +144,11 @@
repData(m_pActiveClient, (CUnit*)pUnit, AS_MC_INFO_REP);
}
};
+ listener.onReqNotReady = [&](void* pUnit, int layer) -> void {
+ if (m_pActiveClient != nullptr) {
+ repNotReady(m_pActiveClient, (CUnit*)pUnit, layer, AS_SEND_EVENT_REP);
+ }
+ };
listener.onReqLoad = [&](void* pUnit, int layer) -> void {
if (m_pActiveClient != nullptr) {
repLoad(m_pActiveClient, (CUnit*)pUnit, layer, AS_SEND_EVENT_REP);
@@ -836,6 +841,27 @@
return 0;
}
+ void CEquipment::repNotReady(CAcceptClient* pClient, CUnit* pUnit, int layer, const char* pszReply)
+ {
+ ASSERT(pClient != nullptr);
+ CString strReply;
+ if (pUnit->getLayerCount() == 1) {
+ strReply.Format(_T("%s@%s=%s/%s=%s/%s=%s#"), pszReply,
+ PARAM_EQID, m_strName.c_str(),
+ PARAM_UNIT, pUnit->getName().c_str(),
+ PARAM_EVENT, EVENT_NOTREADY);
+ }
+ else {
+ strReply.Format(_T("%s@%s=%s/%s=%s%d/%s=%s#"), pszReply,
+ PARAM_EQID, m_strName.c_str(),
+ PARAM_UNIT, pUnit->getName().c_str(), layer,
+ PARAM_EVENT, EVENT_NOTREADY);
+ }
+
+
+ pClient->Send((LPTSTR)(LPCTSTR)strReply, strReply.GetLength());
+ }
+
void CEquipment::repLoad(CAcceptClient* pClient, CUnit* pUnit, int layer, const char* pszReply)
{
ASSERT(pClient != nullptr);
--
Gitblit v1.9.3