From bea6407b376a4e426f0b120bae569fba6ab867db Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 08 十一月 2025 17:55:47 +0800
Subject: [PATCH] 1.CMaster.cpp 第 1644/1667/1691 行在记录 SV 曲线时通过 getGlassFromSlot(0) 取玻璃，而各设备的 initSlots() 都是从 1 开始编号（例如 CBonder.cpp (line 408)、CVacuumBake.cpp (line 415) 等）。槽位 0 永远不存在，所以 pGlass 始终是 nullptr，pGlass->addSVData(...) 的分支从未执行。结果 SERVO::CGlass::m_svDatas 里没有任何曲线数据，GlassJson::ToPrettyString 生成的 pretty 字符串也就没有 sv_datas，导出 CSV 时自然读不到曲线。 同一段代码还有一个潜在 Bug：虽然判断了 channel - 1 < bonderTypes.size()，但真正索引却用的是 bonderTypes[channel]。索引偏移会导致数据类型错位，最后一个通道甚至可能越界。即使修正了槽位，这里也需要同步改成 bonderTypes[channel - 1]（另外两处 vacuumbakeTypes、coolingTypes 也一样）。
---
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