From 11260184c3c930d0d9ccd6b65e905c7828efd3cf Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期五, 12 九月 2025 09:44:02 +0800 Subject: [PATCH] 1. 优化报警的查询功能 2. 插入设备表数据和单元表数据 3. 修复报警查询失败的问题 --- SourceCode/Bond/Servo/PageRecipe.h | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h index 32bf429..eac7fb3 100644 --- a/SourceCode/Bond/Servo/PageRecipe.h +++ b/SourceCode/Bond/Servo/PageRecipe.h @@ -1,6 +1,9 @@ 锘�#pragma once #include "afxdialogex.h" #include "RecipeManager.h" +#include "ListCtrlEx.h" +#include "MsgDlg.h" + // CPageRecipe 瀵硅瘽妗� @@ -12,8 +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::CEquipment* pEq); // 瀵硅瘽妗嗘暟鎹� #ifdef AFX_DESIGN_TIME @@ -24,16 +35,21 @@ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔 virtual BOOL OnInitDialog(); afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg void OnDestroy(); + afx_msg void OnShowWindow(BOOL bShow, UINT nStatus); + afx_msg void OnBnClickedButtonNew(); afx_msg void OnBnClickedButtonSearch(); afx_msg void OnBnClickedButtonModify(); 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(); DECLARE_MESSAGE_MAP() private: - CListCtrl m_listPPID; -public: - afx_msg void OnDestroy(); -}; + std::string SanitizeName(const std::string& name); + + CListCtrlEx m_listPPID; +}; \ No newline at end of file -- Gitblit v1.9.3