From 48d848201d91187c21d015ed54c0e5e81ceb2c66 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 15 五月 2025 08:45:35 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/Servo.vcxproj | 7
SourceCode/Bond/Servo/AlarmManager.cpp | 39 ++-
SourceCode/Bond/Servo/resource.h | 0
SourceCode/Bond/Servo/Servo.cpp | 36 ++--
SourceCode/Bond/Servo/SECSRuntimeManager.cpp | 112 ++++++++++++
SourceCode/Bond/Servo/ServoDlg.cpp | 25 +-
SourceCode/Bond/Servo/PageRecipe.cpp | 184 ++++++++++++++++++++
SourceCode/Bond/Servo/Servo.vcxproj.filters | 2
SourceCode/Bond/Servo/Servo.rc | 0
SourceCode/Bond/Servo/CMaster.cpp | 24 +
SourceCode/Bond/Servo/PageRecipe.h | 39 ++++
SourceCode/Bond/Servo/SECSRuntimeManager.h | 14 +
SourceCode/Bond/Servo/ServoDlg.h | 4
13 files changed, 430 insertions(+), 56 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmManager.cpp b/SourceCode/Bond/Servo/AlarmManager.cpp
index 0a4acf9..0ed76e5 100644
--- a/SourceCode/Bond/Servo/AlarmManager.cpp
+++ b/SourceCode/Bond/Servo/AlarmManager.cpp
@@ -781,23 +781,32 @@
std::string cell;
AlarmInfo alarm;
- std::getline(ss, cell, ',');
- std::getline(ss, alarm.strUnitID, ',');
- std::getline(ss, alarm.strUnitNo, ',');
- std::getline(ss, cell, ',');
- alarm.nAlarmLevel = std::stoi(cell);
- std::getline(ss, cell, ',');
- alarm.nAlarmCode = std::stoi(cell);
- std::getline(ss, cell, ',');
- alarm.nAlarmID = std::stoi(cell);
- std::getline(ss, alarm.strAlarmText, ',');
- std::getline(ss, alarm.strDescription, ',');
+ try {
+ // 逐字段解析并验证
+ if (!std::getline(ss, cell, ',')) throw std::runtime_error("Missing field: No");
+ if (!std::getline(ss, alarm.strUnitID, ',')) throw std::runtime_error("Missing field: UnitID");
+ if (!std::getline(ss, alarm.strUnitNo, ',')) throw std::runtime_error("Missing field: UnitNo");
+ if (!std::getline(ss, cell, ',')) throw std::runtime_error("Missing field: AlarmLevel");
+ alarm.nAlarmLevel = std::stoi(cell);
+ if (!std::getline(ss, cell, ',')) throw std::runtime_error("Missing field: AlarmCode");
+ alarm.nAlarmCode = std::stoi(cell);
+ if (!std::getline(ss, cell, ',')) throw std::runtime_error("Missing field: AlarmID");
+ alarm.nAlarmID = std::stoi(cell);
+ if (!std::getline(ss, alarm.strAlarmText, ',')) throw std::runtime_error("Missing field: AlarmText");
+ if (!std::getline(ss, alarm.strDescription, ',')) throw std::runtime_error("Missing field: Description");
- if (m_mapAlarm.find(alarm.nAlarmID) == m_mapAlarm.end()) {
- m_mapAlarm[alarm.nAlarmID] = alarm;
+ // 检查是否重复
+ if (m_mapAlarm.find(alarm.nAlarmID) == m_mapAlarm.end()) {
+ m_mapAlarm[alarm.nAlarmID] = alarm;
+ }
+ else {
+ std::cerr << "Duplicate AlarmID: " << alarm.nAlarmID << std::endl;
+ }
}
- else {
- std::cerr << "Duplicate AlarmID: " << alarm.nAlarmID << std::endl;
+ catch (const std::exception& e) {
+ // 捕获并记录解析错误
+ std::cerr << "Error parsing line: " << line << " - " << e.what() << std::endl;
+ continue;
}
}
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 927cecf..be5aab9 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -602,15 +602,23 @@
int CMaster::readCache()
{
- CFile file;
- if (!file.Open(m_strFilepath.c_str(), CFile::modeRead)) {
- return -1;
- }
+ try {
+ CFile file;
+ if (!file.Open(m_strFilepath.c_str(), CFile::modeRead)) {
+ return -1;
+ }
- CArchive ar(&file, CArchive::load);
- serialize(ar);
- ar.Close();
- file.Close();
+ CArchive ar(&file, CArchive::load);
+ serialize(ar);
+ ar.Close();
+ file.Close();
+ }
+ catch (CFileException* e) {
+ TCHAR szErr[512];
+ e->GetErrorMessage(szErr, 512);
+ AfxMessageBox(szErr);
+ e->Delete();
+ }
return 0;
}
diff --git a/SourceCode/Bond/Servo/PageRecipe.cpp b/SourceCode/Bond/Servo/PageRecipe.cpp
new file mode 100644
index 0000000..85f369a
--- /dev/null
+++ b/SourceCode/Bond/Servo/PageRecipe.cpp
@@ -0,0 +1,184 @@
+锘�// CPageRecipe.cpp: 瀹炵幇鏂囦欢
+//
+
+#include "stdafx.h"
+#include "Servo.h"
+#include "afxdialogex.h"
+#include "PageRecipe.h"
+#include "SECSRuntimeManager.h"
+
+
+// CPageRecipe 瀵硅瘽妗�
+
+IMPLEMENT_DYNAMIC(CPageRecipe, CDialogEx)
+
+CPageRecipe::CPageRecipe(CWnd* pParent /*=nullptr*/)
+ : CDialogEx(IDD_PAGE_RECIPE, pParent)
+{
+
+}
+
+CPageRecipe::~CPageRecipe()
+{
+}
+
+void CPageRecipe::FillDataToListCtrl(const std::vector<std::string>& vecData) {
+ CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_PPID);
+ if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+ return;
+ }
+
+ // 娓呯┖褰撳墠CListCtrl涓殑鎵�鏈夐」
+ pListCtrl->DeleteAllItems();
+
+ // 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
+ for (int i = 0; i < static_cast<int>(vecData.size()); ++i) {
+ // 鎻掑叆琛�
+ pListCtrl->InsertItem(i, _T(""));
+
+ // 璁剧疆 Recipe No锛堢1鍒楋級
+ CString strRecipeNo;
+ strRecipeNo.Format(_T("%d"), i);
+ pListCtrl->SetItemText(i, 1, strRecipeNo);
+
+ // 璁剧疆 PPID锛堢2鍒楋級
+ CString strPPID = CA2T(vecData[i].c_str());
+ if (strPPID.CompareNoCase(_T("NULL")) == 0) {
+ strPPID.Empty();
+ }
+ pListCtrl->SetItemText(i, 2, strPPID);
+ }
+
+ // 鑾峰彇鍒楁暟
+ int nColCount = pListCtrl->GetHeaderCtrl()->GetItemCount();
+ pListCtrl->SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
+}
+
+void CPageRecipe::DoDataExchange(CDataExchange* pDX)
+{
+ CDialogEx::DoDataExchange(pDX);
+ DDX_Control(pDX, IDC_LIST_PPID, m_listPPID);
+ DDX_Control(pDX, IDC_EDIT_PPID, m_editPPID);
+}
+
+
+BEGIN_MESSAGE_MAP(CPageRecipe, CDialogEx)
+ ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CPageRecipe::OnBnClickedButtonSearch)
+ ON_BN_CLICKED(IDC_BUTTON_MODIFY, &CPageRecipe::OnBnClickedButtonModify)
+ ON_BN_CLICKED(IDC_BUTTON_DELETE, &CPageRecipe::OnBnClickedButtonDelete)
+ ON_BN_CLICKED(IDC_BUTTON_DELETE_ALL, &CPageRecipe::OnBnClickedButtonDeleteAll)
+ ON_BN_CLICKED(IDC_BUTTON_SAVE, &CPageRecipe::OnBnClickedButtonSave)
+ ON_BN_CLICKED(IDC_BUTTON_REFRESH, &CPageRecipe::OnBnClickedButtonRefresh)
+ ON_NOTIFY(LVN_ITEMCHANGED, IDC_LIST_PPID, &CPageRecipe::OnLvnItemChangedListPPID)
+END_MESSAGE_MAP()
+
+
+// CPageRecipe 娑堟伅澶勭悊绋嬪簭
+
+BOOL CPageRecipe::OnInitDialog()
+{
+ CDialogEx::OnInitDialog();
+
+ // TODO: 鍦ㄦ娣诲姞棰濆鐨勫垵濮嬪寲
+ CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_PPID);
+ DWORD dwStyle = pListCtrl->GetExtendedStyle();
+ dwStyle |= LVS_EX_FULLROWSELECT;
+ dwStyle |= LVS_EX_GRIDLINES;
+ pListCtrl->SetExtendedStyle(dwStyle);
+
+ HIMAGELIST imageList = ImageList_Create(24, 24, ILC_COLOR24, 1, 1);
+ ListView_SetImageList(pListCtrl->GetSafeHwnd(), imageList, LVSIL_SMALL);
+ pListCtrl->InsertColumn(0, _T(""), LVCFMT_RIGHT, 0);
+ pListCtrl->InsertColumn(1, _T("Recipe No"), LVCFMT_LEFT, 100);
+ pListCtrl->InsertColumn(2, _T("PPID"), LVCFMT_LEFT, 100);
+ pListCtrl->SetColumnWidth(2, LVSCW_AUTOSIZE_USEHEADER);
+
+ // 鑾峰彇鎵�鏈夋暟鎹�
+ auto vecData = SECSRuntimeManager::getInstance().getAllPPID();
+ FillDataToListCtrl(vecData);
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
+}
+
+void CPageRecipe::OnBnClickedButtonSearch()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ CString strInput;
+ m_editPPID.GetWindowText(strInput);
+
+ int nCount = m_listPPID.GetItemCount();
+ for (int i = 0; i < nCount; ++i) {
+ CString strItemText = m_listPPID.GetItemText(i, 2); // 绗�2鍒椾负PPID
+ if (strItemText == strInput) {
+ m_listPPID.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
+ m_listPPID.EnsureVisible(i, FALSE);
+ break;
+ }
+ }
+}
+
+void CPageRecipe::OnBnClickedButtonModify()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ POSITION pos = m_listPPID.GetFirstSelectedItemPosition();
+ if (!pos) return;
+
+ int nSel = m_listPPID.GetNextSelectedItem(pos);
+
+ CString strNewPPID;
+ m_editPPID.GetWindowText(strNewPPID);
+ m_listPPID.SetItemText(nSel, 2, strNewPPID);
+}
+
+void CPageRecipe::OnBnClickedButtonDelete()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ POSITION pos = m_listPPID.GetFirstSelectedItemPosition();
+ if (!pos) return;
+
+ int nSel = m_listPPID.GetNextSelectedItem(pos);
+ m_listPPID.SetItemText(nSel, 2, _T(""));
+}
+
+void CPageRecipe::OnBnClickedButtonDeleteAll()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ int nCount = m_listPPID.GetItemCount();
+ for (int i = 0; i < nCount; ++i) {
+ m_listPPID.SetItemText(i, 2, _T(""));
+ }
+}
+
+void CPageRecipe::OnBnClickedButtonSave()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ std::vector<std::string> vecPPID;
+ int nCount = m_listPPID.GetItemCount();
+ for (int i = 0; i < nCount; ++i) {
+ CString str = m_listPPID.GetItemText(i, 2);
+ vecPPID.emplace_back(CT2A(str));
+ }
+ SECSRuntimeManager::getInstance().setAllPPID(vecPPID);
+}
+
+void CPageRecipe::OnBnClickedButtonRefresh()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ auto vecData = SECSRuntimeManager::getInstance().getAllPPID();
+ FillDataToListCtrl(vecData);
+}
+
+void CPageRecipe::OnLvnItemChangedListPPID(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+ *pResult = 0;
+
+ if ((pNMLV->uChanged & LVIF_STATE) &&
+ (pNMLV->uNewState & LVIS_SELECTED)) {
+
+ int nItem = pNMLV->iItem;
+ CString strPPID = m_listPPID.GetItemText(nItem, 2);
+ m_editPPID.SetWindowText(strPPID);
+ }
+}
\ No newline at end of file
diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h
new file mode 100644
index 0000000..69f4cab
--- /dev/null
+++ b/SourceCode/Bond/Servo/PageRecipe.h
@@ -0,0 +1,39 @@
+锘�#pragma once
+#include "afxdialogex.h"
+//#include "ListCtrlEx.h"
+
+
+// CPageRecipe 瀵硅瘽妗�
+
+class CPageRecipe : public CDialogEx
+{
+ DECLARE_DYNAMIC(CPageRecipe)
+
+public:
+ CPageRecipe(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
+ virtual ~CPageRecipe();
+
+private:
+ void FillDataToListCtrl(const std::vector<std::string>& vecData);
+
+// 瀵硅瘽妗嗘暟鎹�
+#ifdef AFX_DESIGN_TIME
+ enum { IDD = IDD_PAGE_RECIPE };
+#endif
+
+protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
+ virtual BOOL OnInitDialog();
+ afx_msg void OnBnClickedButtonSearch();
+ afx_msg void OnBnClickedButtonModify();
+ afx_msg void OnBnClickedButtonDelete();
+ afx_msg void OnBnClickedButtonDeleteAll();
+ afx_msg void OnBnClickedButtonSave();
+ afx_msg void OnBnClickedButtonRefresh();
+ afx_msg void OnLvnItemChangedListPPID(NMHDR* pNMHDR, LRESULT* pResult);
+ DECLARE_MESSAGE_MAP()
+
+private:
+ CListCtrl m_listPPID;
+ CEdit m_editPPID;
+};
diff --git a/SourceCode/Bond/Servo/SECSRuntimeManager.cpp b/SourceCode/Bond/Servo/SECSRuntimeManager.cpp
index 3f8d08a..ccbcf77 100644
--- a/SourceCode/Bond/Servo/SECSRuntimeManager.cpp
+++ b/SourceCode/Bond/Servo/SECSRuntimeManager.cpp
@@ -1401,8 +1401,8 @@
// 创建 EqpPPID 表
std::string createTableSQL =
"CREATE TABLE IF NOT EXISTS EqpPPID ("
- "BitNo INTEGER PRIMARY KEY AUTOINCREMENT, "
- "PPID INTEGER NULL);";
+ "RecipeNo INTEGER PRIMARY KEY, "
+ "PPID TEXT NULL);";
if (!m_pDB->executeQuery(createTableSQL)) {
throw std::runtime_error("Failed to create EqpPPID table.");
}
@@ -1412,7 +1412,7 @@
if (nCount == 0) {
// 插入初始数据（512 行）
for (int nBitNo = 0; nBitNo < 512; ++nBitNo) {
- std::string insertSQL = "INSERT INTO EqpPPID (BitNo) VALUES (" + std::to_string(nBitNo) + ");";
+ std::string insertSQL = "INSERT INTO EqpPPID (RecipeNo) VALUES (" + std::to_string(nBitNo) + ");";
if (!m_pDB->executeQuery(insertSQL)) {
throw std::runtime_error("Failed to insert data into EqpPPID table.");
}
@@ -1420,6 +1420,112 @@
}
}
+std::vector<std::string> SECSRuntimeManager::getAllPPID() {
+ std::lock_guard<std::mutex> lock(m_mutex);
+ if (m_pDB == nullptr) {
+ return {};
+ }
+
+ std::string querySQL = "SELECT PPID FROM EqpPPID;";
+ auto rows = m_pDB->fetchResults(querySQL);
+
+ std::vector<std::string> vecResult;
+ for (const auto& row : rows) {
+ vecResult.push_back(row[0]);
+ }
+ return vecResult;
+}
+
+void SECSRuntimeManager::setAllPPID(const std::vector<std::string>& vecPPIDList) {
+ std::lock_guard<std::mutex> lock(m_mutex);
+ if (m_pDB == nullptr) return;
+
+ // 开启事务
+ m_pDB->executeQuery("BEGIN TRANSACTION;");
+
+ for (size_t i = 0; i < vecPPIDList.size(); ++i) {
+ std::string safePPID = vecPPIDList[i];
+ size_t pos = 0;
+ while ((pos = safePPID.find('\'', pos)) != std::string::npos) {
+ safePPID.insert(pos, 1, '\'');
+ pos += 2;
+ }
+ std::string sql = "UPDATE EqpPPID SET PPID = '" + safePPID + "' WHERE RecipeNo = " + std::to_string(i) + ";";
+ m_pDB->executeQuery(sql);
+ }
+
+ // 提交事务
+ m_pDB->executeQuery("COMMIT;");
+}
+
+bool SECSRuntimeManager::updatePPIDForRecipe(int nRecipeNo, const std::string& strPPID) {
+ std::lock_guard<std::mutex> lock(m_mutex);
+ if (m_pDB == nullptr) {
+ return false;
+ }
+
+ // 转义单引号，防止 SQL 注入
+ std::string safePPID = strPPID;
+ size_t pos = 0;
+ while ((pos = safePPID.find('\'', pos)) != std::string::npos) {
+ safePPID.insert(pos, 1, '\'');
+ pos += 2;
+ }
+
+ std::string updateSQL = "UPDATE EqpPPID SET PPID = '" + safePPID + "' WHERE RecipeNo = " + std::to_string(nRecipeNo) + ";";
+ return m_pDB->executeQuery(updateSQL);
+}
+
+std::string SECSRuntimeManager::getPPIDForRecipe(int nRecipeNo) {
+ std::lock_guard<std::mutex> lock(m_mutex);
+ if (m_pDB == nullptr) {
+ return "";
+ }
+
+ std::string querySQL = "SELECT PPID FROM EqpPPID WHERE RecipeNo = " + std::to_string(nRecipeNo) + ";";
+ std::vector<std::vector<std::string>> results = m_pDB->fetchResults(querySQL);
+ if (!results.empty() && !results[0].empty()) {
+ return results[0][0];
+ }
+
+ return "";
+}
+
+int SECSRuntimeManager::getRecipeForPPID(std::string strPPID) {
+ std::lock_guard<std::mutex> lock(m_mutex);
+ if (m_pDB == nullptr) {
+ return -1;
+ }
+
+ std::string querySQL = "SELECT RecipeNo FROM EqpPPID WHERE PPID = '" + strPPID + "';";
+ std::vector<std::vector<std::string>> results = m_pDB->fetchResults(querySQL);
+ if (!results.empty() && !results[0].empty()) {
+ return std::stoi(results[0][0]);
+ }
+
+ return -1;
+}
+
+bool SECSRuntimeManager::deletePPIDForRecipe(int nRecipeNo) {
+ std::lock_guard<std::mutex> lock(m_mutex);
+ if (m_pDB == nullptr) {
+ return false;
+ }
+
+ std::string deleteSQL = "UPDATE EqpPPID SET PPID = NULL WHERE RecipeNo = " + std::to_string(nRecipeNo) + ";";
+ return m_pDB->executeQuery(deleteSQL);
+}
+
+bool SECSRuntimeManager::deletePPIDForAllRecipes() {
+ std::lock_guard<std::mutex> lock(m_mutex);
+ if (m_pDB == nullptr) {
+ return false;
+ }
+
+ std::string deleteSQL = "UPDATE EqpPPID SET PPID = NULL WHERE RecipeNo BETWEEN 0 AND 511;";
+ return m_pDB->executeQuery(deleteSQL);
+}
+
// 初始化 RPTID 表
void SECSRuntimeManager::initRPTIDTable() {
std::lock_guard<std::mutex> lock(m_mutex);
diff --git a/SourceCode/Bond/Servo/SECSRuntimeManager.h b/SourceCode/Bond/Servo/SECSRuntimeManager.h
index 44473fe..a3bc39d 100644
--- a/SourceCode/Bond/Servo/SECSRuntimeManager.h
+++ b/SourceCode/Bond/Servo/SECSRuntimeManager.h
@@ -389,6 +389,20 @@
*/
void initPPIDTable();
+ std::vector<std::string> getAllPPID();
+
+ void setAllPPID(const std::vector<std::string>& vecPPIDList);
+
+ bool updatePPIDForRecipe(int nRecipeNo, const std::string& strPPID);
+
+ std::string getPPIDForRecipe(int nRecipeNo);
+
+ int getRecipeForPPID(std::string strPPID);
+
+ bool deletePPIDForRecipe(int nRecipeNo);
+
+ bool deletePPIDForAllRecipes();
+
/**
* 鍒濆鍖� RPTID 琛�
*/
diff --git a/SourceCode/Bond/Servo/Servo.cpp b/SourceCode/Bond/Servo/Servo.cpp
index 5866c64..e6eb33a 100644
--- a/SourceCode/Bond/Servo/Servo.cpp
+++ b/SourceCode/Bond/Servo/Servo.cpp
@@ -130,35 +130,35 @@
// 初始化生产履历管理器
- try {
- if (!ProductionLogManager::getInstance().initProductionTable()) {
- AfxMessageBox("初始化生产履历管理器失败！");
- return FALSE;
- }
- }
- catch (const std::exception& ex) {
- CString errorMsg;
- errorMsg.Format(_T("初始化生产履历管理器失败：%s"), CString(ex.what()));
- AfxMessageBox(errorMsg, MB_ICONERROR);
- return FALSE;
- }
-
-
- // 初始化SECS运行设置管理库
//try {
- // if (!SECSRuntimeManager::getInstance().initRuntimeSetting()) {
- // AfxMessageBox("初始化SECS运行设置失败！");
+ // if (!ProductionLogManager::getInstance().initProductionTable()) {
+ // AfxMessageBox("初始化生产履历管理器失败！");
// return FALSE;
// }
//}
//catch (const std::exception& ex) {
// CString errorMsg;
- // errorMsg.Format(_T("初始化SECS运行设置失败：%s"), CString(ex.what()));
+ // errorMsg.Format(_T("初始化生产履历管理器失败：%s"), CString(ex.what()));
// AfxMessageBox(errorMsg, MB_ICONERROR);
// return FALSE;
//}
+ // 初始化SECS运行设置管理库
+ try {
+ if (!SECSRuntimeManager::getInstance().initRuntimeSetting()) {
+ AfxMessageBox("初始化SECS运行设置失败！");
+ return FALSE;
+ }
+ }
+ catch (const std::exception& ex) {
+ CString errorMsg;
+ errorMsg.Format(_T("初始化SECS运行设置失败：%s"), CString(ex.what()));
+ AfxMessageBox(errorMsg, MB_ICONERROR);
+ return FALSE;
+ }
+
+
CServoDlg dlg;
m_pMainWnd = &dlg;
INT_PTR nResponse = dlg.DoModal();
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index 0233b72..5de3f29 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
Binary files differ
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index d7a30ed..79cdf9c 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -133,7 +133,10 @@
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PostBuildEvent>
- <Command>copy "$(TargetDir)$(ProjectName).exe" "\\DESKTOP-IODBVIQ\Servo\Debug\$(ProjectName).exe"</Command>
+ <Command>if exist "\\DESKTOP-IODBVIQ\Servo\Debug\" (
+ xcopy /Y /D "$(OutDir)*.exe" "\\DESKTOP-IODBVIQ\Servo\Debug\"
+ xcopy /Y /D "$(OutDir)*.pdb" "\\DESKTOP-IODBVIQ\Servo\Debug\"
+)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -195,6 +198,7 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="PageRecipe.h" />
<ClInclude Include="CDoubleGlass.h" />
<ClInclude Include="CProcessData.h" />
<ClInclude Include="PageAlarm.h" />
@@ -291,6 +295,7 @@
<ClInclude Include="VerticalLine.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="PageRecipe.cpp" />
<ClCompile Include="CDoubleGlass.cpp" />
<ClCompile Include="CProcessData.cpp" />
<ClCompile Include="PageAlarm.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 958f369..2730a47 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -100,6 +100,7 @@
<ClCompile Include="CArm.cpp" />
<ClCompile Include="CArmTray.cpp" />
<ClCompile Include="ProductionLogManager.cpp" />
+ <ClCompile Include="PageRecipe.cpp" />
<ClCompile Include="CDoubleGlass.cpp" />
<ClCompile Include="CProcessData.cpp" />
</ItemGroup>
@@ -200,6 +201,7 @@
<ClInclude Include="CArm.h" />
<ClInclude Include="CArmTray.h" />
<ClInclude Include="ProductionLogManager.h" />
+ <ClInclude Include="PageRecipe.h" />
<ClInclude Include="CDoubleGlass.h" />
<ClInclude Include="CProcessData.h" />
</ItemGroup>
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 3bf1852..af02e73 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -60,7 +60,6 @@
// CServoDlg 对话框
-
CServoDlg::CServoDlg(CWnd* pParent /*=NULL*/)
: CDialogEx(IDD_SERVO_DIALOG, pParent)
{
@@ -76,13 +75,12 @@
m_pPageGraph2 = nullptr;
m_pPageAlarm = nullptr;
m_pPageLog = nullptr;
+ m_pPageRecipe = nullptr;
}
void CServoDlg::DoDataExchange(CDataExchange* pDX)
{
CDialogEx::DoDataExchange(pDX);
- DDX_Control(pDX, IDC_BUTTON_LOG, m_btnLog);
- DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
}
BEGIN_MESSAGE_MAP(CServoDlg, CDialogEx)
@@ -217,6 +215,8 @@
m_pPageGraph1->Create(IDD_PAGE_GRAPH1, this);
m_pPageGraph2 = new CPageGraph2();
m_pPageGraph2->Create(IDD_PAGE_GRAPH2, this);
+ m_pPageRecipe = new CPageRecipe();
+ m_pPageRecipe->Create(IDD_PAGE_RECIPE, this);
m_pPageAlarm = new CPageAlarm();
m_pPageAlarm->Create(IDD_DIALOG_ALARM, this);
m_pPageLog = new CPageLog();
@@ -227,6 +227,7 @@
m_pTab->SetItemMarginLeft(18);
m_pTab->AddItem("状态图", FALSE);
m_pTab->AddItem("连接图", TRUE);
+ m_pTab->AddItem("配方", TRUE);
m_pTab->AddItem("报警", TRUE);
m_pTab->AddItem("日志", TRUE);
m_pTab->SetCurSel(0);
@@ -526,6 +527,12 @@
m_pPageGraph2 = nullptr;
}
+ if (m_pPageRecipe != nullptr) {
+ m_pPageRecipe->DestroyWindow();
+ delete m_pPageRecipe;
+ m_pPageRecipe = nullptr;
+ }
+
if (m_pPageAlarm != nullptr) {
m_pPageAlarm->DestroyWindow();
delete m_pPageAlarm;
@@ -555,6 +562,7 @@
if (GetDlgItem(IDC_TAB1) == nullptr) return;
if (m_pPageGraph1 == nullptr) return;
if (m_pPageGraph2 == nullptr) return;
+ if (m_pPageRecipe == nullptr) return;
if (m_pPageAlarm == nullptr) return;
if (m_pPageLog == nullptr) return;
@@ -599,6 +607,7 @@
m_pPageGraph1->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height() - y);
m_pPageGraph2->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height() - y);
+ m_pPageRecipe->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height() - y);
m_pPageAlarm->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height() - y);
m_pPageLog->MoveWindow(x, y, rcClient.Width() - x, rcClient.Height() - y);
}
@@ -661,11 +670,9 @@
void CServoDlg::ShowChildPage(int index)
{
- ASSERT(0 <= index && index < 4);
- static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageAlarm, m_pPageLog };
- for (int i = 0; i < 4; i++) {
+ ASSERT(0 <= index && index < 5);
+ static CWnd* pPages[] = { m_pPageGraph1, m_pPageGraph2, m_pPageRecipe, m_pPageAlarm, m_pPageLog };
+ for (int i = 0; i < 5; i++) {
pPages[i]->ShowWindow(i == index ? SW_SHOW : SW_HIDE);
}
-}
-
-
+}
\ No newline at end of file
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 9ff5766..f78d8c5 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,6 +6,7 @@
#include "BlButton.h"
#include "PageLog.h"
#include "PageAlarm.h"
+#include "PageRecipe.h"
#include "TerminalDisplayDlg.h"
#include "CPanelMaster.h"
#include "CPanelEquipment.h"
@@ -36,6 +37,7 @@
CTerminalDisplayDlg* m_pTerminalDisplayDlg;
CPageGraph1* m_pPageGraph1;
CPageGraph2* m_pPageGraph2;
+ CPageRecipe* m_pPageRecipe;
CPageAlarm* m_pPageAlarm;
CPageLog* m_pPageLog;
@@ -54,8 +56,6 @@
HICON m_hIcon;
COLORREF m_crBkgnd;
HBRUSH m_hbrBkgnd;
- CBlButton m_btnLog;
- CBlButton m_btnAlarm;
CPanelMaster* m_pPanelMaster;
CPanelEquipment* m_pPanelEquipment;
CPanelAttributes* m_pPanelAttributes;
diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index b61d88b..250b0c7 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
Binary files differ
--
Gitblit v1.9.3