From d14420e7f85b5fe7289aafe6bef0c053dede3657 Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期五, 16 一月 2026 11:20:39 +0800 Subject: [PATCH] 1.修复以下问题： CEID 校验恒通过：ceidDefined 返回 true，PauseEvent ID 不做有效性检查。Host 若下发无效 CEID，将被接受但运行时无法触发暂停，风险难以察觉。 建议的上线前防护 / 改进（无需真机也可先改） 2.软件侧警告id上抛； --- SourceCode/Bond/Servo/PageRecipe.h | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h index 32bf429..1ca4b99 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,22 @@ 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(); + virtual BOOL PreTranslateMessage(MSG* pMsg); 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