From 3b9f1a5229885901e646751242d9d88bf3d068ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 27 六月 2025 09:04:14 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CEquipment.cpp |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 5a34f60..81b6bbf 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1409,11 +1409,8 @@
 
 		// 缓存Attribute，用于调试时显示信息
 		unsigned int weight = 201;
-		CAttributeVector attrubutes;
+		CAttributeVector& attrubutes = pStep->attributeVector();
 		processData.getAttributeVector(attrubutes, weight);
-		pStep->addAttributeVector(attrubutes);
-
-
 		onProcessData(&processData);
 
 		return nRet;
@@ -1427,11 +1424,8 @@
 
 		// 缓存Attribute，用于调试时显示信息
 		unsigned int weight = 201;
-		CAttributeVector attrubutes;
+		CAttributeVector& attrubutes = pStep->attributeVector();
 		jobDataS.getAttributeVector(attrubutes, weight);
-		pStep->addAttributeVector(attrubutes);
-
-
 		onReceivedJob(port, &jobDataS);
 
 		return nRet;
@@ -1451,11 +1445,8 @@
 
 		// 缓存Attribute，用于调试时显示信息
 		unsigned int weight = 201;
-		CAttributeVector attrubutes;
+		CAttributeVector& attrubutes = pStep->attributeVector();
 		jobDataS.getAttributeVector(attrubutes, weight);
-		pStep->addAttributeVector(attrubutes);
-
-
 		onSentOutJob(port, &jobDataS);
 
 		return nRet;
@@ -1601,9 +1592,8 @@
 
 		// 缓存Attribute，用于调试时显示信息
 		unsigned int weight = 201;
-		CAttributeVector attrubutes;
+		CAttributeVector& attrubutes = pStep->attributeVector();
 		vcrEventReport.getAttributeVector(attrubutes, weight);
-		pStep->addAttributeVector(attrubutes);
 
 		// 0426, 先固定返回1(OK)
 		((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);

--
Gitblit v1.9.3