From d68541dce155a682f65b7c3fbfbfbeef17ea5b8f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 12 五月 2025 12:00:41 +0800
Subject: [PATCH] 1.StoredJob, Fetched out Job实现； 2.CStep增加定制的Attribute, 以便通过的Step不使用getAttributeVector也能添加不一样的Attribute;
---
SourceCode/Bond/Servo/CEqJobEventStep.cpp | 122 ++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 24 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index 724f000..2bdc84a 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
@@ -6,7 +6,7 @@
namespace SERVO {
CEqJobEventStep::CEqJobEventStep() : CReadStep()
{
- m_nJobDataBDev = 0;
+ m_nJobDataADev = 0;
}
CEqJobEventStep::~CEqJobEventStep()
@@ -16,33 +16,107 @@
void CEqJobEventStep::setJobDataDev(int nDev)
{
- m_nJobDataBDev = nDev;
+ m_nJobDataADev = nDev;
}
void CEqJobEventStep::getAttributeVector(CAttributeVector& attrubutes)
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Dev",
- ("W" + CToolUnits::toHexString(m_nJobDataBDev, strTemp)).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("PortNo",
- std::to_string(m_jobDataA.getPortNo()).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("CarrierId",
- m_jobDataA.getCarrierId().c_str(), ""));
- attrubutes.addAttribute(new CAttribute("PruductId",
- m_jobDataA.getPruductId().c_str(), ""));
- attrubutes.addAttribute(new CAttribute("CarrierState",
- m_jobDataA.getCarrierStateDescription(strTemp).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("SlotMapping",
- std::to_string(m_jobDataA.getSlotMapping()).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("SlotSelectedFlag",
- std::to_string(m_jobDataA.getSlotSelectedFlag()).c_str(), ""));
- std::vector<std::string>& ids = m_jobDataA.getGlassIds();
- for (int i = 0; i < ids.size(); i++) {
- attrubutes.addAttribute(new CAttribute((std::string("GlassId") + std::to_string(i+1)).c_str(),
- ids[i].c_str(), ""));
- }
+ ("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++));
}
int CEqJobEventStep::onReadData()
@@ -51,13 +125,13 @@
char szBuffer[1024];
- int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nJobDataBDev,
+ int nRet = m_pCclink->ReadData2(m_station, DeviceType::W, m_nJobDataADev,
640, szBuffer);
if (0 != nRet) {
return -1;
}
- m_jobDataA.unserialize(szBuffer, 640);
+ m_jobDataS.unserialize(szBuffer, 640);
LOGI("<CEqJobEventStep-%s>Read JobDataA\n", m_strName.c_str());
return 0;
@@ -79,8 +153,8 @@
return 0;
}
- CJobDataA* CEqJobEventStep::getJobDataA()
+ CJobDataS* CEqJobEventStep::getJobDataS()
{
- return &m_jobDataA;
+ return &m_jobDataS;
}
}
--
Gitblit v1.9.3