From 9fbd7479ce17f76f72cc0e5a675336261ec76472 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 12 五月 2025 15:39:53 +0800
Subject: [PATCH] 1.使用CEqReadStep替换CEqJobEventStep, 实现ReceivedJob 2.实现SentOutJob

---
 SourceCode/Bond/Servo/CJobDataS.cpp |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 105 insertions(+), 9 deletions(-)

diff --git a/SourceCode/Bond/Servo/CJobDataS.cpp b/SourceCode/Bond/Servo/CJobDataS.cpp
index 0b2b4f7..54d0689 100644
--- a/SourceCode/Bond/Servo/CJobDataS.cpp
+++ b/SourceCode/Bond/Servo/CJobDataS.cpp
@@ -340,23 +340,23 @@
 		memcpy(&pszBuffer[index], &m_nJobSequenceNo, sizeof(short));
 		index += sizeof(short);
 
-		int strLen = min(40, m_strLotId.size());
+		int strLen = min(40, (int)m_strLotId.size());
 		memcpy(&pszBuffer[index], m_strLotId.c_str(), strLen);
 		index += 40;
 
-		strLen = min(20, m_strProductId.size());
+		strLen = min(20, (int)m_strProductId.size());
 		memcpy(&pszBuffer[index], m_strProductId.c_str(), strLen);
 		index += 20;
 
-		strLen = min(20, m_strOperationId.size());
+		strLen = min(20, (int)m_strOperationId.size());
 		memcpy(&pszBuffer[index], m_strOperationId.c_str(), strLen);
 		index += 20;
 
-		strLen = min(20, m_strGlass1Id.size());
+		strLen = min(20, (int)m_strGlass1Id.size());
 		memcpy(&pszBuffer[index], m_strGlass1Id.c_str(), strLen);
 		index += 20;
 
-		strLen = min(20, m_strGlass2Id.size());
+		strLen = min(20, (int)m_strGlass2Id.size());
 		memcpy(&pszBuffer[index], m_strGlass2Id.c_str(), strLen);
 		index += 20;
 
@@ -405,19 +405,19 @@
 		memcpy(&pszBuffer[index], &m_nMasterRecipe, sizeof(short));
 		index += sizeof(short);
 
-		strLen = min(10, m_strProductRecipeId.size());
+		strLen = min(10, (int)m_strProductRecipeId.size());
 		memcpy(&pszBuffer[index], m_strProductRecipeId.c_str(), strLen);
 		index += 10;
 
-		strLen = min(10, m_strPCode.size());
+		strLen = min(10, (int)m_strPCode.size());
 		memcpy(&pszBuffer[index], m_strPCode.c_str(), strLen);
 		index += 10;
 
-		strLen = min(10, m_strUseType.size());
+		strLen = min(10, (int)m_strUseType.size());
 		memcpy(&pszBuffer[index], m_strUseType.c_str(), strLen);
 		index += 10;
 
-		strLen = min(80, m_strPanelMeasure.size());
+		strLen = min(80, (int)m_strPanelMeasure.size());
 		memcpy(&pszBuffer[index], m_strPanelMeasure.c_str(), strLen);
 		index += 80;
 
@@ -543,4 +543,100 @@
 
 		return 256 * 2;
 	}
+
+	void CJobDataS::getAttributeVector(CAttributeVector& attrubutes, int beginWeight)
+	{
+		unsigned int weight = beginWeight;
+		std::string strTemp;
+
+		attrubutes.addAttribute(new CAttribute("CassetteSequenceNo",
+			std::to_string(getCassetteSequenceNo()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("JobSequenceNo",
+			std::to_string(getJobSequenceNo()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("LotId",
+			getLotId().c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("ProductId",
+			getProductId().c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("OperationId",
+			getOperationId().c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("Glass1Id",
+			getGlass1Id().c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("Glass2Id",
+			getGlass2Id().c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("JobType",
+			std::to_string(getJobType()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("MaterialsType",
+			std::to_string(getMaterialsType()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("ProductType",
+			std::to_string(getProductType()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("DummyType",
+			std::to_string(getDummyType()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("SkipFlag",
+			std::to_string(getSkipFlag()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("ProcessFlag",
+			std::to_string(getProcessFlag()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("ProcessResonCode",
+			std::to_string(getProcessResonCode()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("LastGlassFlag",
+			std::to_string(getLastGlassFlag()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("FirstGlassFlag",
+			std::to_string(getFirstGlassFlag()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("QTime1",
+			std::to_string(getQTime(0)).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("QTime2",
+			std::to_string(getQTime(1)).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("QTime3",
+			std::to_string(getQTime(2)).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("QTimeOverFlag",
+			std::to_string(getQTimeOverFlag()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("MasterRecipe",
+			std::to_string(getMasterRecipe()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("ProductRecipeId",
+			getProductRecipeId().c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("PCode",
+			getPCode().c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("UseType",
+			getUseType().c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("PanelMeasure",
+			getPanelMeasure().c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("SlotUnitSelectFlag",
+			std::to_string(getSlotUnitSelectFlag()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("SourcePortNo",
+			std::to_string(getSourcePortNo()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("SourceSlotNo",
+			std::to_string(getSourceSlotNo()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("TargetPortNo",
+			std::to_string(getTargetPortNo()).c_str(), "", weight++));
+
+		attrubutes.addAttribute(new CAttribute("TargetSlotNo",
+			std::to_string(getTargetSlotNo()).c_str(), "", weight++));
+	}
 }

--
Gitblit v1.9.3