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/CJobDataS.h | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataS.h b/SourceCode/Bond/Servo/CJobDataS.h
index 4cf456a..07ea074 100644
--- a/SourceCode/Bond/Servo/CJobDataS.h
+++ b/SourceCode/Bond/Servo/CJobDataS.h
@@ -1,18 +1,26 @@
#pragma once
#include "CAttributeVector.h"
+#include "CJobDataB.h"
-
+#define DEVICE_COUNT 15
+#define JOBDATAS_SIZE (256 * 2)
namespace SERVO {
class CJobDataS
{
public:
CJobDataS();
- ~CJobDataS();
+ CJobDataS::CJobDataS(CJobDataS&& other) noexcept;
+ virtual ~CJobDataS();
public:
- int getCassetteSequenceNo();
+ void* getOwner();
+ void setOwner(void* pOwner);
+ void copy(CJobDataS* pScr);
+ void update(CJobDataS* pScr);
+ CJobDataB& getJobDataB(CJobDataB& jobDataB);
+ int getCassetteSequenceNo() const;
void setCassetteSequenceNo(int no);
- int getJobSequenceNo();
+ int getJobSequenceNo() const;
void setJobSequenceNo(int no);
std::string& getLotId();
void setLotId(const char* pszId);
@@ -48,12 +56,10 @@
void setQTimeOverFlag(int flag);
int getMasterRecipe();
void setMasterRecipe(int recipe);
- std::string& getProductRecipeId();
- void setProductRecipeId(const char* pszId);
- std::string& getPCode();
- void setPCode(const char* pszCode);
- std::string& getUseType();
- void setUseType(const char* pszType);
+ short getDeviceRecipeId(int nDeviceIndex) const;
+ void setDeviceRecipeId(int nDeviceIndex, short nRecipeId);
+ const short* getRecipeIds() const;
+ void setRecipeIds(const short* pIds, int nCount);
std::string& getPanelMeasure();
void setPanelMeasure(const char* pszMeasure);
int getMode();
@@ -68,12 +74,15 @@
void setTargetPortNo(int no);
int getTargetSlotNo();
void setTargetSlotNo(int no);
+ short getProductJudge() const;
+ void setProductJudge(short nProductJudge);
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;
@@ -93,9 +102,7 @@
int m_nQTime[3];
int m_nQTimeOverFlag;
int m_nMasterRecipe;
- std::string m_strProductRecipeId;
- std::string m_strPCode;
- std::string m_strUseType;
+ short m_nRecipeIds[DEVICE_COUNT];
std::string m_strPanelMeasure;
int m_nMode;
int m_nSlotUnitSelectFlag;
@@ -103,6 +110,10 @@
int m_nSourceSlotNo;
int m_nTargetPortNo;
int m_nTargetSlotNo;
+ short m_nProductJudge;
+
+ private:
+ char* m_pRawData;
};
}
--
Gitblit v1.9.3