From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CJobDataS.h | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataS.h b/SourceCode/Bond/Servo/CJobDataS.h
index 62087b4..87b1cde 100644
--- a/SourceCode/Bond/Servo/CJobDataS.h
+++ b/SourceCode/Bond/Servo/CJobDataS.h
@@ -1,14 +1,20 @@
#pragma once
+#include "CAttributeVector.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);
int getCassetteSequenceNo();
void setCassetteSequenceNo(int no);
int getJobSequenceNo();
@@ -69,9 +75,11 @@
void setTargetSlotNo(int no);
int serialize(char* pszBuffer, int nBufferSize);
int unserialize(const char* pszBuffer, int nBufferSize);
+ void getAttributeVector(CAttributeVector& attrubutes, int beginWeight);
private:
+ void* m_pOwner;
int m_nCassetteSequenceNo;
int m_nJobSequenceNo;
std::string m_strLotId;
@@ -101,6 +109,9 @@
int m_nSourceSlotNo;
int m_nTargetPortNo;
int m_nTargetSlotNo;
+
+ private:
+ char* m_pRawData;
};
}
--
Gitblit v1.9.3