From d801f8999ad7cdbee7a5652b4bb512c47b9a2668 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期三, 04 六月 2025 18:05:01 +0800 Subject: [PATCH] 1.搬送条件检测,增加一个条件,必须是已加工处理完成的Glass才符合搬出条件。 2.根据1,为CGlass增加相应工位的处理标志位,及标志位在后processDataReport修改为TRUE,以符合搬出条件; --- SourceCode/Bond/Servo/ServoDlg.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h index 774cb22..ee43ac3 100644 --- a/SourceCode/Bond/Servo/ServoDlg.h +++ b/SourceCode/Bond/Servo/ServoDlg.h @@ -15,6 +15,7 @@ #include "CPageGraph2.h" #include "TopToolbar.h" #include "CMyStatusbar.h" +#include "CRobotTaskDlg.h" // CServoDlg 对话框 @@ -32,17 +33,17 @@ void InitRxWindows(); void Resize(); void ShowChildPage(int index); - + CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix); private: IObserver* m_pObserver; CTerminalDisplayDlg* m_pTerminalDisplayDlg; + CRobotTaskDlg* m_pRobotTaskDlg; CPageGraph1* m_pPageGraph1; CPageGraph2* m_pPageGraph2; CPageRecipe* m_pPageRecipe; CPageAlarm* m_pPageAlarm; CPageLog* m_pPageLog; - // 对话框数据 #ifdef AFX_DESIGN_TIME @@ -95,4 +96,5 @@ afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam); afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result); LRESULT OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam); + LRESULT OnStatusbarBtnClicked(WPARAM wParam, LPARAM lParam); }; -- Gitblit v1.9.3