From 92dee0d8070594c351008d02fd9645c9e5de80a7 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 11 四月 2025 09:01:04 +0800
Subject: [PATCH] 1.车间测试部分功能； 2.警告测试，修复未能显示警告到报表中的问题。
---
SourceCode/Bond/Servo/CWriteStep.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CWriteStep.cpp b/SourceCode/Bond/Servo/CWriteStep.cpp
index 15f6a2a..6d79f55 100644
--- a/SourceCode/Bond/Servo/CWriteStep.cpp
+++ b/SourceCode/Bond/Servo/CWriteStep.cpp
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include "CWriteStep.h"
#include "Common.h"
+#include "CEquipment.h"
namespace SERVO {
@@ -120,9 +121,8 @@
// 6.完成
nextStep();
if (0 == onComplete()) {
- if (m_listener.onEvent != nullptr) {
- m_listener.onEvent(this, STEP_EVENT_COMPLETE, nullptr);
- }
+ ASSERT(m_pEquipment);
+ m_pEquipment->onStepEvent(this, STEP_EVENT_COMPLETE);
}
}
}
@@ -139,11 +139,12 @@
void CWriteStep::getAttributeVector(CAttributeVector& attrubutes)
{
CStep::getAttributeVector(attrubutes);
+ std::string temp;
attrubutes.addAttribute(new CAttribute("Current Step",
std::to_string(m_nCurStep).c_str(), ""));
attrubutes.addAttribute(new CAttribute("Signal Dev",
- std::to_string(m_nWriteSignalDev).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nWriteSignalDev, temp)).c_str(), ""));
}
void CWriteStep::init()
--
Gitblit v1.9.3