From d3c3d619a2fc92c8d5b2929031cf7e946d57b44a Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期二, 13 五月 2025 10:08:37 +0800 Subject: [PATCH] 1.合并后修复； --- SourceCode/Bond/Servo/CEquipment.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h index 2861c80..24eb6ff 100644 --- a/SourceCode/Bond/Servo/CEquipment.h +++ b/SourceCode/Bond/Servo/CEquipment.h @@ -116,8 +116,10 @@ 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); + virtual int onReceivedJob(int port, CJobDataS* pJobDataS); + virtual int onSentOutJob(int port, CJobDataS* pJobDataS); + virtual int onFetchedOutJob(int port, const char* pszGlassId); + virtual int onStoreJob(int port, const char* pszGlassId); void getGlassList(std::list<CGlass*>& list); CGlass* getFrontGlass(); BOOL removeClass(CGlass* pGlass); @@ -148,7 +150,7 @@ int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo); public: - int fetchedOut(const char* pszGlassId); + int fetchedOutJob(const char* pszGlassId); int storedJob(const char* pszGlassId); BOOL isGlassListEmpty(); @@ -171,8 +173,10 @@ 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 decodeStoredJobReport(int port, const char* pszData, size_t size); + int decodeReceivedJobReport(CStep* pStep, int port, const char* pszData, size_t size); + int decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size); + 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