From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CControlJobManagerDlg.cpp |  367 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 348 insertions(+), 19 deletions(-)

diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index e9b9479..78036f4 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
@@ -6,6 +6,7 @@
 #include "CControlJobManagerDlg.h"
 #include "afxdialogex.h"
 #include "ToolUnits.h"
+#include "RecipeManager.h"
 
 
 bool CControlJobManagerDlg::m_bHasState = false;
@@ -51,9 +52,14 @@
 BEGIN_MESSAGE_MAP(CControlJobManagerDlg, CDialogEx)
 	ON_WM_SIZE()
 	ON_WM_GETMINMAXINFO()
-	ON_NOTIFY(TVN_SELCHANGED, IDC_TREE1, &CControlJobManagerDlg::OnTvnSelchangedTree1)
+	ON_NOTIFY(TVN_ITEMCHANGED, IDC_TREE1, &CControlJobManagerDlg::OnTvnItemChangedTree)
+	ON_NOTIFY(NM_CLICK, IDC_TREE1, &CControlJobManagerDlg::OnTreeClick)          // 鏂板
+	ON_NOTIFY(TVN_KEYDOWN, IDC_TREE1, &CControlJobManagerDlg::OnTreeKeyDown)        // 鏂板
+	ON_MESSAGE(WM_AFTER_TVCHECK, &CControlJobManagerDlg::OnAfterTvCheck)                // 鏂板
 	ON_WM_DESTROY()
 	ON_BN_CLICKED(IDC_BUTTON_APPLY, &CControlJobManagerDlg::OnBnClickedButtonApply)
+	ON_NOTIFY(TVN_SELCHANGING, IDC_TREE1, &CControlJobManagerDlg::OnTvnSelchangingTree1)
+	ON_BN_CLICKED(IDC_BUTTON_BATH_COMPLETION, &CControlJobManagerDlg::OnBnClickedButtonBathCompletion)
 END_MESSAGE_MAP()
 
 
@@ -71,6 +77,9 @@
 		else if (1 == code) {
 			if (contextType == 1) {
 				UpProcessJobId((PJWarp*)pContext);
+			}
+			else if (contextType == 2) {
+				UpControlJobId((SERVO::CControlJob*)pContext);
 			}
 		}
 	};
@@ -184,8 +193,7 @@
 
 void CControlJobManagerDlg::UpdateCtrlState()
 {
-	auto& master = theApp.m_model.getMaster();
-	GetDlgItem(IDC_BUTTON_BATH_COMPLETION)->EnableWindow(false);
+	GetDlgItem(IDC_BUTTON_BATH_COMPLETION)->EnableWindow(true);
 }
 
 void CControlJobManagerDlg::UpdateControlJob()
@@ -199,7 +207,7 @@
 	for (auto& item : m_pjWarps) {
 		HTREEITEM hItem = m_tree.InsertItem(((SERVO::CProcessJob*)item.pj)->id().c_str(), 0, 0, hRoot);
 		m_tree.SetItemData(hItem, (DWORD_PTR)&item);
-		m_tree.SetItemState(hItem, INDEXTOSTATEIMAGEMASK(false ? 2 : 1), TVIS_STATEIMAGEMASK);
+		m_tree.SetItemState(hItem, INDEXTOSTATEIMAGEMASK(item.addToCj ? 2 : 1), TVIS_STATEIMAGEMASK);
 	}
 	m_tree.Expand(hRoot, TVE_EXPAND);
 }
@@ -216,35 +224,128 @@
 	return m_pControlJob->removePjPointer(pj->id());
 }
 
