From 7034036d6ab7163a6ea0e5d712ba86d6cd9591bc Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 24 七月 2025 16:37:27 +0800
Subject: [PATCH] 1. 根据文档更新JobDataS
---
SourceCode/Bond/Servo/CJobDataS.h | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataS.h b/SourceCode/Bond/Servo/CJobDataS.h
index ad3e2a9..1867b7d 100644
--- a/SourceCode/Bond/Servo/CJobDataS.h
+++ b/SourceCode/Bond/Servo/CJobDataS.h
@@ -2,7 +2,7 @@
#include "CAttributeVector.h"
#include "CJobDataB.h"
-
+#define DEVICE_COUNT 15
#define JOBDATAS_SIZE (256 * 2)
namespace SERVO {
class CJobDataS
@@ -56,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();
@@ -76,6 +74,8 @@
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);
@@ -102,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;
@@ -112,6 +110,7 @@
int m_nSourceSlotNo;
int m_nTargetPortNo;
int m_nTargetSlotNo;
+ short m_nProductJudge;
private:
char* m_pRawData;
--
Gitblit v1.9.3