From e42e8364112e97d89eeaecd13f043dff42179949 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 27 五月 2025 17:19:02 +0800
Subject: [PATCH] 1.enum修改为enum class, 理顺CLoadPort各成员变量在调度中的判定作用;

---
 SourceCode/Bond/Servo/CGlass.h |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index 4fa6b33..be44aaa 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -6,20 +6,16 @@
 #include "CJobDataB.h"
 #include "CJobDataC.h"
 #include "CJobDataS.h"
+#include "ServoCommo.h"
 
 
 namespace SERVO {
-	enum MaterialsType {
-		G1 = 0,
-		G2 = 1,
-		G1G2 = 2
-	};
-
 	class CGlass : public CContext
 	{
 	public:
 		CGlass();
 		virtual ~CGlass();
+		void reset();
 
 	public:
 		virtual std::string& getClassName();
@@ -36,6 +32,9 @@
 		CJobDataB* getJobDataB();
 		void setJobDataS(CJobDataS* pJobDataS);
 		CJobDataS* getJobDataS();
+		BOOL setBuddy(CGlass* pGlass);
+		CGlass* getBuddy();
+		std::string& getBuddyId();
 
 	private:
 		MaterialsType m_type;
@@ -43,6 +42,8 @@
 		CPath* m_pPath;
 		CJobDataB m_jobDataB;
 		CJobDataS m_jobDataS;
+		CGlass* m_pBuddy;
+		std::string m_strBuddyId;
 	};
 }
 

--
Gitblit v1.9.3