From 2c7d546ddcd43669a433a99e1901339e491542d9 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 24 七月 2025 16:38:27 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/PageRecipe.h |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h
index 32bf429..8f489b4 100644
--- a/SourceCode/Bond/Servo/PageRecipe.h
+++ b/SourceCode/Bond/Servo/PageRecipe.h
@@ -13,7 +13,9 @@
 	virtual ~CPageRecipe();
 
 private:
+	void UpdateRecipeByPPID(const CString& strPPID);
 	void FillDataToListCtrl(const std::vector<RecipeInfo>& vecRecipe);
+	void FillRecipeListToListCtrl(SERVO::CRecipeList* pList);
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -24,16 +26,18 @@
 	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 OnCbnSelchangeComboEquipment();
 	DECLARE_MESSAGE_MAP()
 
 private:
 	CListCtrl m_listPPID;
-public:
-	afx_msg void OnDestroy();
 };

--
Gitblit v1.9.3