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

diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.h b/SourceCode/Bond/Servo/CControlJobManagerDlg.h
index 1df9313..031ed7c 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.h
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.h
@@ -5,6 +5,8 @@
 #include "ApredTreeCtrl2.h"
 
 
+#define WM_AFTER_TVCHECK (WM_USER + 1000)
+
 // CControlJobManagerDlg 瀵硅瘽妗�
 
 class CControlJobManagerDlg : public CDialogEx
@@ -23,9 +25,11 @@
 	bool AddPorcessJob(SERVO::CProcessJob* pj);
 	bool RemovePorcessJob(SERVO::CProcessJob* pj);
 	void UpProcessJobId(PJWarp* pjWarp);
+	void UpControlJobId(SERVO::CControlJob* pControlJob);
 	void InitData();
 	void LoadState();
 	void SaveState();
+	int ShowPage(int index);
 
 private:
 	std::vector<CCjPageBase*> m_pages;
@@ -54,7 +58,12 @@
 	virtual BOOL OnInitDialog();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
-	afx_msg void OnTvnSelchangedTree1(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnTvnItemChangedTree(NMHDR* pNMHDR, LRESULT* pResult);
 	afx_msg void OnDestroy();
 	afx_msg void OnBnClickedButtonApply();
+	afx_msg void OnTvnSelchangingTree1(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnBnClickedButtonBathCompletion();
+	afx_msg void OnTreeClick(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnTreeKeyDown(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg LRESULT OnAfterTvCheck(WPARAM wParam, LPARAM lParam);
 };

--
Gitblit v1.9.3