From cf1497e3bba45ddc3b31cf9768954248bedc0bc1 Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期三, 14 一月 2026 16:03:21 +0800 Subject: [PATCH] 1.修复以下问题:Only-1 Job 支持:isProcessJobsEmpty()/validate 决定了当前实现只支持单个 PJ/CJ。Host 如果按标准一次下多 PJ 或在运行中追加 PJ,会被拒绝但无明确回应,容易引起 Host/设备状态脱节。 --- SourceCode/Bond/Servo/ServoDlg.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h index bdc47a4..df4b01d 100644 --- a/SourceCode/Bond/Servo/ServoDlg.h +++ b/SourceCode/Bond/Servo/ServoDlg.h @@ -12,12 +12,15 @@ #include "CPanelMaster.h" #include "CPanelEquipment.h" #include "CPanelAttributes.h" +#include "CPanelProduction.h" #include "CPageGraph1.h" #include "CPageGraph2.h" #include "TopToolbar.h" #include "CMyStatusbar.h" #include "CRobotTaskDlg.h" #include "CPageGlassList.h" +#include "CPageVarialbles.h" +#include "CPageDataVarialbles.h" // CServoDlg 瀵硅瘽妗� @@ -34,6 +37,7 @@ private: void InitRxWindows(); void Resize(); + void SetLeftPanelType(int type, bool resize = true); void ShowChildPage(int index); void UpdateLoginStatus(); CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix); @@ -64,8 +68,10 @@ HICON m_hIcon; COLORREF m_crBkgnd; HBRUSH m_hbrBkgnd; + int m_nLeftPanelType; // 1: CPanelMaster, 2: CPanelProduction CTopToolbar* m_pTopToolbar; CPanelMaster* m_pPanelMaster; + CPanelProduction* m_pPanelProduction; CPanelEquipment* m_pPanelEquipment; CPanelAttributes* m_pPanelAttributes; CMyStatusbar* m_pMyStatusbar; @@ -100,6 +106,10 @@ afx_msg void OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI); afx_msg void OnMenuToolsClientList(); afx_msg void OnUpdateMenuToolsClientList(CCmdUI* pCmdUI); + afx_msg void OnMenuWndTestPanel(); + afx_msg void OnUpdateMenuWndTestPanel(CCmdUI* pCmdUI); + afx_msg void OnMenuWndProPanel(); + afx_msg void OnUpdateMenuWndProPanel(CCmdUI* pCmdUI); afx_msg void OnMenuHelpAbout(); afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam); -- Gitblit v1.9.3