From 2ece96546ec80bf26013d005967cbfdc06156ee7 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 17 六月 2025 16:32:41 +0800
Subject: [PATCH] 1. 添加配方管理类（数据库） 2. 修改用户管理和系统日志管理类的路径和名称 3. 修复合并代码导致系统日志管理窗口的资源异常的问题

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

diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index be44aaa..3374f84 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -24,17 +24,20 @@
 		void setType(MaterialsType type);
 		void setID(const char* pszID);
 		std::string& getID();
-		CPath* getPathWithSiteID(unsigned int nSiteId);
+		CPath* getPathWithEq(unsigned int nEqId, unsigned int nUnit);
 		CPath* getPath();
-		void addPath(unsigned int nSiteId);
+		void addPath(unsigned int nEqId, unsigned int nUnit);
 		void serialize(CArchive& ar);
 		void setJobDataB(CJobDataB* pJobDataB);
 		CJobDataB* getJobDataB();
 		void setJobDataS(CJobDataS* pJobDataS);
 		CJobDataS* getJobDataS();
 		BOOL setBuddy(CGlass* pGlass);
+		BOOL forceSetBuddy(CGlass* pGlass);
 		CGlass* getBuddy();
 		std::string& getBuddyId();
+		void processEnd(unsigned int nEqId, unsigned int nUnit);
+		BOOL isProcessed(unsigned int nEqId, unsigned int nUnit);
 
 	private:
 		MaterialsType m_type;

--
Gitblit v1.9.3