From e431787780491220f026d83dccdf15e8ea078d1e Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期四, 19 六月 2025 11:04:03 +0800 Subject: [PATCH] 1.准备处理PanelDataRequest的响应； 2.删除掉Glass中的JobDataB --- SourceCode/Bond/Servo/CEquipment.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h index c694bf6..25a40c9 100644 --- a/SourceCode/Bond/Servo/CEquipment.h +++ b/SourceCode/Bond/Servo/CEquipment.h @@ -43,6 +43,7 @@ #define SIGNAL_UPSTREAM_TROUBLE 1 #define SIGNAL_INTERLOCK 2 #define SIGNAL_SEND_ABLE 3 + typedef std::function<void(int writeCode, int retCode)> ONWRITEDRET; typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE; typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED; @@ -140,7 +141,7 @@ int clearCimMessage(short id, short nTouchPanelNo); int setDateTime(short year, short month, short day, short hour, short minute, short second); int setDispatchingMode(DISPATCHING_MODE mode, ONWRITED onWritedBlock = nullptr); - int indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITED onWritedBlock = nullptr); + int indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITEDRET onWritedRetBlock); @@ -222,13 +223,14 @@ int decodeVCREventReport(CStep* pStep, const char* pszData, size_t size); int decodePanelDataReport(CStep* pStep, const char* pszData, size_t size); int decodeFacDataReport(CStep* pStep, const char* pszData, size_t size); + int decodePanelDataRequest(CStep* pStep, const char* pszData, size_t size); int addJobDataB(CJobDataB* pJobDataB); int removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo); CJobDataB* getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo); int addJobDataS(CJobDataS* pJobDataS); int removeJobDataS(int nCassetteSequenceNo, int nJobSequenceNo); CJobDataS* getJobDataS(int nCassetteSequenceNo, int nJobSequenceNo); - BOOL compareJobDataB(CJobDataB* pJobDataB1, CJobDataB* pJobDataB2); + BOOL compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS); void setProcessState(PROCESS_STATE state); protected: -- Gitblit v1.9.3