From 410ea79955e2d115643a38f40e006f1aeaba897b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 26 四月 2025 14:39:23 +0800
Subject: [PATCH] 1.增加CVcrEventStep

---
 SourceCode/Bond/Servo/CEqJobEventStep.cpp |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index 43bff4d..a0efb8b 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,7 +16,7 @@
 
 	void CEqJobEventStep::setJobDataDev(int nDev)
 	{
-		m_nJobDataBDev = nDev;
+		m_nJobDataADev = nDev;
 	}
 
 	void CEqJobEventStep::getAttributeVector(CAttributeVector& attrubutes)
@@ -25,20 +25,20 @@
 
 		std::string strTemp;
 		attrubutes.addAttribute(new CAttribute("Dev",
-			("W" + CToolUnits::toHexString(m_nJobDataBDev, strTemp)).c_str(), ""));
+			("W" + CToolUnits::toHexString(m_nJobDataADev, strTemp)).c_str(), ""));
 		attrubutes.addAttribute(new CAttribute("PortNo",
-			std::to_string(m_jobDataB.getPortNo()).c_str(), ""));
+			std::to_string(m_jobDataA.getPortNo()).c_str(), ""));
 		attrubutes.addAttribute(new CAttribute("CarrierId",
-			m_jobDataB.getCarrierId().c_str(), ""));
+			m_jobDataA.getCarrierId().c_str(), ""));
 		attrubutes.addAttribute(new CAttribute("PruductId",
-			m_jobDataB.getPruductId().c_str(), ""));
+			m_jobDataA.getPruductId().c_str(), ""));
 		attrubutes.addAttribute(new CAttribute("CarrierState",
-			m_jobDataB.getCarrierStateDescription(strTemp).c_str(), ""));
+			m_jobDataA.getCarrierStateDescription(strTemp).c_str(), ""));
 		attrubutes.addAttribute(new CAttribute("SlotMapping",
-			std::to_string(m_jobDataB.getSlotMapping()).c_str(), ""));
+			std::to_string(m_jobDataA.getSlotMapping()).c_str(), ""));
 		attrubutes.addAttribute(new CAttribute("SlotSelectedFlag",
-			std::to_string(m_jobDataB.getSlotSelectedFlag()).c_str(), ""));
-		std::vector<std::string>& ids = m_jobDataB.getGlassIds();
+			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(), ""));
@@ -51,14 +51,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_jobDataA.unserialize(szBuffer, 640);
+		LOGI("<CEqJobEventStep-%s>Read JobDataA\n", m_strName.c_str());
 
 		return 0;
 	}
@@ -79,8 +79,8 @@
 		return 0;
 	}
 
-	CJobDataB* CEqJobEventStep::getJobDataB()
+	CJobDataA* CEqJobEventStep::getJobDataA()
 	{
-		return &m_jobDataB;
+		return &m_jobDataA;
 	}
 }

--
Gitblit v1.9.3