From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CJobDataB.h | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataB.h b/SourceCode/Bond/Servo/CJobDataB.h
index a02cb98..b609376 100644
--- a/SourceCode/Bond/Servo/CJobDataB.h
+++ b/SourceCode/Bond/Servo/CJobDataB.h
@@ -1,14 +1,19 @@
#pragma once
+#define JOBDATAB_SIZE (14 * 2)
namespace SERVO {
class CJobDataB
{
public:
CJobDataB();
- ~CJobDataB();
+ CJobDataB::CJobDataB(CJobDataB&& other) noexcept;
+ virtual ~CJobDataB();
public:
+ void* getOwner();
+ void setOwner(void* pOwner);
+ void copy(CJobDataB* pScr);
int getCassetteSequenceNo();
void setCassetteSequenceNo(int no);
int getJobSequenceNo();
@@ -16,9 +21,10 @@
std::string& getGlassId();
void setGlassId(const char* pszGlassId);
int serialize(char* pszBuffer, int nBufferSize);
- int unserialize(char* pszBuffer, int nBufferSize);
+ int unserialize(const char* pszBuffer, int nBufferSize);
private:
+ void* m_pOwner;
int m_nCassetteSequenceNo;
int m_nJobSequenceNo;
std::string m_strGlassId;
--
Gitblit v1.9.3