From 6e0341c6356cdb6e527fbd89d1dc876f4e47ce46 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 09 一月 2026 20:37:50 +0800
Subject: [PATCH] 1.Trace Data，ProcessData, SVData等上报
---
SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 218 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
index f95c6ee..93dd187 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
@@ -9,10 +9,13 @@
#include "afxdialogex.h"
#include "Common.h"
#include <regex>
+#include <string>
+#include <vector>
#include "CTerminalDisplayDlg.h"
#include "CEDEventReportDlg.h"
#include "CDefineReportsDlg.h"
#include "CLinkReportDlg.h"
+#include "CPJsDlg.h"
#ifdef _DEBUG
@@ -88,6 +91,20 @@
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_PROCEED_WITH_SLOTMAP, &CEAPSimulatorDlg::OnBnClickedButtonProceedWithSlotMap)
+ 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)
+ ON_BN_CLICKED(IDC_BUTTON_CTRL_OFFLINE, &CEAPSimulatorDlg::OnBnClickedButtonCtrlOffline)
+ ON_BN_CLICKED(IDC_BUTTON_CTRL_ONLINE_LOCAL, &CEAPSimulatorDlg::OnBnClickedButtonCtrlOnlineLocal)
+ ON_BN_CLICKED(IDC_BUTTON_CTRL_ONLINE_REMOTE, &CEAPSimulatorDlg::OnBnClickedButtonCtrlOnlineRemote)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_CONTROL_STATE, &CEAPSimulatorDlg::OnBnClickedButtonQueryControlState)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_PROCESS_STATE, &CEAPSimulatorDlg::OnBnClickedButtonQueryProcessState)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_ALL_SVID, &CEAPSimulatorDlg::OnBnClickedButtonQueryAllSvid)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_ALL_CEID, &CEAPSimulatorDlg::OnBnClickedButtonQueryAllCeid)
END_MESSAGE_MAP()
@@ -170,6 +187,94 @@
// 鎵ц姝ゆ搷浣�
SetIcon(m_hIcon, TRUE); // 璁剧疆澶у浘鏍�
SetIcon(m_hIcon, FALSE); // 璁剧疆灏忓浘鏍�
+
+ // Add missing test button at runtime (resource file is UTF-16, keep it unchanged)
+ {
+ CRect rc(126, 120, 126 + 108, 120 + 14); // dialog units
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S3F17_ProceedWithSlotMap"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_PROCEED_WITH_SLOTMAP, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
+ // ControlState test buttons at runtime (resource file is UTF-16, keep it unchanged)
+ {
+ const int y = 120;
+ const int w = 70;
+ const int h = 14;
+ const int gap = 3;
+
+ struct BtnDef { int x; int id; const TCHAR* text; };
+ BtnDef defs[] = {
+ { 238, IDC_BUTTON_CTRL_OFFLINE, _T("Ctrl Offline") },
+ { 238 + (w + gap), IDC_BUTTON_CTRL_ONLINE_LOCAL, _T("Ctrl Local") },
+ { 238 + 2 * (w + gap), IDC_BUTTON_CTRL_ONLINE_REMOTE, _T("Ctrl Remote") },
+ };
+
+ for (const auto& d : defs) {
+ CRect rc(d.x, y, d.x + w, y + h); // dialog units
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), d.text,
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)d.id, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
+ }
+ // S1F3 Query ControlState (SVID=600) button (runtime add to avoid touching UTF-16 RC)
+ {
+ // Place on its own row to avoid overlapping with control-mode buttons.
+ CRect rc(14, 136, 14 + 140, 136 + 14); // dialog units
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S1F3_QueryControlState"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_QUERY_CONTROL_STATE, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
+ // S1F3 Query ProcessState (SVID=700) button
+ {
+ CRect rc(14 + 140 + 5, 136, 14 + 140 + 5 + 140, 136 + 14); // dialog units, same row offset
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S1F3_QueryProcessState"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_QUERY_PROCESS_STATE, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
+ // S1F11 QueryAllSVID
+ {
+ CRect rc(14 + 140 + 5 + 140 + 5, 136, 14 + 140 + 5 + 140 + 5 + 140, 136 + 14); // dialog units, next row
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S1F11_QueryAllSVID"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_QUERY_ALL_SVID, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
+ // S1F23 QueryAllCEID
+ {
+ CRect rc(14, 152, 14 + 140, 152 + 14); // dialog units, next row
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S1F23_QueryAllCEID"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_QUERY_ALL_CEID, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
SetDlgItemText(IDC_EDIT_IP, _T("127.0.0.1"));
SetDlgItemInt(IDC_EDIT_PORT, 7000);
@@ -275,6 +380,36 @@
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);
+ if (GetDlgItem(IDC_BUTTON_PROCEED_WITH_SLOTMAP) != nullptr) {
+ GetDlgItem(IDC_BUTTON_PROCEED_WITH_SLOTMAP)->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);
+ if (GetDlgItem(IDC_BUTTON_CTRL_OFFLINE) != nullptr) {
+ GetDlgItem(IDC_BUTTON_CTRL_OFFLINE)->EnableWindow(enabled);
+ }
+ if (GetDlgItem(IDC_BUTTON_CTRL_ONLINE_LOCAL) != nullptr) {
+ GetDlgItem(IDC_BUTTON_CTRL_ONLINE_LOCAL)->EnableWindow(enabled);
+ }
+ if (GetDlgItem(IDC_BUTTON_CTRL_ONLINE_REMOTE) != nullptr) {
+ GetDlgItem(IDC_BUTTON_CTRL_ONLINE_REMOTE)->EnableWindow(enabled);
+ }
+ if (GetDlgItem(IDC_BUTTON_QUERY_CONTROL_STATE) != nullptr) {
+ GetDlgItem(IDC_BUTTON_QUERY_CONTROL_STATE)->EnableWindow(enabled);
+ }
+ if (GetDlgItem(IDC_BUTTON_QUERY_PROCESS_STATE) != nullptr) {
+ GetDlgItem(IDC_BUTTON_QUERY_PROCESS_STATE)->EnableWindow(enabled);
+ }
+ if (GetDlgItem(IDC_BUTTON_QUERY_ALL_SVID) != nullptr) {
+ GetDlgItem(IDC_BUTTON_QUERY_ALL_SVID)->EnableWindow(enabled);
+ }
+ if (GetDlgItem(IDC_BUTTON_QUERY_ALL_CEID) != nullptr) {
+ GetDlgItem(IDC_BUTTON_QUERY_ALL_CEID)->EnableWindow(enabled);
+ }
}
void CEAPSimulatorDlg::OnBnClickedButtonConnect()
@@ -372,7 +507,90 @@
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::OnBnClickedButtonProceedWithSlotMap()
+{
+ // Example payload (edit as needed)
+ std::vector<std::string> panelIds = {
+ "PANEL_01","PANEL_02","PANEL_03","PANEL_04",
+ "PANEL_05","PANEL_06","PANEL_07","PANEL_08"
+ };
+ std::vector<unsigned char> slotMap = {
+ 3,3,1,1,1,1,1,1 // 1=Empty, 3=Exist
+ };
+ theApp.m_model.m_pHsmsActive->hsmsProceedWithSlotMap(DATAID++, "CSX 52078", 1, "LOT_0001", panelIds, slotMap);
+}
+
+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"};
+ theApp.m_model.m_pHsmsActive->hsmsCreateControlJob("CJ5007", processJobIds);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonCtrlOffline()
+{
+ theApp.m_model.m_pHsmsActive->hsmsRequestOffline();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonCtrlOnlineLocal()
+{
+ theApp.m_model.m_pHsmsActive->hsmsRequestOnline();
+ theApp.m_model.m_pHsmsActive->hsmsGoLocal();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonCtrlOnlineRemote()
+{
+ theApp.m_model.m_pHsmsActive->hsmsRequestOnline();
+ theApp.m_model.m_pHsmsActive->hsmsGoRemote();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryControlState()
+{
+ theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(SVID_ControlState);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryProcessState()
+{
+ theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(SVID_CurrentProcessState);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryAllSvid()
+{
+ theApp.m_model.m_pHsmsActive->hsmsQueryAllStatusVariables();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryAllCeid()
+{
+ theApp.m_model.m_pHsmsActive->hsmsQueryAllCollectionEvents();
+}
--
Gitblit v1.9.3