~chenluhua/Bond2.git

			@@ -1,6 +1,9 @@
			#pragma once
			#include "afxdialogex.h"
			#include "RecipeManager.h"
			#include "ListCtrlEx.h"
			#include "MsgDlg.h"


			// CPageRecipe 对话框

			@@ -12,9 +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
			@@ -25,18 +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();
			afx_msg void OnCbnSelchangeComboEquipment();
			afx_msg void OnShowWindow(BOOL bShow, UINT nStatus);
			};
			std::string SanitizeName(const std::string& name);

			CListCtrlEx m_listPPID;
			};