From fcfe1d4a6c0f06adb4716914901ccc76a88d8dba Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 14 十一月 2025 13:52:10 +0800
Subject: [PATCH] 1.修复两个Job相关的问题；
---
SourceCode/Bond/Servo/CControlJobManagerDlg.cpp | 77 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index dc22f39..2d8ee00 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
@@ -78,6 +78,9 @@
if (contextType == 1) {
UpProcessJobId((PJWarp*)pContext);
}
+ else if (contextType == 2) {
+ UpControlJobId((SERVO::CControlJob*)pContext);
+ }
}
};
@@ -307,7 +310,8 @@
SERVO::CControlJob* cj = (SERVO::CControlJob*)m_tree.GetItemData(hSel);
ASSERT(m_pages.size() == 3);
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) {
@@ -406,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;
@@ -475,7 +493,17 @@
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;
@@ -506,15 +534,6 @@
m_pControlJob->setPJs(pjs);
m_pControlJob->clearIssues();
int nRet = master.setProcessJobs(pjs);
-
- // 娌℃湁闂鐨刾j瑕侀噴鏀�
- for (auto pj : pjs) {
- if (!pj->issues().empty()) {
- delete pj;
- }
- }
- pjs.clear();
-
if (nRet <= 0) {
std::string msg("鍚屾Process Job澶辫触!");
for (auto pj : pjs) {
@@ -531,11 +550,20 @@
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) {
@@ -560,28 +588,31 @@
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;
- }
+ 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;
- SERVO::CGlass* pGlass = dynamic_cast<SERVO::CGlass*>(pSlot->getContext());
- SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
- if (pGlass != nullptr && pJobDataS != nullptr) {
- pGlass->setScheduledForProcessing(m_pjWarps[p].checkSlot[i]);
- pGlass->setType(static_cast<SERVO::MaterialsType>(m_pjWarps[p].material[i]));
- SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
- pJobDataS->setLotId("LotID1");
- pJobDataS->setProductId("ProductId1");
- pJobDataS->setOperationId("OPerationId");
+ 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);
--
Gitblit v1.9.3