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/CEqJobEventStep.cpp | 95 +----------------------------------------------
1 files changed, 2 insertions(+), 93 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index 2bdc84a..b8f998c 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
@@ -21,102 +21,11 @@
void CEqJobEventStep::getAttributeVector(CAttributeVector& attrubutes)
{
- CReadStep::getAttributeVector(attrubutes);
-
unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Dev",
("W" + CToolUnits::toHexString(m_nJobDataADev, strTemp)).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("CassetteSequenceNo",
- std::to_string(m_jobDataS.getCassetteSequenceNo()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("JobSequenceNo",
- std::to_string(m_jobDataS.getJobSequenceNo()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("LotId",
- m_jobDataS.getLotId().c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("ProductId",
- m_jobDataS.getProductId().c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("OperationId",
- m_jobDataS.getOperationId().c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("Glass1Id",
- m_jobDataS.getGlass1Id().c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("Glass2Id",
- m_jobDataS.getGlass2Id().c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("JobType",
- std::to_string(m_jobDataS.getJobType()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("MaterialsType",
- std::to_string(m_jobDataS.getMaterialsType()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("ProductType",
- std::to_string(m_jobDataS.getProductType()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("DummyType",
- std::to_string(m_jobDataS.getDummyType()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("SkipFlag",
- std::to_string(m_jobDataS.getSkipFlag()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("ProcessFlag",
- std::to_string(m_jobDataS.getProcessFlag()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("ProcessResonCode",
- std::to_string(m_jobDataS.getProcessResonCode()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("LastGlassFlag",
- std::to_string(m_jobDataS.getLastGlassFlag()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("FirstGlassFlag",
- std::to_string(m_jobDataS.getFirstGlassFlag()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("QTime1",
- std::to_string(m_jobDataS.getQTime(0)).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("QTime2",
- std::to_string(m_jobDataS.getQTime(1)).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("QTime3",
- std::to_string(m_jobDataS.getQTime(2)).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("QTimeOverFlag",
- std::to_string(m_jobDataS.getQTimeOverFlag()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("MasterRecipe",
- std::to_string(m_jobDataS.getMasterRecipe()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("ProductRecipeId",
- m_jobDataS.getProductRecipeId().c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("PCode",
- m_jobDataS.getPCode().c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("UseType",
- m_jobDataS.getUseType().c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("PanelMeasure",
- m_jobDataS.getPanelMeasure().c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("SlotUnitSelectFlag",
- std::to_string(m_jobDataS.getSlotUnitSelectFlag()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("SourcePortNo",
- std::to_string(m_jobDataS.getSourcePortNo()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("SourceSlotNo",
- std::to_string(m_jobDataS.getSourceSlotNo()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("TargetPortNo",
- std::to_string(m_jobDataS.getTargetPortNo()).c_str(), "", weight++));
-
- attrubutes.addAttribute(new CAttribute("TargetSlotNo",
- std::to_string(m_jobDataS.getTargetSlotNo()).c_str(), "", weight++));
+ m_jobDataS.getAttributeVector(attrubutes, weight);
}
int CEqJobEventStep::onReadData()
@@ -148,7 +57,7 @@
int CEqJobEventStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEqJobEventStep> onTimeout.");
+ LOGE("<CEqJobEventStep> onTimeout.");
return 0;
}
--
Gitblit v1.9.3