From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CControlJobManagerDlg.cpp | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 166 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index 0bf7d67..2e2d92c 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;
@@ -76,6 +77,9 @@
else if (1 == code) {
if (contextType == 1) {
UpProcessJobId((PJWarp*)pContext);
+ }
+ else if (contextType == 2) {
+ UpControlJobId((SERVO::CControlJob*)pContext);
}
}
};
@@ -306,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) {
@@ -405,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;
@@ -423,6 +442,14 @@
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()) {
@@ -445,9 +472,13 @@
}
+ 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);
- auto& master = theApp.m_model.getMaster();
-
+ bool bProcessStart[] = {false, false, false, false};
std::vector<SERVO::CProcessJob*> pjs;
for (auto item : m_pjWarps) {
if (!item.addToCj) continue;
@@ -461,22 +492,35 @@
}
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 = "Port" + std::to_string(item.port + 1);
+ csi.carrierId = pPorts[item.port]->getCassetteId();
for (int i = 0; i < 8; i++) {
if (item.checkSlot[i]) {
- csi.slots.push_back(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());
}
@@ -487,8 +531,122 @@
return;
}
-
m_pControlJob->setPJs(pjs);
+ m_pControlJob->clearIssues();
int nRet = master.setProcessJobs(pjs);
- master.setControlJob(*m_pControlJob);
+
+ // 娌℃湁闂鐨刾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) {
+ 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");
+ }
+ }
+ }
+ AfxMessageBox(msg.c_str());
+
+ return;
+ }
+
+ 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;
+ }
+
+ // 璁剧疆 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(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