From 58b5bb07de4bcbf670db5ad79ff8b9bd7afc1e28 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 17 六月 2025 11:35:47 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CJobDataS.h | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataS.h b/SourceCode/Bond/Servo/CJobDataS.h
index 757832a..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();
@@ -23,6 +29,30 @@
void setGlass1Id(const char* pszId);
std::string& getGlass2Id();
void setGlass2Id(const char* pszId);
+ int getJobType();
+ void setJobType(int type);
+ int getMaterialsType();
+ void setMaterialsType(int type);
+ int getProductType();
+ void setProductType(int type);
+ int getDummyType();
+ void setDummyType(int type);
+ int getSkipFlag();
+ void setSkipFlag(int flag);
+ int getProcessFlag();
+ void setProcessFlag(int flag);
+ int getProcessResonCode();
+ void setProcessResonCode(int code);
+ int getLastGlassFlag();
+ void setLastGlassFlag(int flag);
+ int getFirstGlassFlag();
+ void setFirstGlassFlag(int flag);
+ int getQTime(int index);
+ void setQTime(int index, int time);
+ int getQTimeOverFlag();
+ void setQTimeOverFlag(int flag);
+ int getMasterRecipe();
+ void setMasterRecipe(int recipe);
std::string& getProductRecipeId();
void setProductRecipeId(const char* pszId);
std::string& getPCode();
@@ -43,8 +73,13 @@
void setTargetPortNo(int no);
int getTargetSlotNo();
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;
@@ -74,6 +109,9 @@
int m_nSourceSlotNo;
int m_nTargetPortNo;
int m_nTargetSlotNo;
+
+ private:
+ char* m_pRawData;
};
}
--
Gitblit v1.9.3