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 |   98 ++-----------------------------------------------
 1 files changed, 4 insertions(+), 94 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index 49d43b8..b8f998c 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
@@ -21,101 +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("CassetteSequenceNo",
-			std::to_string(m_jobDataS.getCassetteSequenceNo()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("JobSequenceNo",
-			std::to_string(m_jobDataS.getJobSequenceNo()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("LotId",
-			m_jobDataS.getLotId().c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("ProductId",
-			m_jobDataS.getProductId().c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("OperationId",
-			m_jobDataS.getOperationId().c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("Glass1Id",
-			m_jobDataS.getGlass1Id().c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("Glass2Id",
-			m_jobDataS.getGlass2Id().c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("JobType",
-			std::to_string(m_jobDataS.getJobType()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("MaterialsType",
-			std::to_string(m_jobDataS.getMaterialsType()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("ProductType",
-			std::to_string(m_jobDataS.getProductType()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("DummyType",
-			std::to_string(m_jobDataS.getDummyType()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("SkipFlag",
-			std::to_string(m_jobDataS.getSkipFlag()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("ProcessFlag",
-			std::to_string(m_jobDataS.getProcessFlag()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("ProcessResonCode",
-			std::to_string(m_jobDataS.getProcessResonCode()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("LastGlassFlag",
-			std::to_string(m_jobDataS.getLastGlassFlag()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("FirstGlassFlag",
-			std::to_string(m_jobDataS.getFirstGlassFlag()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("QTime1",
-			std::to_string(m_jobDataS.getQTime(0)).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("QTime2",
-			std::to_string(m_jobDataS.getQTime(1)).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("QTime3",
-			std::to_string(m_jobDataS.getQTime(2)).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("QTimeOverFlag",
-			std::to_string(m_jobDataS.getQTimeOverFlag()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("MasterRecipe",
-			std::to_string(m_jobDataS.getMasterRecipe()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("ProductRecipeId",
-			m_jobDataS.getProductRecipeId().c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("PCode",
-			m_jobDataS.getPCode().c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("UseType",
-			m_jobDataS.getUseType().c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("PanelMeasure",
-			m_jobDataS.getPanelMeasure().c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("SlotUnitSelectFlag",
-			std::to_string(m_jobDataS.getSlotUnitSelectFlag()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("SourcePortNo",
-			std::to_string(m_jobDataS.getSourcePortNo()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("SourceSlotNo",
-			std::to_string(m_jobDataS.getSourceSlotNo()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("TargetPortNo",
-			std::to_string(m_jobDataS.getTargetPortNo()).c_str(), ""));
-
-		attrubutes.addAttribute(new CAttribute("TargetSlotNo",
-			std::to_string(m_jobDataS.getTargetSlotNo()).c_str(), ""));
+			("W" + CToolUnits::toHexString(m_nJobDataADev, strTemp)).c_str(), "", weight++));
+		m_jobDataS.getAttributeVector(attrubutes, weight);
 	}
 
 	int CEqJobEventStep::onReadData()
@@ -147,7 +57,7 @@
 	int CEqJobEventStep::onTimeout()
 	{
 		CReadStep::onTimeout();
-		LOGI("<CEqJobEventStep> onTimeout.");
+		LOGE("<CEqJobEventStep> onTimeout.");
 
 		return 0;
 	}

--
Gitblit v1.9.3