Merge branch 'clh' into liuyang

mrDarker

2025-09-08 6dc80508b1c0f431007f8a8c947c152ec00c3d15

 SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp

@@ -13,6 +13,7 @@
#include "CEDEventReportDlg.h"
#include "CDefineReportsDlg.h"
#include "CLinkReportDlg.h"
#include "CPJsDlg.h"


#ifdef _DEBUG
@@ -92,6 +93,8 @@
   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()


@@ -283,6 +286,8 @@
   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()
@@ -387,7 +392,7 @@

void CEAPSimulatorDlg::OnBnClickedButtonQueryPjSpace()
{
   theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(SVID_PJobSpace);
   theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(SVID_PJobQueued);
}

void CEAPSimulatorDlg::OnBnClickedButtonQueryPpidList()
@@ -405,3 +410,15 @@
{
   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);
}