From 2ebccf831b56d30089924f2eefa2d790e2b8f3fc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 07 八月 2025 09:20:21 +0800
Subject: [PATCH] 1.为CVariable增加值的设置和获取 2.当发生Port状态改变为InUse时，此时也刚好获取到CarrierID，上报S6F11_CarrierID_Readed

---
 SourceCode/Bond/Servo/CGlass.h |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/CGlass.h b/SourceCode/Bond/Servo/CGlass.h
index d2f4197..844822b 100644
--- a/SourceCode/Bond/Servo/CGlass.h
+++ b/SourceCode/Bond/Servo/CGlass.h
@@ -24,28 +24,36 @@
 		void setType(MaterialsType type);
 		void setID(const char* pszID);
 		std::string& getID();
+		void setOriginPort(int port, int slot);
+		void getOrginPort(int& port, int& slot);
+		BOOL isScheduledForProcessing();
+		void setScheduledForProcessing(BOOL bProcessing);
 		CPath* getPathWithEq(unsigned int nEqId, unsigned int nUnit);
 		CPath* getPath();
 		void addPath(unsigned int nEqId, unsigned int nUnit);
 		void serialize(CArchive& ar);
-		void setJobDataB(CJobDataB* pJobDataB);
-		CJobDataB* getJobDataB();
 		void setJobDataS(CJobDataS* pJobDataS);
+		void updateJobDataS(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);
+		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);
 
 	private:
 		MaterialsType m_type;
 		std::string m_strID;
 		CPath* m_pPath;
-		CJobDataB m_jobDataB;
 		CJobDataS m_jobDataS;
 		CGlass* m_pBuddy;
 		std::string m_strBuddyId;
+		int m_nOriginPort;
+		int m_nOriginSlot;
+		BOOL m_bScheduledForProcessing;			/* 是否将加工处理 */
 	};
 }
 

--
Gitblit v1.9.3