From b2aa706dfea78ad2e327fb5e414207af69d23d64 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 13 九月 2025 11:33:04 +0800
Subject: [PATCH] 1.对话框显示工艺参数,可复制到剪贴板; 2.修复几处因按回车或ESC键导致页面被关闭的问题; 3.修复解释警告数据文本失败的问题; 4.更新警告文本,显示警告详细信息; 5.完善警告描述内容 ;
---
SourceCode/Bond/BEQLibrary/Equipment.cpp | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BEQLibrary/Equipment.cpp b/SourceCode/Bond/BEQLibrary/Equipment.cpp
index 144c390..d956042 100644
--- a/SourceCode/Bond/BEQLibrary/Equipment.cpp
+++ b/SourceCode/Bond/BEQLibrary/Equipment.cpp
@@ -144,6 +144,11 @@
repData(m_pActiveClient, (CUnit*)pUnit, AS_MC_INFO_REP);
}
};
+ listener.onReqNotReady = [&](void* pUnit, int layer) -> void {
+ if (m_pActiveClient != nullptr) {
+ repNotReady(m_pActiveClient, (CUnit*)pUnit, layer, AS_SEND_EVENT_REP);
+ }
+ };
listener.onReqLoad = [&](void* pUnit, int layer) -> void {
if (m_pActiveClient != nullptr) {
repLoad(m_pActiveClient, (CUnit*)pUnit, layer, AS_SEND_EVENT_REP);
@@ -836,6 +841,27 @@
return 0;
}
+ void CEquipment::repNotReady(CAcceptClient* pClient, CUnit* pUnit, int layer, const char* pszReply)
+ {
+ ASSERT(pClient != nullptr);
+ CString strReply;
+ if (pUnit->getLayerCount() == 1) {
+ strReply.Format(_T("%s@%s=%s/%s=%s/%s=%s#"), pszReply,
+ PARAM_EQID, m_strName.c_str(),
+ PARAM_UNIT, pUnit->getName().c_str(),
+ PARAM_EVENT, EVENT_NOTREADY);
+ }
+ else {
+ strReply.Format(_T("%s@%s=%s/%s=%s%d/%s=%s#"), pszReply,
+ PARAM_EQID, m_strName.c_str(),
+ PARAM_UNIT, pUnit->getName().c_str(), layer,
+ PARAM_EVENT, EVENT_NOTREADY);
+ }
+
+
+ pClient->Send((LPTSTR)(LPCTSTR)strReply, strReply.GetLength());
+ }
+
void CEquipment::repLoad(CAcceptClient* pClient, CUnit* pUnit, int layer, const char* pszReply)
{
ASSERT(pClient != nullptr);
--
Gitblit v1.9.3