From d1aa8faa0632de2dafb7d081a3a93a3c2d4f8962 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 24 六月 2025 17:36:22 +0800
Subject: [PATCH] 1.与EFEM对接调试Port Command(Type Change、Mode Change、Transfer Mode Change、Enable Mode Change、Type Auto Change、Cassette Type Change)并修改完善代码。 2.增加Recive Able信号的获取,并以此作为能否放料的逻辑判断依据。 3.配方获取完善,待测。

---
 SourceCode/Bond/Servo/CJobDataB.cpp |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/CJobDataB.cpp b/SourceCode/Bond/Servo/CJobDataB.cpp
index c269779..7622790 100644
--- a/SourceCode/Bond/Servo/CJobDataB.cpp
+++ b/SourceCode/Bond/Servo/CJobDataB.cpp
@@ -8,11 +8,35 @@
 	{
 		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()
@@ -47,7 +71,7 @@
 
 	int CJobDataB::serialize(char* pszBuffer, int nBufferSize)
 	{
-		if (nBufferSize < 28) return -1;
+		if (nBufferSize < JOBDATAB_SIZE) return -1;
 
 		int index = 0;
 		memcpy(&pszBuffer[index], &m_nCassetteSequenceNo, sizeof(short));
@@ -60,12 +84,12 @@
 		memcpy(&pszBuffer[index], m_strGlassId.c_str(), strLen);
 		index += 20;
 
-		return 14 * 2;
+		return JOBDATAB_SIZE;
 	}
 
-	int CJobDataB::unserialize(char* pszBuffer, int nBufferSize)
+	int CJobDataB::unserialize(const char* pszBuffer, int nBufferSize)
 	{
-		if (nBufferSize < 14) return -1;
+		if (nBufferSize < 14 * 2) return -1;
 
 		int index = 0;
 		memcpy(&m_nCassetteSequenceNo, &pszBuffer[index], sizeof(short));

--
Gitblit v1.9.3