From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险： S1F3：项目用 getSubItemU4(0) 取 SVID；日志里有 U2 的情况，可能导致解析失败后回退成 SV=0。 S6F11：项目发送 DATAID(U4) + CEID(U4)；日志样例里第一个字段是 U2，可能存在类型/字段定义不一致。
---
SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
index 430a1ae..e15ff68 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
@@ -13,6 +13,7 @@
#include "CEDEventReportDlg.h"
#include "CDefineReportsDlg.h"
#include "CLinkReportDlg.h"
+#include "CPJsDlg.h"
#ifdef _DEBUG
@@ -85,6 +86,15 @@
ON_BN_CLICKED(IDC_BUTTON_DEFINE_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonDefineReport)
ON_BN_CLICKED(IDC_BUTTON_LINE_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonLineReport)
ON_BN_CLICKED(IDC_BUTTON_CONFIGURE_SPOOLING, &CEAPSimulatorDlg::OnBnClickedButtonConfigureSpooling)
+ ON_BN_CLICKED(IDC_BUTTON_TRANSMIT_SPOOLED_DATA, &CEAPSimulatorDlg::OnBnClickedButtonTransmitSpooledData)
+ ON_BN_CLICKED(IDC_BUTTON_PURGE_SPOOLED_DATA, &CEAPSimulatorDlg::OnBnClickedButtonPurgeSpooledData)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_PPID_LIST, &CEAPSimulatorDlg::OnBnClickedButtonQueryPpidList)
+ ON_BN_CLICKED(IDC_BUTTON_PROCEED_WITH_CARRIER, &CEAPSimulatorDlg::OnBnClickedButtonProceedWithCarrier)
+ ON_BN_CLICKED(IDC_BUTTON_CARRIER_RELEASE, &CEAPSimulatorDlg::OnBnClickedButtonCarrierRelease)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_CJ_SPACE, &CEAPSimulatorDlg::OnBnClickedButtonQueryCjSpace)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_PJ_SPACE, &CEAPSimulatorDlg::OnBnClickedButtonQueryPjSpace)
+ ON_BN_CLICKED(IDC_BUTTON_CREATE_PJ, &CEAPSimulatorDlg::OnBnClickedButtonCreatePj)
+ ON_BN_CLICKED(IDC_BUTTON_CREATE_CJ, &CEAPSimulatorDlg::OnBnClickedButtonCreateCj)
END_MESSAGE_MAP()
@@ -269,6 +279,15 @@
GetDlgItem(IDC_BUTTON_DEFINE_REPORT)->EnableWindow(enabled);
GetDlgItem(IDC_BUTTON_LINE_REPORT)->EnableWindow(enabled);
GetDlgItem(IDC_BUTTON_CONFIGURE_SPOOLING)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_TRANSMIT_SPOOLED_DATA)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_PURGE_SPOOLED_DATA)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_QUERY_PPID_LIST)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_PROCEED_WITH_CARRIER)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_CARRIER_RELEASE)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_QUERY_CJ_SPACE)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_QUERY_PJ_SPACE)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_CREATE_PJ)->EnableWindow(enabled);
+ GetDlgItem(IDC_BUTTON_CREATE_CJ)->EnableWindow(enabled);
}
void CEAPSimulatorDlg::OnBnClickedButtonConnect()
@@ -355,3 +374,51 @@
spoolingConfig[5].insert(66);
theApp.m_model.m_pHsmsActive->hsmsConfigureSpooling(spoolingConfig);
}
+
+void CEAPSimulatorDlg::OnBnClickedButtonTransmitSpooledData()
+{
+ theApp.m_model.m_pHsmsActive->hsmsTransmitSpooledData();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonPurgeSpooledData()
+{
+ theApp.m_model.m_pHsmsActive->hsmsPurgeSpooledData();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryCjSpace()
+{
+ theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(SVID_CJobSpace);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryPjSpace()
+{
+ theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(SVID_PJobQueued);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryPpidList()
+{
+ theApp.m_model.m_pHsmsActive->hsmsQueryPPIDList();
+}
+
+static int DATAID = 1;
+void CEAPSimulatorDlg::OnBnClickedButtonProceedWithCarrier()
+{
+ theApp.m_model.m_pHsmsActive->hsmsProceedWithCarrier(DATAID++, "CSX 52078", 1);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonCarrierRelease()
+{
+ theApp.m_model.m_pHsmsActive->hsmsCarrierRelease(DATAID++, "CSX 52078", 2);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonCreatePj()
+{
+ CPJsDlg dlg;
+ dlg.DoModal();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonCreateCj()
+{
+ std::vector<std::string> processJobIds = {"PJ0001", "PJ0003"};
+ theApp.m_model.m_pHsmsActive->hsmsCreateControlJob("CJ5007", processJobIds);
+}
--
Gitblit v1.9.3