From 0026ea3b1a6588f3e40b8276162f54b2a22bc7ae Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期一, 19 一月 2026 14:32:27 +0800 Subject: [PATCH] 1.修复 : 多 PJ 支持仍是单槽实现:isProcessJobsEmpty/validate 仍只允许 1 个 PJ/CJ;Host 一次下多 PJ 或运行中追加 PJ 会被拒绝/无明确反馈。需要:协议上明示只支持 1,或补齐 ACK/NAK 与队列管理、PJobSpace 动态更新。 --- 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 5df946e..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; - CEdit m_editPPID; - CEdit m_editDesc; -}; + std::string SanitizeName(const std::string& name); + + CListCtrlEx m_listPPID; +}; \ No newline at end of file -- Gitblit v1.9.3