From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期三, 22 十月 2025 14:24:34 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/PageRecipe.h | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h index 842082e..1ca4b99 100644 --- a/SourceCode/Bond/Servo/PageRecipe.h +++ b/SourceCode/Bond/Servo/PageRecipe.h @@ -24,7 +24,7 @@ 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 @@ -43,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