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/BoounionPLC/BoounionPLCDlg.h |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h
index 9edd29c..c94fd54 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.h
@@ -5,6 +5,11 @@
 #pragma once
 #include "TopToolbar.h"
 #include "PagePlcList.h"
+#include "CMainContainer.h"
+#include "CBaseView.h"
+#include "AlarmPopupDlg.h"
+#include "CPageLogcat.h"
+
 
 // CBoounionPLCDlg 对话框
 class CBoounionPLCDlg : public CDialogEx
@@ -14,8 +19,12 @@
 	CBoounionPLCDlg(CWnd* pParent = NULL);	// 标准构造函数
 
 private:
+	void InitRxWindows();
 	void Resize();
-
+	CBaseView* CreatePlcView(CPLC* pPlc);
+	void CloseView(CBaseView* pView);
+	void AlarmOn(CPLC* pPlc);
+	void AlarmOff(CPLC* pPlc);
 
 private:
 	COLORREF m_crBkgnd;
@@ -23,6 +32,10 @@
 	IObserver* m_pObserver;
 	CTopToolbar* m_pTopToolbar;
 	CPagePlcList* m_pPagePlcList;
+	CMainContainer* m_pMainContainer;
+	CBaseView* m_pActiveView;
+	CPageLogcat* m_pPageLogcat;
+	CAlarmPopupDlg* m_pAlarmWnd;
 
 
 // 对话框数据
@@ -37,6 +50,7 @@
 // 实现
 protected:
 	HICON m_hIcon;
+	BOOL m_bShowLogWnd;
 
 	// 生成的消息映射函数
 	virtual BOOL OnInitDialog();
@@ -48,4 +62,16 @@
 	afx_msg void OnDestroy();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
+	afx_msg void OnMenuFileSettings();
+	afx_msg void OnUpdateMenuFileSettings(CCmdUI* pCmdUI);
+	afx_msg void OnMenuWndLog();
+	afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI);
+	afx_msg void OnMenuFileExit();
+	afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
+	afx_msg void OnMenuHelpAbout();
+	afx_msg LRESULT OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam);
+	LRESULT OnViewActive(WPARAM wParam, LPARAM lParam);
+	LRESULT OnViewBtnClicked(WPARAM wParam, LPARAM lParam);
+	LRESULT OnViewBtnMenuItem(WPARAM wParam, LPARAM lParam);
 };

--
Gitblit v1.9.3