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/BondEq/CPanelProject.cpp | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CPanelProject.cpp b/SourceCode/Bond/BondEq/CPanelProject.cpp
index 92cf9e9..355ec58 100644
--- a/SourceCode/Bond/BondEq/CPanelProject.cpp
+++ b/SourceCode/Bond/BondEq/CPanelProject.cpp
@@ -18,7 +18,9 @@
m_hbrBkgnd = nullptr;
m_nPanelWidth = int((double)GetSystemMetrics(SM_CXSCREEN) * 0.25);
m_pAccordionWnd = nullptr;
- m_pPageRemoteEqs = nullptr;
+ //m_pPageRemoteEqs = nullptr;
+ m_pPageMain = nullptr;
+ m_pPageComponents = nullptr;
}
CPanelProject::~CPanelProject()
@@ -70,11 +72,21 @@
m_pAccordionWnd->Setpadding(PADDING_BOTTOM, 2);
m_pAccordionWnd->LoadExpandIcon(strExpandIcon, strCloseIcon);
- m_pPageRemoteEqs = new CProjectPageRemoteEqs();
- m_pPageRemoteEqs->Create(IDD_PROJECT_PAGE_REMOTEEQS, GetDlgItem(IDC_ACCORDION_WND1));
- m_pPageRemoteEqs->ShowWindow(SW_SHOW);
- m_pAccordionWnd->AddItem("杩滅▼璁惧", m_pPageRemoteEqs, 0, TRUE, TRUE);
+ //m_pPageRemoteEqs = new CProjectPageRemoteEqs();
+ //m_pPageRemoteEqs->Create(IDD_PROJECT_PAGE_REMOTEEQS, GetDlgItem(IDC_ACCORDION_WND1));
+ //m_pPageRemoteEqs->ShowWindow(SW_SHOW);
+ //m_pAccordionWnd->AddItem("杩滅▼璁惧", m_pPageRemoteEqs, 0, TRUE, TRUE);
+
+ m_pPageMain = new CProjectPageMain();
+ m_pPageMain->SetPLC(theApp.m_model.getBonder().getPLC("PLC(1)"));
+ m_pPageMain->Create(IDD_PROJECT_PAGE_MAIN, GetDlgItem(IDC_ACCORDION_WND1));
+ m_pPageMain->ShowWindow(SW_SHOW);
+ m_pAccordionWnd->AddItem("涓婚〉闈�", m_pPageMain, 0, TRUE, TRUE);
+ m_pPageComponents = new CProjectPageComponents();
+ m_pPageComponents->Create(IDD_PROJECT_PAGE_COMPONENTS, GetDlgItem(IDC_ACCORDION_WND1));
+ m_pPageComponents->ShowWindow(SW_SHOW);
+ m_pAccordionWnd->AddItem("缁勪欢鍒楄〃", m_pPageComponents, -1, TRUE, TRUE);
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -110,10 +122,22 @@
::DeleteObject(m_hbrBkgnd);
}
- if (m_pPageRemoteEqs != nullptr) {
- m_pPageRemoteEqs->DestroyWindow();
- delete m_pPageRemoteEqs;
- m_pPageRemoteEqs = nullptr;
+ if (m_pPageComponents != nullptr) {
+ m_pPageComponents->DestroyWindow();
+ delete m_pPageComponents;
+ m_pPageComponents = nullptr;
+ }
+
+ //if (m_pPageRemoteEqs != nullptr) {
+ // m_pPageRemoteEqs->DestroyWindow();
+ // delete m_pPageRemoteEqs;
+ // m_pPageRemoteEqs = nullptr;
+ //}
+
+ if (m_pPageMain != nullptr) {
+ m_pPageMain->DestroyWindow();
+ delete m_pPageMain;
+ m_pPageMain = nullptr;
}
}
--
Gitblit v1.9.3