From 7096025175b6d100923dcd66c1face07d2e28555 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 24 七月 2025 15:20:21 +0800
Subject: [PATCH] 1. 完善获取配方列表的功能 2. 添加获取配方超时警告
---
SourceCode/Bond/Servo/PageRecipe.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageRecipe.cpp b/SourceCode/Bond/Servo/PageRecipe.cpp
index 2ffdfdb..6863f01 100644
--- a/SourceCode/Bond/Servo/PageRecipe.cpp
+++ b/SourceCode/Bond/Servo/PageRecipe.cpp
@@ -189,12 +189,12 @@
pListCtrl->InsertColumn(0, _T(""), LVCFMT_RIGHT, 0); // 闅愯棌鍒�
pListCtrl->InsertColumn(1, _T("No."), LVCFMT_LEFT, width[1]);
pListCtrl->InsertColumn(2, _T("PPID/Recipe ID"), LVCFMT_LEFT, width[2]);
- pListCtrl->InsertColumn(3, _T("EFEM"), LVCFMT_LEFT, width[3]);
+ pListCtrl->InsertColumn(3, _T("鐪熺┖鐑樼儰"), LVCFMT_LEFT, width[6]);
pListCtrl->InsertColumn(4, _T("Bonder1"), LVCFMT_LEFT, width[4]);
pListCtrl->InsertColumn(5, _T("Bonder2"), LVCFMT_LEFT, width[5]);
- pListCtrl->InsertColumn(6, _T("鐪熺┖鐑樼儰"), LVCFMT_LEFT, width[6]);
- pListCtrl->InsertColumn(7, _T("鍚庣儤鍐峰嵈"), LVCFMT_LEFT, width[7]);
- pListCtrl->InsertColumn(8, _T("绮惧害妫�鏌�"), LVCFMT_LEFT, width[8]);
+ pListCtrl->InsertColumn(6, _T("鍚庣儤鍐峰嵈"), LVCFMT_LEFT, width[7]);
+ pListCtrl->InsertColumn(7, _T("绮惧害妫�鏌�"), LVCFMT_LEFT, width[8]);
+ pListCtrl->InsertColumn(8, _T("EFEM"), LVCFMT_LEFT, width[3]);
pListCtrl->InsertColumn(9, _T("鍒涘缓鏃堕棿"), LVCFMT_LEFT, width[9]);
pListCtrl->InsertColumn(10, _T("鎻忚堪"), LVCFMT_LEFT, width[10]);
pListCtrl->SetColumnWidth(10, LVSCW_AUTOSIZE_USEHEADER);
@@ -441,9 +441,9 @@
// enable port
CMsgDlg msgDlg("璇风瓑寰�", "姝ｅ湪鑾峰彇閰嶆柟...");
pEq->masterRecipeListRequest(0, [&](int status) -> void {
- if (status == SS_FAILED) {
+ if (status == SS_FAILED || status == SS_TIMEOUT) {
CString strMsg;
- strMsg.Format(_T("鑾峰彇閰嶆柟澶辫触锛�"));
+ strMsg.Format(status == SS_FAILED ? _T("鑾峰彇閰嶆柟澶辫触锛�") : _T("鑾峰彇閰嶆柟瓒呮椂锛�"));
msgDlg.DelayClose(3000);
msgDlg.SetIcon(MSG_BOX_ERROR);
msgDlg.SetTitle(_T("鎿嶄綔澶辫触"));
--
Gitblit v1.9.3