From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险: S1F3:项目用 getSubItemU4(0) 取 SVID;日志里有 U2 的情况,可能导致解析失败后回退成 SV=0。 S6F11:项目发送 DATAID(U4) + CEID(U4);日志样例里第一个字段是 U2,可能存在类型/字段定义不一致。

---
 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