From 944e8f3dea723404e21168e97116cca2c09c70cb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 27 一月 2026 15:26:29 +0800
Subject: [PATCH] 1.扫码事件上报，之前只上报OK一种情况，现在有事种状态。 2.Port事件上报关联PortID, 统一修改为VID：PortID，之前分开很多种。
---
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