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/CJobDataA.cpp | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataA.cpp b/SourceCode/Bond/Servo/CJobDataA.cpp
index 03d90ff..4a1e3f3 100644
--- a/SourceCode/Bond/Servo/CJobDataA.cpp
+++ b/SourceCode/Bond/Servo/CJobDataA.cpp
@@ -6,12 +6,22 @@
namespace SERVO {
CJobDataA::CJobDataA()
{
-
+ m_pOwner = nullptr;
}
CJobDataA::~CJobDataA()
{
+ }
+
+ void* CJobDataA::getOwner()
+ {
+ return m_pOwner;
+ }
+
+ void CJobDataA::setOwner(void* pOwner)
+ {
+ m_pOwner = pOwner;
}
short CJobDataA::getPortNo()
@@ -37,11 +47,11 @@
memcpy(&pszBuffer[index], &m_nPortNo, sizeof(short));
index += sizeof(short);
- int strLen = min(20, m_strCarrierId.size());
+ int strLen = min(20, (int)m_strCarrierId.size());
memcpy(&pszBuffer[index], m_strCarrierId.c_str(), strLen);
index += 20;
- strLen = min(20, m_pruductId.size());
+ strLen = min(20, (int)m_pruductId.size());
memcpy(&pszBuffer[index], m_pruductId.c_str(), strLen);
index += 20;
@@ -56,7 +66,7 @@
for (int i = 0; i < min(25, m_glassIds.size()); i++) {
std::string& strGlassId = m_glassIds.at(i);
- strLen = min(20, strGlassId.size());
+ strLen = min(20, (int)strGlassId.size());
memcpy(&pszBuffer[index], strGlassId.c_str(), strLen);
index += 20;
}
--
Gitblit v1.9.3