From 11260184c3c930d0d9ccd6b65e905c7828efd3cf Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 12 九月 2025 09:44:02 +0800
Subject: [PATCH] 1. 优化报警的查询功能 2. 插入设备表数据和单元表数据 3. 修复报警查询失败的问题
---
SourceCode/Bond/Servo/CEqJobEventStep.cpp | 39 +++++++++++----------------------------
1 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index 43bff4d..b8f998c 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,16 @@
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_jobDataB.getPortNo()).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("CarrierId",
- m_jobDataB.getCarrierId().c_str(), ""));
- attrubutes.addAttribute(new CAttribute("PruductId",
- m_jobDataB.getPruductId().c_str(), ""));
- attrubutes.addAttribute(new CAttribute("CarrierState",
- m_jobDataB.getCarrierStateDescription(strTemp).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("SlotMapping",
- std::to_string(m_jobDataB.getSlotMapping()).c_str(), ""));
- attrubutes.addAttribute(new CAttribute("SlotSelectedFlag",
- std::to_string(m_jobDataB.getSlotSelectedFlag()).c_str(), ""));
- std::vector<std::string>& ids = m_jobDataB.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++));
+ m_jobDataS.getAttributeVector(attrubutes, weight);
}
int CEqJobEventStep::onReadData()
@@ -51,14 +34,14 @@
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_jobDataB.unserialize(szBuffer, 640);
- LOGI("<CEqJobEventStep-%s>Read JobDataB\n", m_strName.c_str());
+ m_jobDataS.unserialize(szBuffer, 640);
+ LOGI("<CEqJobEventStep-%s>Read JobDataA\n", m_strName.c_str());
return 0;
}
@@ -74,13 +57,13 @@
int CEqJobEventStep::onTimeout()
{
CReadStep::onTimeout();
- LOGI("<CEqJobEventStep> onTimeout.");
+ LOGE("<CEqJobEventStep> onTimeout.");
return 0;
}
- CJobDataB* CEqJobEventStep::getJobDataB()
+ CJobDataS* CEqJobEventStep::getJobDataS()
{
- return &m_jobDataB;
+ return &m_jobDataS;
}
}
--
Gitblit v1.9.3