From 9e9e63ef44ff672989d7b78bf37afb2054267671 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 22 九月 2025 15:47:04 +0800
Subject: [PATCH] 1.完善工艺批次逻辑； 2.PortType保存到本地，不再同步到efem
---
SourceCode/Bond/Servo/CControlJobManagerDlg.cpp | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
index a791c3c..037b595 100644
--- a/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
+++ b/SourceCode/Bond/Servo/CControlJobManagerDlg.cpp
@@ -454,11 +454,11 @@
}
- SERVO::CLoadPort* pPort[4];
- pPort[0] = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT1);
- pPort[1] = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT2);
- pPort[2] = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT3);
- pPort[3] = (SERVO::CLoadPort*)master.getEquipment(EQ_ID_LOADPORT4);
+ 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;
@@ -475,15 +475,25 @@
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 = pPort[item.port]->getCassetteId();
+ csi.carrierId = pPorts[item.port]->getCassetteId();
for (int i = 0; i < 8; i++) {
if (item.checkSlot[i]) {
- SERVO::CGlass* pGlass = pPort[item.port]->getGlassFromSlot(i+1);
+ SERVO::CGlass* pGlass = pPorts[item.port]->getGlassFromSlot(i+1);
if (pGlass != nullptr) {
csi.slots.push_back(i + 1);
}
@@ -558,12 +568,16 @@
// 鎴愬姛锛岃鍒ゆ柇锛屽悓姝ュ埌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 = pPort[p]->getSlot(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());
@@ -576,9 +590,9 @@
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");
+ 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);
@@ -613,7 +627,7 @@
// process start
for (int p = 0; p < 4; p++) {
if (bProcessStart[p]) {
- pPort[p]->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
+ pPorts[p]->sendCassetteCtrlCmd(CCC_PROCESS_START, nullptr, 0, 0, 0, nullptr, nullptr);
Sleep(100);
}
}
--
Gitblit v1.9.3