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/CJobDataB.cpp |  106 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 106 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CJobDataB.cpp b/SourceCode/Bond/Servo/CJobDataB.cpp
new file mode 100644
index 0000000..7622790
--- /dev/null
+++ b/SourceCode/Bond/Servo/CJobDataB.cpp
@@ -0,0 +1,106 @@
+#include "stdafx.h"
+#include "CJobDataB.h"
+#include "ToolUnits.h"
+
+
+namespace SERVO {
+	CJobDataB::CJobDataB()
+	{
+		m_nCassetteSequenceNo = 0;
+		m_nJobSequenceNo = 0;
+		m_pOwner = nullptr;
+	}
+
+	CJobDataB::CJobDataB(CJobDataB&& other) noexcept
+	{
+		copy(&other);
+	}
+
+	CJobDataB::~CJobDataB()
+	{
+
+	}
+
+	void CJobDataB::copy(CJobDataB* pScr)
+	{
+		m_nCassetteSequenceNo = pScr->m_nCassetteSequenceNo;
+		m_nJobSequenceNo = pScr->m_nJobSequenceNo;
+		m_strGlassId = pScr->m_strGlassId;
+		m_pOwner = pScr->m_pOwner;
+	}
+
+	void* CJobDataB::getOwner()
+	{
+		return m_pOwner;
+	}
+
+	void CJobDataB::setOwner(void* pOwner)
+	{
+		m_pOwner = pOwner;
+	}
+
+	int CJobDataB::getCassetteSequenceNo()
+	{
+		return m_nCassetteSequenceNo;
+	}
+
+	void CJobDataB::setCassetteSequenceNo(int no)
+	{
+		m_nCassetteSequenceNo = no;
+	}
+
+	int CJobDataB::getJobSequenceNo()
+	{
+		return m_nJobSequenceNo;
+	}
+
+	void CJobDataB::setJobSequenceNo(int no)
+	{
+		m_nJobSequenceNo = no;
+	}
+
+	std::string& CJobDataB::getGlassId()
+	{
+		return m_strGlassId;
+	}
+
+	void CJobDataB::setGlassId(const char* pszGlassId)
+	{
+		m_strGlassId = pszGlassId;
+	}
+
+	int CJobDataB::serialize(char* pszBuffer, int nBufferSize)
+	{
+		if (nBufferSize < JOBDATAB_SIZE) return -1;
+
+		int index = 0;
+		memcpy(&pszBuffer[index], &m_nCassetteSequenceNo, sizeof(short));
+		index += sizeof(short);
+
+		memcpy(&pszBuffer[index], &m_nJobSequenceNo, sizeof(short));
+		index += sizeof(short);
+
+		int strLen = min(20, m_strGlassId.size());
+		memcpy(&pszBuffer[index], m_strGlassId.c_str(), strLen);
+		index += 20;
+
+		return JOBDATAB_SIZE;
+	}
+
+	int CJobDataB::unserialize(const char* pszBuffer, int nBufferSize)
+	{
+		if (nBufferSize < 14 * 2) return -1;
+
+		int index = 0;
+		memcpy(&m_nCassetteSequenceNo, &pszBuffer[index], sizeof(short));
+		index += sizeof(short);
+
+		memcpy(&m_nJobSequenceNo, &pszBuffer[index], sizeof(short));
+		index += sizeof(short);
+
+		CToolUnits::convertString(&pszBuffer[index], 20, m_strGlassId);
+		index += 20;
+
+		return 14 * 2;
+	}
+}

--
Gitblit v1.9.3