From 331f447bb0e5eccf0b3161ab287c1372b14b8480 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 08 八月 2025 11:53:58 +0800
Subject: [PATCH] 1.增加千传计数,保存计数,重启软件时恢复; 2.千传测试模式,打印相关日志,方便后期提取,用于统计; 3.千传模式时烘烤两腔体都要进入; 4.千传模式时,Fliper到Bonder修改为用手臂2取料; 5.修复千传模式不计运行时的问题; 6.千传模式,最后收料强制放入第一层; 6.修复Buf, 当任务未生成(在符合条件后仍有1秒间隙)而机器单元发送FetchOutJob时,数据检验失败的问题,增加Sleep, 缩小间隙;

---
 SourceCode/Bond/Servo/CEqJobEventStep.cpp |   29 ++++++-----------------------
 1 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index a0efb8b..7a084fe 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
@@ -21,28 +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(), ""));
-		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++));
+		m_jobDataS.getAttributeVector(attrubutes, weight);
 	}
 
 	int CEqJobEventStep::onReadData()
@@ -57,7 +40,7 @@
 			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 +62,8 @@
 		return 0;
 	}
 
-	CJobDataA* CEqJobEventStep::getJobDataA()
+	CJobDataS* CEqJobEventStep::getJobDataS()
 	{
-		return &m_jobDataA;
+		return &m_jobDataS;
 	}
 }

--
Gitblit v1.9.3