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/AccordionWnd.cpp | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/BondEq/AccordionWnd.cpp b/SourceCode/Bond/BondEq/AccordionWnd.cpp
index 5da6615..026628e 100644
--- a/SourceCode/Bond/BondEq/AccordionWnd.cpp
+++ b/SourceCode/Bond/BondEq/AccordionWnd.cpp
@@ -47,9 +47,16 @@
BOOL CAccordionWnd::RegisterWndClass()
{
- WNDCLASS wc;
+ WNDCLASS wcExisting = {};
+ HINSTANCE hInstance = AfxGetInstanceHandle();
+ if (::GetClassInfo(hInstance, ACCORDIONWND_CLASS, &wcExisting) ||
+ ::GetClassInfo(NULL, ACCORDIONWND_CLASS, &wcExisting)) {
+ return TRUE;
+ }
+
+ WNDCLASS wc = {};
wc.lpszClassName = ACCORDIONWND_CLASS;
- wc.hInstance = AfxGetInstanceHandle();
+ wc.hInstance = hInstance;
wc.lpfnWndProc = WindowProc;
wc.hCursor = ::LoadCursor(NULL, IDC_ARROW);
wc.hIcon = 0;
@@ -60,7 +67,10 @@
wc.cbWndExtra = 0;
// 注册自定义类
- return (::RegisterClass(&wc) != 0);
+ if (::RegisterClass(&wc) != 0) {
+ return TRUE;
+ }
+ return (::GetLastError() == ERROR_CLASS_ALREADY_EXISTS);
}
CAccordionWnd * CAccordionWnd::FromHandle(HWND hWnd)
--
Gitblit v1.9.3