From 26e26278bb7bf53b961f0414d9848679453349e4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 15 五月 2025 18:01:48 +0800
Subject: [PATCH] 1.在FetchedOutJob时，如果是双玻璃片，即已贴合，则两块一起从列表删除； 2.同上，在StoredJob时，如果是双玻璃片，即已贴合，则两块一起加入列表中；
---
SourceCode/Bond/Servo/CGlass.h | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index fc50ed5..ffeeccc 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -1,9 +1,20 @@
#pragma once
#include "Context.h"
#include <string>
+#include "CPath.h"
+#include "CJobDataA.h"
+#include "CJobDataB.h"
+#include "CJobDataC.h"
+#include "CJobDataS.h"
namespace SERVO {
+ enum MaterialsType {
+ G1 = 0,
+ G2 = 1,
+ G1G2 = 2
+ };
+
class CGlass : public CContext
{
public:
@@ -13,11 +24,30 @@
public:
virtual std::string& getClassName();
virtual std::string toString();
+ MaterialsType getType();
+ void setType(MaterialsType type);
void setID(const char* pszID);
std::string& getID();
+ CPath* getPathWithSiteID(unsigned int nSiteId);
+ CPath* getPath();
+ void addPath(unsigned int nSiteId);
+ void serialize(CArchive& ar);
+ void setJobDataB(CJobDataB* pJobDataB);
+ CJobDataB* getJobDataB();
+ void setJobDataS(CJobDataS* pJobDataS);
+ CJobDataS* getJobDataS();
+ BOOL setBuddy(CGlass* pGlass);
+ CGlass* getBuddy();
+ std::string& getBuddyId();
private:
+ MaterialsType m_type;
std::string m_strID;
+ CPath* m_pPath;
+ CJobDataB m_jobDataB;
+ CJobDataS m_jobDataS;
+ CGlass* m_pBuddy;
+ std::string m_strBuddyId;
};
}
--
Gitblit v1.9.3