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/CCjPage1.h | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCjPage1.h b/SourceCode/Bond/Servo/CCjPage1.h
index 168fe9c..3ee0c38 100644
--- a/SourceCode/Bond/Servo/CCjPage1.h
+++ b/SourceCode/Bond/Servo/CCjPage1.h
@@ -1,9 +1,10 @@
锘�#pragma once
+#include "CCjPageBase.h"
// CPjPage1 瀵硅瘽妗�
-class CCjPage1 : public CDialogEx
+class CCjPage1 : public CCjPageBase
{
DECLARE_DYNAMIC(CCjPage1)
@@ -11,13 +12,9 @@
CCjPage1(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
virtual ~CCjPage1();
-private:
- void Resize();
+protected:
+ virtual void Resize();
-private:
- COLORREF m_crBkgnd;
- COLORREF m_crBkgndCached;
- CBrush m_brBkgnd;
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
@@ -30,7 +27,5 @@
DECLARE_MESSAGE_MAP()
public:
virtual BOOL OnInitDialog();
- afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
afx_msg void OnDestroy();
- afx_msg void OnSize(UINT nType, int cx, int cy);
};
--
Gitblit v1.9.3