From 9fbd7479ce17f76f72cc0e5a675336261ec76472 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期一, 12 五月 2025 15:39:53 +0800 Subject: [PATCH] 1.使用CEqReadStep替换CEqJobEventStep, 实现ReceivedJob 2.实现SentOutJob --- SourceCode/Bond/Servo/CEquipment.h | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h index 22a6a52..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,6 +173,8 @@ void addGlassToList(CGlass* pGlass); short decodeRecipeListReport(const char* pszData, size_t size); short decodeRecipeParameterReport(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); -- Gitblit v1.9.3