-void CControlJobManagerDlg::OnTvnSelchangedTree1(NMHDR* pNMHDR, LRESULT* pResult)
+void CControlJobManagerDlg::OnTvnItemChangedTree(NMHDR* pNMHDR, LRESULT* pResult)
+{
+	auto* p = reinterpret_cast<LPNMTREEVIEW>(pNMHDR);
+	UINT oldState = p->itemOld.state, newState = p->itemNew.state;
+	HTREEITEM hItem = p->itemNew.hItem;
+
+	if (((oldState ^ newState) & TVIS_STATEIMAGEMASK) != 0) {
+		const int idx = (newState & TVIS_STATEIMAGEMASK) >> 12; // 1=鏈��,2=宸查��
+		const bool checked = (idx == 2);
+
+		PJWarp* pjWarp = (PJWarp*)m_tree.GetItemData(hItem);
+		if (pjWarp != nullptr) {
+			CString s; s.Format("%s %d", ((SERVO::CProcessJob*)pjWarp->pj)->id().c_str(), 
+				checked ? "" : "");
+			AfxMessageBox(s);
+		}
+	}
+
+
+	*pResult = 0;
+}
+
+// 鍛戒腑澶嶉�夋锛氱敤 NM_CLICK 鍋氬懡涓祴璇曪紝鐒跺悗鈥滄粸鍚庘�濊鍙栨柊鐘舵��
+void CControlJobManagerDlg::OnTreeClick(NMHDR* pNMHDR, LRESULT* pResult)
+{
+	*pResult = 0;
+
+	DWORD pos = ::GetMessagePos();
+	CPoint pt(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
+	m_tree.ScreenToClient(&pt);
+
+	TVHITTESTINFO ht{}; ht.pt = pt;
+	HTREEITEM hItem = m_tree.HitTest(&ht);
+	if (hItem && (ht.flags & TVHT_ONITEMSTATEICON)) {
+		// 璁� TreeView 鍏堝垏鎹紝鍐嶅紓姝ヨ鍙栨渶缁堢姸鎬�
+		PostMessage(WM_AFTER_TVCHECK, (WPARAM)hItem, 0);
+	}
+}
+
+// 绌烘牸閿篃浼氬垏鎹㈠閫夋
+void CControlJobManagerDlg::OnTreeKeyDown(NMHDR* pNMHDR, LRESULT* pResult)
+{
+	*pResult = 0;
+	auto* p = reinterpret_cast<LPNMTVKEYDOWN>(pNMHDR);
+	if (p->wVKey == VK_SPACE) {
+		HTREEITEM hItem = m_tree.GetSelectedItem();
+		if (hItem) PostMessage(WM_AFTER_TVCHECK, (WPARAM)hItem, 0);
+	}
+}
+
+// 缁熶竴澶勭悊锛堣鏈�缁堢姸鎬� + 浣犵殑涓氬姟锛�
+LRESULT CControlJobManagerDlg::OnAfterTvCheck(WPARAM wParam, LPARAM /*lParam*/)
+{
+	HTREEITEM hItem = (HTREEITEM)wParam;
+	if (!hItem) return 0;
+
+	// 鍙鐞嗙浜屽眰锛氭牴鐨勭洿鎺ュ瓙鑺傜偣锛堝彲閫夛級
+	auto getLevel = [&](HTREEITEM h) {
+		int lv = 0; for (HTREEITEM p = m_tree.GetParentItem(h); p; p = m_tree.GetParentItem(p)) ++lv; return lv;
+	};
+	if (getLevel(hItem) != 1) return 0;
+
+	BOOL checked = m_tree.GetCheck(hItem);
+
+	// 浣犵殑涓氬姟閫昏緫锛堜慨姝ｄ簡 CString::Format 鐨勫弬鏁扮被鍨嬶級
+	auto* pjWarp = reinterpret_cast<PJWarp*>(m_tree.GetItemData(hItem));
+	if (pjWarp) {
+		pjWarp->addToCj = checked;
+	}
+
+	return 0;
+}
+
+void CControlJobManagerDlg::OnTvnSelchangingTree1(NMHDR* pNMHDR, LRESULT* pResult)
 {
 	LPNMTREEVIEW pNMTreeView = reinterpret_cast<LPNMTREEVIEW>(pNMHDR);
 
+	bool allow = FALSE;
+	HTREEITEM hOldSel = pNMTreeView->itemOld.hItem;
 	HTREEITEM hSel = pNMTreeView->itemNew.hItem;
 	if (hSel != nullptr) {
 		HTREEITEM hParent = m_tree.GetParentItem(hSel);
 		if (hParent == nullptr) {
 			SERVO::CControlJob* cj = (SERVO::CControlJob*)m_tree.GetItemData(hSel);
 			ASSERT(m_pages.size() == 3);
-			m_pages[0]->ShowWindow(SW_HIDE);
-			m_pages[1]->ShowWindow(SW_HIDE);
-			m_pages[2]->ShowWindow(SW_SHOW);
+			if (0 == ShowPage(2)) {
+				SERVO::CControlJob* pControlJob = (SERVO::CControlJob*)m_tree.GetItemData(hSel);
+				m_pages[2]->SetContext(pControlJob, 2);
+			}
 		}
 		else if (m_tree.GetParentItem(hParent) == nullptr) {
-			PJWarp* pjWarp = (PJWarp*)m_tree.GetItemData(hSel);
-			m_pages[0]->ShowWindow(SW_HIDE);
-			m_pages[1]->ShowWindow(SW_SHOW);
-			m_pages[2]->ShowWindow(SW_HIDE);
-			m_pages[1]->SetContext(pjWarp, 1);
-
-			((CCjPage2*)m_pages[1])->SetPjWarps(m_pjWarps);
+			if (0 == ShowPage(1)) {
+				PJWarp* pjWarp = (PJWarp*)m_tree.GetItemData(hSel);
+				((CCjPage2*)m_pages[1])->SetPjWarps(m_pjWarps);
+				m_pages[1]->SetContext(pjWarp, 1);
+			}
+			else {
+				allow = TRUE;
+			}
 		}
 		else {
 			// 鏈夌鍏� 鈫� 绗笁灞傚強浠ヤ笅 鈫� Glass
 		}
 	}
 
-	*pResult = 0;
+	*pResult = allow;
+}
+
+int CControlJobManagerDlg::ShowPage(int index)
+{
+	ASSERT(0 <= index && index <= 2);
+
+	for (int i = 0; i < 3; i++) {
+		if (m_pages[i]->IsWindowVisible()) {
+			int ret = m_pages[i]->OnApply();
+			if (ret != 0) return -1;
+		}
+
+		m_pages[i]->ShowWindow(index == i ? SW_SHOW : SW_HIDE);
+	}
+
+	return 0;
 }
 
 void CControlJobManagerDlg::OnDestroy()
@@ -269,7 +370,7 @@
 	for (int i = 0; i < 4; i++) {
 		sprintf_s(szBuffer, 256, "PJ%03d", i + 1);
 		SERVO::CProcessJob* pj = new SERVO::CProcessJob(std::string(szBuffer));
-		PJWarp pjWarp;
+		PJWarp pjWarp = {};
 		pjWarp.pj = pj;
 		pjWarp.port = -1;
 		m_pjWarps.push_back(pjWarp);
@@ -279,9 +380,12 @@
 void CControlJobManagerDlg::OnBnClickedButtonApply()
 {
 	for (auto item : m_pages) {
-		item->OnApply();
+		if (item->IsWindowVisible()) {
+			if (0 == item->OnApply()) {
+				GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(FALSE);
+			}
+		}
 	}
-	GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(FALSE);
 }
 
 void CControlJobManagerDlg::UpProcessJobId(PJWarp* pjWarp)
@@ -306,6 +410,20 @@
 	}
 }
 
