From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 218 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
index 1ec5d11..a52341f 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulatorDlg.cpp
@@ -91,6 +91,7 @@
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_DELETE_PPID, &CEAPSimulatorDlg::OnBnClickedButtonDeletePpid)
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)
@@ -103,6 +104,13 @@
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_DVID, &CEAPSimulatorDlg::OnBnClickedButtonQueryAllDvid)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_ALL_CEID, &CEAPSimulatorDlg::OnBnClickedButtonQueryAllCeid)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_ALL_ECID, &CEAPSimulatorDlg::OnBnClickedButtonQueryAllEcid)
+ ON_BN_CLICKED(IDC_BUTTON_SET_ECID, &CEAPSimulatorDlg::OnBnClickedButtonSetEcid)
+ ON_BN_CLICKED(IDC_BUTTON_QUERY_CURRENT_RECIPE, &CEAPSimulatorDlg::OnBnClickedButtonQueryCurrentRecipe)
+ ON_BN_CLICKED(IDC_BUTTON_PP_REQUEST, &CEAPSimulatorDlg::OnBnClickedButtonPpRequest)
END_MESSAGE_MAP()
@@ -239,12 +247,111 @@
}
// S1F3 Query ProcessState (SVID=700) button
{
- CRect rc(14, 152, 14 + 140, 152 + 14); // dialog units, new row
+ 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);
+ }
+ }
+ // S1F21 QueryAllDVID
+ {
+ CRect rc(14 + 140 + 5, 152, 14 + 140 + 5 + 140, 152 + 14);
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S1F21_QueryAllDVID"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_QUERY_ALL_DVID, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
+ // S2F13 QueryAllECID
+ {
+ CRect rc(14 + 2 * (140 + 5), 192, 14 + 2 * (140 + 5) + 140, 192 + 14);
+ MapDialogRect(&rc);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S2F13_QueryAllECID"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rc.left, rc.top, rc.Width(), rc.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_QUERY_ALL_ECID, AfxGetInstanceHandle(), nullptr);
+ if (hBtn != nullptr) {
+ ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ }
+ // ECID edit + send (S2F15)
+ {
+ CRect rcEcid(14, 192, 14 + 60, 192 + 14);
+ CRect rcEcv(14 + 60 + 4, 192, 14 + 60 + 4 + 60, 192 + 14);
+ MapDialogRect(&rcEcid);
+ MapDialogRect(&rcEcv);
+ HWND hEditEcid = ::CreateWindow(_T("EDIT"), _T(""), WS_CHILD | WS_VISIBLE | WS_BORDER,
+ rcEcid.left, rcEcid.top, rcEcid.Width(), rcEcid.Height(),
+ m_hWnd, (HMENU)IDC_EDIT_ECID, AfxGetInstanceHandle(), nullptr);
+ HWND hEditEcv = ::CreateWindow(_T("EDIT"), _T(""), WS_CHILD | WS_VISIBLE | WS_BORDER,
+ rcEcv.left, rcEcv.top, rcEcv.Width(), rcEcv.Height(),
+ m_hWnd, (HMENU)IDC_EDIT_ECV, AfxGetInstanceHandle(), nullptr);
+ if (hEditEcid) ::SendMessage(hEditEcid, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ if (hEditEcv) ::SendMessage(hEditEcv, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+
+ CRect rcBtn(14 + 60 + 4 + 60 + 4, 192, 14 + 60 + 4 + 60 + 4 + 90, 192 + 14);
+ MapDialogRect(&rcBtn);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S2F15_SetECID"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rcBtn.left, rcBtn.top, rcBtn.Width(), rcBtn.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_SET_ECID, AfxGetInstanceHandle(), nullptr);
+ if (hBtn) ::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ }
+ // S1F3 CurrentRecipe (EQ specific) combo + button
+ {
+ CRect rcCombo(14, 168, 14 + 120, 168 + 120); // dropdown height arbitrary
+ MapDialogRect(&rcCombo);
+ HWND hCombo = ::CreateWindow(_T("COMBOBOX"), _T(""),
+ WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL,
+ rcCombo.left, rcCombo.top, rcCombo.Width(), rcCombo.Height(),
+ m_hWnd, (HMENU)IDC_COMBO_EQ_FOR_RECIPE, AfxGetInstanceHandle(), nullptr);
+ if (hCombo != nullptr) {
+ ::SendMessage(hCombo, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
+ // 绠�鍗曞～鍏呰澶囧垪琛紙鍙寜闇�璋冩暣锛�
+ std::vector<CString> eqs = { _T("Bonder1"), _T("Bonder2"), _T("EFEM"), _T("VacuumBake"), _T("BakeCooling"), _T("Measurement") };
+ for (const auto& eq : eqs) {
+ ::SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)eq);
+ }
+ ::SendMessage(hCombo, CB_SETCURSEL, 0, 0);
+ }
+
+ CRect rcBtn(140, 168, 14 + 140 + 118, 168 + 14);
+ MapDialogRect(&rcBtn);
+ HWND hBtn = ::CreateWindow(_T("BUTTON"), _T("S1F3_CurrentRecipe"),
+ WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
+ rcBtn.left, rcBtn.top, rcBtn.Width(), rcBtn.Height(),
+ m_hWnd, (HMENU)IDC_BUTTON_QUERY_CURRENT_RECIPE, AfxGetInstanceHandle(), nullptr);
if (hBtn != nullptr) {
::SendMessage(hBtn, WM_SETFONT, (WPARAM)GetFont()->GetSafeHandle(), TRUE);
}
@@ -354,6 +461,12 @@
GetDlgItem(IDC_BUTTON_TRANSMIT_SPOOLED_DATA)->EnableWindow(enabled);
GetDlgItem(IDC_BUTTON_PURGE_SPOOLED_DATA)->EnableWindow(enabled);
GetDlgItem(IDC_BUTTON_QUERY_PPID_LIST)->EnableWindow(enabled);
+ if (GetDlgItem(IDC_BUTTON_DELETE_PPID) != nullptr) {
+ GetDlgItem(IDC_BUTTON_DELETE_PPID)->EnableWindow(enabled);
+ }
+ if (GetDlgItem(IDC_EDIT_DELETE_PPID) != nullptr) {
+ GetDlgItem(IDC_EDIT_DELETE_PPID)->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);
@@ -377,6 +490,12 @@
}
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);
}
}
@@ -490,6 +609,31 @@
theApp.m_model.m_pHsmsActive->hsmsQueryPPIDList();
}
+void CEAPSimulatorDlg::OnBnClickedButtonDeletePpid()
+{
+ CString strPPID;
+ GetDlgItemText(IDC_EDIT_DELETE_PPID, strPPID);
+ strPPID.Trim();
+ std::vector<std::string> ppids;
+ if (!strPPID.IsEmpty()) {
+ CString upper = strPPID;
+ upper.MakeUpper();
+ if (upper != _T("ALL")) {
+ int start = 0;
+ CString token = strPPID.Tokenize(_T(","), start);
+ while (!token.IsEmpty()) {
+ token.Trim();
+ if (!token.IsEmpty()) {
+ ppids.push_back(std::string((LPTSTR)(LPCTSTR)token));
+ }
+ token = strPPID.Tokenize(_T(","), start);
+ }
+ }
+ }
+ // L:0 if ppids empty -> delete all
+ theApp.m_model.m_pHsmsActive->hsmsDeletePPID(ppids);
+}
+
static int DATAID = 1;
void CEAPSimulatorDlg::OnBnClickedButtonProceedWithCarrier()
{
@@ -552,3 +696,76 @@
{
theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(SVID_CurrentProcessState);
}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryAllSvid()
+{
+ theApp.m_model.m_pHsmsActive->hsmsQueryAllStatusVariables();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryAllDvid()
+{
+ theApp.m_model.m_pHsmsActive->hsmsQueryAllDataVariables();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryAllCeid()
+{
+ theApp.m_model.m_pHsmsActive->hsmsQueryAllCollectionEvents();
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonQueryAllEcid()
+{
+ // empty list => all ECID
+ std::vector<unsigned short> ecids;
+ ecids.push_back(2000);
+ theApp.m_model.m_pHsmsActive->hsmsEquipmentConstantRequest(ecids);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonSetEcid()
+{
+ // simple demo: read ECID and value from edit boxes (reuse PPID edit)
+ CString sEcid, sVal;
+ GetDlgItemText(IDC_EDIT_ECID, sEcid);
+ GetDlgItemText(IDC_EDIT_ECV, sVal);
+ unsigned short id = static_cast<unsigned short>(_ttoi(sEcid));
+ std::string val = CT2A(sVal);
+ std::vector<std::pair<unsigned short, std::string>> kvs;
+ if (id != 0) {
+ kvs.push_back({ id, val });
+ theApp.m_model.m_pHsmsActive->hsmsEquipmentConstantSend(kvs);
+ }
+}
+void CEAPSimulatorDlg::OnBnClickedButtonQueryCurrentRecipe()
+{
+ CString sel;
+ CComboBox* pCombo = (CComboBox*)GetDlgItem(IDC_COMBO_EQ_FOR_RECIPE);
+ if (pCombo != nullptr) {
+ int idx = pCombo->GetCurSel();
+ if (idx != CB_ERR) {
+ pCombo->GetLBText(idx, sel);
+ }
+ }
+ unsigned int svid = SVID_EQPPExecName; // 榛樿鍏ㄥ眬
+ CString upper = sel;
+ upper.MakeUpper();
+ if (upper.Find(_T("BONDER1")) != -1) svid = SVID_Bonder1CurrentRecipe;
+ else if (upper.Find(_T("BONDER2")) != -1) svid = SVID_Bonder2CurrentRecipe;
+ else if (upper.Find(_T("VACUUMBAKE")) != -1) svid = SVID_VacuumBakeCurrentRecipe;
+ else if (upper.Find(_T("BAKECOOLING")) != -1) svid = SVID_BakeCoolingCurrentRecipe;
+ else if (upper.Find(_T("MEASUREMENT")) != -1) svid = SVID_MeasurementCurrentRecipe;
+ else if (upper.Find(_T("EFEM")) != -1) svid = SVID_EFEMCurrentRecipe;
+
+ theApp.m_model.m_pHsmsActive->hsmsSelectedEquipmentStatusRequest(svid);
+}
+
+void CEAPSimulatorDlg::OnBnClickedButtonPpRequest()
+{
+ CString strPPID;
+ GetDlgItemText(IDC_EDIT_PPID_REQ, strPPID);
+ strPPID.Trim();
+ std::string ppid = CT2A(strPPID);
+ if (ppid.empty()) {
+ AfxMessageBox(_T("璇疯緭鍏� PPID"));
+ return;
+ }
+ theApp.m_model.m_pHsmsActive->hsmsProcessProgramRequest(ppid.c_str());
+}
--
Gitblit v1.9.3