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/CPageCassetteCtrlCmd.cpp |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp b/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
index 16f72f7..e39bd05 100644
--- a/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
+++ b/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
@@ -90,7 +90,9 @@
 {
 	ASSERT(m_pEquipment != nullptr);
 	ASSERT(m_pEquipment->getID() == EQ_ID_LOADPORT1
-		|| m_pEquipment->getID() == EQ_ID_LOADPORT2);
+		|| m_pEquipment->getID() == EQ_ID_LOADPORT2
+		|| m_pEquipment->getID() == EQ_ID_LOADPORT3
+		|| m_pEquipment->getID() == EQ_ID_LOADPORT4);
 	SERVO::CLoadPort* pLoadPort = (SERVO::CLoadPort*)m_pEquipment;
 
 	short cmd = 0;
@@ -98,7 +100,7 @@
 	int jobExistenceSize = 12;
 	short slotProcess = 0;
 	short jobCount = 0;
-	SERVO::CJobDataB* pJobDataB = new SERVO::CJobDataB();
+	SERVO::CJobDataA* pJobDataA = new SERVO::CJobDataA();
 
 
 	CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_CASSETTE_CTRL_CMD);
@@ -112,5 +114,14 @@
 
 
 	pLoadPort->sendCassetteCtrlCmd(cmd, &jobExistence[0], jobExistenceSize, slotProcess,
-		jobCount, pJobDataB);	
+		jobCount, pJobDataA, [&](int code) -> int {
+			if (code == WOK) {
+				LOGI("sendCassetteCtrlCmd 鎴愬姛.");
+			}
+			else {
+				LOGE("sendCassetteCtrlCmd 澶辫触.");
+			}
+
+			return 0;
+		});
 }

--
Gitblit v1.9.3