1.修改调度逻辑，增加G0，第二类型，增加TestFlag, 用于必要时输出指定日志；

LAPTOP-SNT8I5JK\Boounion

2025-08-27 38f2ff1e5bc6c4434875e03b8cadc8f3f4e39bf6

 SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp

@@ -11,6 +11,9 @@
#include <regex>
#include "CTerminalDisplayDlg.h"
#include "CEDEventReportDlg.h"
#include "CDefineReportsDlg.h"
#include "CLinkReportDlg.h"
#include "CPJsDlg.h"


#ifdef _DEBUG
@@ -79,6 +82,19 @@
   ON_BN_CLICKED(IDC_BUTTON_DATETIME_SYNC, &CEAPSimulatorDlg::OnBnClickedButtonDatetimeSync)
   ON_BN_CLICKED(IDC_BUTTON_TERMINAL_DISPLAY, &CEAPSimulatorDlg::OnBnClickedButtonTerminalDisplay)
   ON_BN_CLICKED(IDC_BUTTON_ED_EVENT_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonEdEventReport)
   ON_BN_CLICKED(IDC_BUTTON_ED_ALARM_REPORT, &CEAPSimulatorDlg::OnBnClickedButtonEdAlarmReport)
   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()


@@ -166,6 +182,7 @@
   SetDlgItemInt(IDC_EDIT_PORT, 7000);
   SetGroup2Enabled(FALSE);
   SetGroup1Enabled(TRUE);
   ::SetProp(GetDlgItem(IDC_BUTTON_ED_ALARM_REPORT)->m_hWnd, _T("Enable"), (void*)1);


   // log edit
@@ -258,6 +275,19 @@
   GetDlgItem(IDC_BUTTON_DATETIME_SYNC)->EnableWindow(enabled);
   GetDlgItem(IDC_BUTTON_TERMINAL_DISPLAY)->EnableWindow(enabled);   
   GetDlgItem(IDC_BUTTON_ED_EVENT_REPORT)->EnableWindow(enabled);
   GetDlgItem(IDC_BUTTON_ED_ALARM_REPORT)->EnableWindow(enabled);	
   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()
@@ -296,3 +326,99 @@
   CEDEventReportDlg dlg;
   dlg.DoModal();
}

void CEAPSimulatorDlg::OnBnClickedButtonEdAlarmReport()
{
   int enable = (int)::GetProp(GetDlgItem(IDC_BUTTON_ED_ALARM_REPORT)->m_hWnd, _T("Enable"));
   enable = enable == 0 ? 1 : 0;
   theApp.m_model.m_pHsmsActive->hsmsEDAlarmReport(enable == 1, 0);

   SetDlgItemText(IDC_BUTTON_ED_ALARM_REPORT, 
      enable == 1 ? _T("Disable Alarm Report") : _T("Enable Alarm Report"));
   ::SetProp(GetDlgItem(IDC_BUTTON_ED_ALARM_REPORT)->m_hWnd, _T("Enable"), (void*)enable);
}

void CEAPSimulatorDlg::OnBnClickedButtonDefineReport()
{
   CDefineReportsDlg dlg;
   dlg.DoModal();
}

void CEAPSimulatorDlg::OnBnClickedButtonLineReport()
{
   CLinkReportDlg dlg;
   dlg.DoModal();
}

void CEAPSimulatorDlg::OnBnClickedButtonConfigureSpooling()
{
   std::map<unsigned int, std::set<unsigned int>> spoolingConfig;

   // test clear all
   // theApp.m_model.m_pHsmsActive->hsmsConfigureSpooling(spoolingConfig);


   // test add s2[1,3,5];
   // spoolingConfig[2].insert(1);
   // spoolingConfig[2].insert(3);
   // spoolingConfig[2].insert(5);
   // spoolingConfig[3].insert(2);
   // spoolingConfig[3].insert(4);
   // spoolingConfig[3].insert(6);
   // theApp.m_model.m_pHsmsActive->hsmsConfigureSpooling(spoolingConfig);

   // test clear S2
   // spoolingConfig[2].clear();
   // theApp.m_model.m_pHsmsActive->hsmsConfigureSpooling(spoolingConfig);

   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);
}