From d68541dce155a682f65b7c3fbfbfbeef17ea5b8f Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期一, 12 五月 2025 12:00:41 +0800 Subject: [PATCH] 1.StoredJob, Fetched out Job实现； 2.CStep增加定制的Attribute, 以便通过的Step不使用getAttributeVector也能添加不一样的Attribute; --- SourceCode/Bond/Servo/CEquipment.h | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h index e655f2c..22a6a52 100644 --- a/SourceCode/Bond/Servo/CEquipment.h +++ b/SourceCode/Bond/Servo/CEquipment.h @@ -116,6 +116,8 @@ virtual BOOL glassWillArrive(CGlass* pGlass); virtual int outputGlass(int port); virtual int glassArrived(CGlass* pGlass); + virtual int onFetchedOut(int port, const char* pszGlassId); + virtual int onStore(int port, const char* pszGlassId); void getGlassList(std::list<CGlass*>& list); CGlass* getFrontGlass(); BOOL removeClass(CGlass* pGlass); @@ -147,7 +149,7 @@ public: int fetchedOut(const char* pszGlassId); - int storeJob(const char* pszGlassId); + int storedJob(const char* pszGlassId); BOOL isGlassListEmpty(); @@ -169,8 +171,8 @@ void addGlassToList(CGlass* pGlass); short decodeRecipeListReport(const char* pszData, size_t size); short decodeRecipeParameterReport(const char* pszData, size_t size); - int decodeFetchedOutJobReport(int port, const char* pszData, size_t size); - int onFetchedOut(int port, const char* pszGlassId); + int decodeFetchedOutJobReport(CStep* pStep, int port, const char* pszData, size_t size); + int decodeStoredJobReport(CStep* pStep, int port, const char* pszData, size_t size); protected: EquipmentListener m_listener; -- Gitblit v1.9.3