From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:43:40 +0800
Subject: [PATCH] 1.修复以下问题： ProceedWithCarrier 直接发 CCC_PROCESS_START：CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时，收到 ProceedWithCarrier 就调用 master.proceedWithCarrier（仅发送 Cassette Process Start，不校验 PJ/CJ 是否存在、SlotMap 是否验通过）。若 Host 流程异常（未下 PJ/CJ）或本地尚未准备好，会把设备推进加工态但无作业可跑。

---
 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