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/Servo/CEqJobEventStep.cpp | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index a0efb8b..b8f998c 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
@@ -21,28 +21,11 @@
void CEqJobEventStep::getAttributeVector(CAttributeVector& attrubutes)
{
- CReadStep::getAttributeVector(attrubutes);
-
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Dev",
- ("W" + CToolUnits::toHexString(m_nJobDataADev, strTemp)).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("PortNo",
- std::to_string(m_jobDataA.getPortNo()).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("CarrierId",
- m_jobDataA.getCarrierId().c_str(), ""));
- attrubutes.addAttribute(new CAttribute("PruductId",
- m_jobDataA.getPruductId().c_str(), ""));
- attrubutes.addAttribute(new CAttribute("CarrierState",
- m_jobDataA.getCarrierStateDescription(strTemp).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("SlotMapping",
- std::to_string(m_jobDataA.getSlotMapping()).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("SlotSelectedFlag",
- std::to_string(m_jobDataA.getSlotSelectedFlag()).c_str(), ""));
- std::vector<std::string>& ids = m_jobDataA.getGlassIds();
- for (int i = 0; i < ids.size(); i++) {
- attrubutes.addAttribute(new CAttribute((std::string("GlassId") + std::to_string(i+1)).c_str(),
- ids[i].c_str(), ""));
- }
+ ("W" + CToolUnits::toHexString(m_nJobDataADev, strTemp)).c_str(), "", weight++));
+ m_jobDataS.getAttributeVector(attrubutes, weight);
}
int CEqJobEventStep::onReadData()
@@ -57,7 +40,7 @@
return -1;
}
- m_jobDataA.unserialize(szBuffer, 640);
+ m_jobDataS.unserialize(szBuffer, 640);
LOGI("<CEqJobEventStep-%s>Read JobDataA\n", m_strName.c_str());
return 0;
@@ -74,13 +57,13 @@
int CEqJobEventStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEqJobEventStep> onTimeout.");
+ LOGE("<CEqJobEventStep> onTimeout.");
return 0;
}
- CJobDataA* CEqJobEventStep::getJobDataA()
+ CJobDataS* CEqJobEventStep::getJobDataS()
{
- return &m_jobDataA;
+ return &m_jobDataS;
}
}
--
Gitblit v1.9.3