From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交
---
SourceCode/Bond/Servo/CGlass.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index b49563e..01dc31f 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -33,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);
--
Gitblit v1.9.3