From eaa4a962ac7349d6a0d73fe61f0b3b6331b85407 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 08 九月 2025 13:59:50 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/CGlass.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index 21aaf34..01dc31f 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -8,6 +8,7 @@
#include "CJobDataS.h"
#include "ServoCommo.h"
#include "ProcessJob.h"
+#include "CParam.h"
namespace SERVO {
@@ -32,6 +33,8 @@
public:
virtual std::string& getClassName();
virtual std::string toString();
+ short getCassetteSequenceNo() { return m_jobDataS.getCassetteSequenceNo(); }
+ short getJobSequenceNo() { return m_jobDataS.getJobSequenceNo(); }
MaterialsType getType();
void setType(MaterialsType type);
void setID(const char* pszID);
@@ -89,6 +92,10 @@
void markStart();
void markEnd();
+ // 工艺参数
+ void addParams(std::vector<CParam>& params);
+ std::vector<CParam>& getParams();
+
private:
MaterialsType m_type;
std::string m_strID;
@@ -100,6 +107,7 @@
int m_nOriginSlot;
BOOL m_bScheduledForProcessing; /* 是否将加工处理 */
CProcessJob* m_pProcessJob;
+ std::vector<CParam> m_params; // 工艺参数
};
}
--
Gitblit v1.9.3