+void CControlJobManagerDlg::UpControlJobId(SERVO::CControlJob* pControlJob)
+{
+	// 鏇存柊鏍戞帶浠�
+	// 閬嶅巻鏍硅妭鐐�
+	HTREEITEM hRoot = m_tree.GetRootItem();
+	if (hRoot != nullptr) {
+		DWORD_PTR data = m_tree.GetItemData(hRoot);
+		if ((void*)data == pControlJob) {
+			m_tree.SetItemText(hRoot, pControlJob->id().c_str());
+			return; // 鎵惧埌灏辫繑鍥�
+		}
+	}
+}
+
 void CControlJobManagerDlg::LoadState()
 {
 	if (!m_bHasState) return;
@@ -321,3 +439,214 @@
 	m_state.pjWarps = m_pjWarps;
 	m_bHasState = true;
 }
+
+void CControlJobManagerDlg::OnBnClickedButtonBathCompletion()
+{
+	// 鍏堟鏌ュ綋鍓峬aster
+	auto& master = theApp.m_model.getMaster();
+	if (!master.canCreateControlJob()) {
+		AfxMessageBox("褰撳墠Master鏈夋湭缁撴壒鐨凧ob, 璇峰厛缁撴壒澶勭悊");
+		return;
+	}
+
+
+	// 鍏堝簲鐢�
+	for (int i = 0; i < 3; i++) {
+		if (m_pages[i]->IsWindowVisible()) {
+			int ret = m_pages[i]->OnApply();
+			if (ret != 0) return ;
+		}
+	}
+	GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(FALSE);
+
+
+	// 鍏堟鏌ユ暟鎹纭��
+	int checkCount = 0;
+	for (auto item : m_pjWarps) {
+		if (!item.addToCj) continue;
+		checkCount++;
+	}
+	if (checkCount == 0) {
+		AfxMessageBox(_T("鎮ㄦ病鏈夐�夋嫨瑕佽繘琛屽伐鑹哄鐞嗙殑Process Job!\n璇峰湪瑕佽繘琛屽伐鑹哄鐞嗙殑Process Job鍓嶆墦鍕俱��"));
+		return;
+	}
+
+
+	SERVO::CLoadPort* pPorts[4];
+	pPorts[0] = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT1);
+	pPorts[1] = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT2);
+	pPorts[2] = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT3);
+	pPorts[3] = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT4);
+
+	bool bProcessStart[] = {false, false, false, false};
+	std::vector<SERVO::CProcessJob*> pjs;
+	for (auto item : m_pjWarps) {
+		if (!item.addToCj) continue;
+		if (item.port == -1) continue;
+		BOOL bCheck = FALSE;
+		for (int i = 0; i < 8; i++) {
+			if (item.checkSlot[i]) {
+				bCheck = TRUE;
+				break;
+			}
+		}
+		if (!bCheck) continue;
+
+		SERVO::CProcessJob* pScr = (SERVO::CProcessJob*)item.pj;
+		pScr->setPjWarp(item);
+		pScr->setLotId("LotID1");
+		pScr->setProductId("ProductId1");
+		pScr->setOperationId("OperationId");
+		pScr->setRecipe(SERVO::RecipeMethod::NoTuning, pScr->recipeSpec());
+
+		SERVO::CProcessJob * pj = new SERVO::CProcessJob(pScr->id());
+		pj->setPjWarp(item);
+		pj->setLotId("LotID1");
+		pj->setProductId("ProductId1");
+		pj->setOperationId("OperationId");
+		pj->setRecipe(SERVO::RecipeMethod::NoTuning, pScr->recipeSpec());
+
+		std::vector<SERVO::CarrierSlotInfo> carriers;
+		SERVO::CarrierSlotInfo csi;
+		csi.carrierId = pPorts[item.port]->getCassetteId();
+		for (int i = 0; i < 8; i++) {
+			if (item.checkSlot[i]) {
+				SERVO::CGlass* pGlass = pPorts[item.port]->getGlassFromSlot(i+1);
+				if (pGlass != nullptr) {
+					csi.slots.push_back(i + 1);
+				}
+			}
+		}
+		carriers.push_back(csi);
+		pj->setCarriers(carriers);
+		pjs.push_back(pj);
+		bProcessStart[item.port] = true;
+
+		m_pControlJob->addPJ(pScr->id());
+	}
+
+
+	if (pjs.empty()) {
+		AfxMessageBox(_T("娌℃湁闇�瑕佽繘琛屽伐鑹哄鐞嗙殑Process Job!\n鍙兘鏈�夋嫨Port鎴栭�夋嫨浠讳綍鐗╂枡銆�"));
+		return;
+	}
+
+	m_pControlJob->setPJs(pjs);
+	m_pControlJob->clearIssues();
+	int nRet = master.setProcessJobs(pjs);
+	if (nRet <= 0) {
+		std::string msg("鍚屾Process Job澶辫触!");
+		for (auto pj : pjs) {
+			auto& issues = pj->issues();
+			if (!issues.empty()) {
+				msg.append("\n");
+				msg.append(pj->id());
+				msg.append(":\n");
+				for (auto i : issues) {
+					msg.append("[");
+					msg.append(std::to_string(i.code));
+					msg.append("]");
+					msg.append(i.text);
+					msg.append("\n");
+				}
+			}
+			delete pj;
+		}
+		pjs.clear();
+		AfxMessageBox(msg.c_str());
+		return;
+	}
+
+	// 缁х画閲婃斁鏈夐棶棰樼殑 ProcessJob
+	for (auto pj : pjs) {
+		if (!pj->issues().empty()) {
+			delete pj;
+		}
+	}
+	pjs.clear();
+
+	nRet = master.setControlJob(*m_pControlJob);
+	if (nRet != 0) {
+		std::string msg("鍚屾ControlJob澶辫触!");
+		auto& issues = m_pControlJob->issues();
+		if (!issues.empty()) {
+			msg.append("\n");
+			for (auto i : issues) {
+				msg.append("[");
+				msg.append(std::to_string(i.code));
+				msg.append("]");
+				msg.append(i.text);
+				msg.append("\n");
+			}
+		}
+		AfxMessageBox(msg.c_str());
+		return;
+	}
+
+
+	// 鎴愬姛锛岃鍒ゆ柇锛屽悓姝ュ埌slot鐨刧lass涓紝绫诲瀷绛�
+	for (int p = 0; p < 4; p++) {
+		if (m_pjWarps[p].port == -1) continue;
+		ASSERT(0 <= m_pjWarps[p].port && m_pjWarps[p].port <= 3);
+
+		SERVO::CLoadPort* pLoadPort = pPorts[m_pjWarps[p].port];
+		for (int i = 0; i < SLOT_MAX; ++i) {
+			SERVO::CSlot* pSlot = pLoadPort->getSlot(i);
+			if (!pSlot) continue;
+
+			SERVO::CGlass* pGlass = dynamic_cast<SERVO::CGlass*>(pSlot->getContext());
+			if (pGlass == nullptr) continue;
+
+			SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+			if (pJobDataS == nullptr) continue;
+
+
+			// 璁剧疆 Panel ID 鍜屽嬀閫夋
+			SERVO::CProcessJob* pj = (SERVO::CProcessJob*)m_pjWarps[p].pj;
+			int nRecipeID = RecipeManager::getInstance().getIdByPPID(pj->recipeSpec());
+			RecipeInfo stRecipeInfo = RecipeManager::getInstance().getRecipeByPPID(pj->recipeSpec());
+			std::vector<DeviceRecipe> vecRecipeInfo = stRecipeInfo.vecDeviceList;
+
+			pGlass->setScheduledForProcessing(m_pjWarps[p].checkSlot[i]);
+			pGlass->setType(static_cast<SERVO::MaterialsType>(m_pjWarps[p].material[i]));
+
+			pJobDataS->setLotId(pj->getLotId().c_str());
+				pJobDataS->setProductId(pj->getProductId().c_str());
+				pJobDataS->setOperationId(pj->getOperationId().c_str());
+				pJobDataS->setMaterialsType(m_pjWarps[p].material[i]);
+				pJobDataS->setMasterRecipe(nRecipeID);
+
+			for (const auto& info : vecRecipeInfo) {
+				const std::string& name = info.strDeviceName;
+				short nRecipeID = (short)info.nRecipeID;
+				
+				if (name == EQ_NAME_EFEM) {
+					pJobDataS->setDeviceRecipeId(0, nRecipeID);
+				}
+				else if (name == EQ_NAME_BONDER1) {
+					pJobDataS->setDeviceRecipeId(1, nRecipeID);
+				}
+				else if (name == EQ_NAME_BONDER2) {
+					pJobDataS->setDeviceRecipeId(2, nRecipeID);
+				}
+				else if (name == EQ_NAME_BAKE_COOLING) {
+					pJobDataS->setDeviceRecipeId(3, nRecipeID);
+				}
+				else if (name == EQ_NAME_VACUUMBAKE) {
+					pJobDataS->setDeviceRecipeId(4, nRecipeID);
+				}
+				else if (name == EQ_NAME_MEASUREMENT) {
+					pJobDataS->setDeviceRecipeId(5, nRecipeID);
+				}
+			}
+		}
+	}
+
+	// process start
+	for (int p = 0; p < 4; p++) {
+		if (bProcessStart[p]) {
+			pPorts[p]->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
+			Sleep(100);
+		}
+	}
+}

--
Gitblit v1.9.3