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/CControlJobDlg.h |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CControlJobDlg.h b/SourceCode/Bond/Servo/CControlJobDlg.h
index 410f3ec..ed4bdff 100644
--- a/SourceCode/Bond/Servo/CControlJobDlg.h
+++ b/SourceCode/Bond/Servo/CControlJobDlg.h
@@ -20,11 +20,16 @@
 	void Resize();
 	void ShowGroup1(BOOL bShow);
 	void ShowGroup2(BOOL bShow);
-	void LoadData();
+	void LoadData(SERVO::CControlJob* pControlJob);
 
 private:
 	SERVO::CControlJob* m_pControlJob;
 	CFont m_fontNoJob;
+
+	// 璁板綍涓婁竴娆＄殑 CJ 韬唤锛堟寚閽�/ID锛�
+	SERVO::CControlJob* m_lastCjPtr = nullptr;
+	CString             m_lastCjId;
+	CExpandableListCtrl::Node* m_rootNode = nullptr;
 
 protected:
 	CExpandableListCtrl m_listCtrl;
@@ -42,4 +47,7 @@
 public:
 	virtual BOOL OnInitDialog();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnBnClickedButtonCompletionBath();
+	afx_msg void OnBnClickedButtonReload();
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 };

--
Gitblit v1.9.3