From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CJobDataS.h |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CJobDataS.h b/SourceCode/Bond/Servo/CJobDataS.h
index 8f5bae6..ad3e2a9 100644
--- a/SourceCode/Bond/Servo/CJobDataS.h
+++ b/SourceCode/Bond/Servo/CJobDataS.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "CAttributeVector.h"
+#include "CJobDataB.h"
 
 
 #define JOBDATAS_SIZE		(256 * 2)
@@ -9,10 +10,14 @@
 	public:
 		CJobDataS();
 		CJobDataS::CJobDataS(CJobDataS&& other) noexcept;
-		~CJobDataS();
+		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();
@@ -77,6 +82,7 @@
 
 
 	private:
+		void* m_pOwner;
 		int m_nCassetteSequenceNo;
 		int m_nJobSequenceNo;
 		std::string m_strLotId;

--
Gitblit v1.9.3