From d64036c0510cf06009a7252e318d828fbc2658f0 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 11 九月 2025 09:22:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CGlass.h | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index 01dc31f..72f304b 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -33,21 +33,23 @@
public:
virtual std::string& getClassName();
virtual std::string toString();
- short getCassetteSequenceNo() { return m_jobDataS.getCassetteSequenceNo(); }
- short getJobSequenceNo() { return m_jobDataS.getJobSequenceNo(); }
- MaterialsType getType();
+ short getCassetteSequenceNo() const { return m_jobDataS.getCassetteSequenceNo(); }
+ short getJobSequenceNo() const { return m_jobDataS.getJobSequenceNo(); }
+ MaterialsType getType() const;
void setType(MaterialsType type);
void setID(const char* pszID);
- std::string& getID();
+ const std::string& getID() const;
void setOriginPort(int port, int slot);
void getOrginPort(int& port, int& slot);
BOOL isScheduledForProcessing();
void setScheduledForProcessing(BOOL bProcessing);
CProcessJob* getProcessJob();
void setProcessJob(CProcessJob* pProcessJob);
- CPath* getPathWithEq(unsigned int nEqId, unsigned int nUnit);
+ CPath* getPathWithEq(unsigned int nEqId, unsigned int nUnit) const;
CPath* getPath();
- void addPath(unsigned int nEqId, unsigned int nUnit);
+ void addPath(unsigned int nEqId, unsigned int nUnit, unsigned int slot);
+ std::string getPathDescription() const;
+ std::string getParamsDescription() const;
void serialize(CArchive& ar);
void setJobDataS(CJobDataS* pJobDataS);
void updateJobDataS(CJobDataS* pJobDataS);
@@ -55,11 +57,13 @@
BOOL setBuddy(CGlass* pGlass);
BOOL forceSetBuddy(CGlass* pGlass);
CGlass* getBuddy();
- std::string& getBuddyId();
+ const std::string& getBuddyId() const;
+ void setBuddyId(std::string& strId);
int processEnd(unsigned int nEqId, unsigned int nUnit);
BOOL isProcessed(unsigned int nEqId, unsigned int nUnit);
int setInspResult(unsigned int nEqId, unsigned int nUnit, InspResult result);
- InspResult getInspResult(unsigned int nEqId, unsigned int nUnit);
+ InspResult getInspResult(unsigned int nEqId, unsigned int nUnit) const;
+ InspResult getAOIInspResult() const;
public:
// 新增状态
--
Gitblit v1.9.3