From b2aa706dfea78ad2e327fb5e414207af69d23d64 Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期六, 13 九月 2025 11:33:04 +0800 Subject: [PATCH] 1.对话框显示工艺参数,可复制到剪贴板; 2.修复几处因按回车或ESC键导致页面被关闭的问题; 3.修复解释警告数据文本失败的问题; 4.更新警告文本,显示警告详细信息; 5.完善警告描述内容 ; --- SourceCode/Bond/Servo/PageRecipe.h | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h index 6833e3b..1ca4b99 100644 --- a/SourceCode/Bond/Servo/PageRecipe.h +++ b/SourceCode/Bond/Servo/PageRecipe.h @@ -2,6 +2,8 @@ #include "afxdialogex.h" #include "RecipeManager.h" #include "ListCtrlEx.h" +#include "MsgDlg.h" + // CPageRecipe 瀵硅瘽妗� @@ -13,12 +15,16 @@ CPageRecipe(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁� virtual ~CPageRecipe(); +public: + static UINT SyncThreadFunction(LPVOID lpvData); + UINT SyncThreadFunctionInner(CMsgDlg* pMsgDlg); + private: void InitListCtrlHeaderForMaster(); void InitListCtrlHeaderForDevice(); void UpdateRecipeByPPID(const CString& strPPID); void FillDataToListCtrl(const std::vector<RecipeInfo>& vecRecipe); - void FillRecipeListToListCtrl(SERVO::CRecipeList* pList); + void FillRecipeListToListCtrl(SERVO::CEquipment* pEq); // 瀵硅瘽妗嗘暟鎹� #ifdef AFX_DESIGN_TIME @@ -37,10 +43,14 @@ afx_msg void OnBnClickedButtonDelete(); afx_msg void OnBnClickedButtonDeleteAll(); afx_msg void OnBnClickedButtonRefresh(); - afx_msg void OnLvnItemChangedListPPID(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnClickListPPID(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnDblclkListPPID(NMHDR* pNMHDR, LRESULT* pResult); afx_msg void OnCbnSelchangeComboEquipment(); + virtual BOOL PreTranslateMessage(MSG* pMsg); DECLARE_MESSAGE_MAP() private: + std::string SanitizeName(const std::string& name); + CListCtrlEx m_listPPID; -}; +}; \ No newline at end of file -- Gitblit v1.9.3