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/CJobDataS.cpp | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataS.cpp b/SourceCode/Bond/Servo/CJobDataS.cpp
index f293233..2231b0b 100644
--- a/SourceCode/Bond/Servo/CJobDataS.cpp
+++ b/SourceCode/Bond/Servo/CJobDataS.cpp
@@ -143,7 +143,7 @@
m_pOwner = pOwner;
}
- int CJobDataS::getCassetteSequenceNo()
+ int CJobDataS::getCassetteSequenceNo() const
{
return m_nCassetteSequenceNo;
}
@@ -153,7 +153,7 @@
m_nCassetteSequenceNo = no;
}
- int CJobDataS::getJobSequenceNo()
+ int CJobDataS::getJobSequenceNo() const
{
return m_nJobSequenceNo;
}
@@ -457,7 +457,7 @@
int CJobDataS::serialize(char* pszBuffer, int nBufferSize)
{
- if (nBufferSize < 256 * 2) return -1;
+ if (nBufferSize < JOBDATAS_SIZE) return -1;
int index = 0;
memcpy(&pszBuffer[index], &m_nCassetteSequenceNo, sizeof(short));
@@ -513,9 +513,6 @@
memcpy(&pszBuffer[index], &m_nFirstGlassFlag, sizeof(short));
index += sizeof(short);
- memcpy(&pszBuffer[index], &m_nLastGlassFlag, sizeof(short));
- index += sizeof(short);
-
memcpy(&pszBuffer[index], &m_nQTime[0], sizeof(short));
index += sizeof(short);
@@ -561,7 +558,7 @@
memcpy(&pszBuffer[index], &m_nProductJudge, sizeof(short));
index += sizeof(short);
- return 256 * 2;
+ return JOBDATAS_SIZE;
}
int CJobDataS::unserialize(const char* pszBuffer, int nBufferSize)
@@ -621,9 +618,9 @@
index += sizeof(short);
memcpy(&m_nQTime[1], &pszBuffer[index], sizeof(short));
- index += sizeof(int);
+ index += sizeof(short);
- memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(int));
+ memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(short));
index += sizeof(short);
memcpy(&m_nQTimeOverFlag, &pszBuffer[index], sizeof(short));
--
Gitblit v1.9.3