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 |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h
index 8f489b4..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,10 +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
@@ -34,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:
-	CListCtrl m_listPPID;
-};
+	std::string SanitizeName(const std::string& name);
+
+	CListCtrlEx m_listPPID;
+};
\ No newline at end of file

--
Gitblit v1.9.3