From 4e5df2e71445ca3c0cc412e24510234e671b6072 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 16:18:33 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CJobDataS.h | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataS.h b/SourceCode/Bond/Servo/CJobDataS.h
index 3894db2..ad3e2a9 100644
--- a/SourceCode/Bond/Servo/CJobDataS.h
+++ b/SourceCode/Bond/Servo/CJobDataS.h
@@ -1,15 +1,23 @@
#pragma once
#include "CAttributeVector.h"
+#include "CJobDataB.h"
+#define JOBDATAS_SIZE (256 * 2)
namespace SERVO {
class CJobDataS
{
public:
CJobDataS();
- ~CJobDataS();
+ CJobDataS::CJobDataS(CJobDataS&& other) noexcept;
+ virtual ~CJobDataS();
public:
+ void* getOwner();
+ void setOwner(void* pOwner);
+ void copy(CJobDataS* pScr);
+ void update(CJobDataS* pScr);
+ CJobDataB& getJobDataB(CJobDataB& jobDataB);
int getCassetteSequenceNo();
void setCassetteSequenceNo(int no);
int getJobSequenceNo();
@@ -74,6 +82,7 @@
private:
+ void* m_pOwner;
int m_nCassetteSequenceNo;
int m_nJobSequenceNo;
std::string m_strLotId;
--
Gitblit v1.9.3