From 2cd08ebfa438de28261f35f13527d23e8e469dee Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 05 九月 2025 10:45:43 +0800
Subject: [PATCH] 1. 修复获取的设备名称带符号导致创建表失败的问题
---
SourceCode/Bond/Servo/ServoDlg.cpp | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index 14422e2..573a713 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -26,6 +26,8 @@
#include "CPageVarialbles.h"
#include "CPageReport.h"
#include "CPageCollectionEvent.h"
+#include "CControlJobDlg.h"
+#include "InputDialog.h"
#ifdef _DEBUG
@@ -191,6 +193,7 @@
SERVO::MASTERSTATE state = theApp.m_model.getMaster().getState();
if (state == SERVO::MASTERSTATE::READY) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_BATCH)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_CT)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_NORMAL);
@@ -207,14 +210,17 @@
}
else if (state == SERVO::MASTERSTATE::MSERROR) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(TRUE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_BATCH)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_CT)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_ALARM);
m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
m_pMyStatusbar->setRunTimeText("启动失败.");
}
- else if (state == SERVO::MASTERSTATE::RUNNING || state == SERVO::MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER) {
+ else if (state == SERVO::MASTERSTATE::RUNNING || state == SERVO::MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER
+ || state == SERVO::MASTERSTATE::RUNNING_BATCH) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_BATCH)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_CT)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(TRUE);
m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_RUNNING);
@@ -237,7 +243,7 @@
pEq2 = theApp.m_model.getMaster().getEquipment(pTask->getTarPosition());
if (pEq1 != nullptr && pEq2 != nullptr) {
CString strText;
- if (theApp.m_model.getMaster().getContinuousTransferCount() > 0) {
+ if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER) {
strText.Format(_T("[%d]%s --> %s"),
theApp.m_model.getMaster().getContinuousTransferCount(),
pEq1->getName().c_str(), pEq2->getName().c_str());
@@ -351,7 +357,8 @@
HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
ASSERT(hMenu);
::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
-
+ m_pTopToolbar->GetBtn(IDC_BUTTON_JOBS)->EnableWindow(TRUE);
+
// Tab
m_pPageGraph1 = new CPageGraph1();
@@ -950,6 +957,28 @@
LRESULT CServoDlg::OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam)
{
int id = (int)lParam;
+ if (id == IDC_BUTTON_RUN || id == IDC_BUTTON_STOP) {
+ //CInputDialog inputDialog(_T("验证用户"), _T("请输入用户密码："));
+ //if (inputDialog.DoModal() != IDOK) {
+ // AfxMessageBox(_T("取消验证！"));
+ // return 0;
+ //}
+
+ //CString inputText = inputDialog.GetInputText();
+ //std::string strPass = UserManager::getInstance().getCurrentPass();
+ //if (inputText.Compare(strPass.c_str()) != 0) {
+ // AfxMessageBox(_T("密码错误！"));
+ // SystemLogManager::getInstance().log(SystemLogManager::LogType::Info, _T("验证时，密码错误！"));
+ // return 0;
+ //}
+
+ UserRole emRole = UserManager::getInstance().getCurrentUserRole();
+ if (emRole != UserRole::SuperAdmin) {
+ AfxMessageBox(_T("当前用户并非管理员！！！"));
+ return 1;
+ }
+ }
+
if (id == IDC_BUTTON_RUN) {
if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
AfxMessageBox("当前有机台发生错误，不能启动，请确认解决问题后再尝试重新启动！");
@@ -957,6 +986,19 @@
else {
if (theApp.m_model.getMaster().start() == 0) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_BATCH)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_CT)->EnableWindow(FALSE);
+ }
+ }
+ }
+ else if (id == IDC_BUTTON_RUN_BATCH) {
+ if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
+ AfxMessageBox("当前有机台发生错误，不能启动，请确认解决问题后再尝试重新启动！");
+ }
+ else {
+ if (theApp.m_model.getMaster().startBatch() == 0) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_BATCH)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_CT)->EnableWindow(FALSE);
}
}
@@ -968,6 +1010,7 @@
else {
if (theApp.m_model.getMaster().startContinuousTransfer() == 0) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_BATCH)->EnableWindow(FALSE);
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_CT)->EnableWindow(FALSE);
}
}
@@ -976,6 +1019,11 @@
if (theApp.m_model.getMaster().stop() == 0) {
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
}
+ }
+ else if (id == IDC_BUTTON_JOBS) {
+ CControlJobDlg dlg;
+ dlg.SetControlJob(theApp.m_model.m_master.getControlJob());
+ dlg.DoModal();
}
else if (id == IDC_BUTTON_PORT_CONFIG) {
CPortConfigurationDlg dlg;
@@ -1092,6 +1140,9 @@
else if (state == SERVO::MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER) {
strText.Format(_T("千传模式：%02d:%02d:%02d %s"), h, m, s, pszSuffix);
}
+ else if (state == SERVO::MASTERSTATE::RUNNING_BATCH) {
+ strText.Format(_T("JOB模式：%02d:%02d:%02d %s"), h, m, s, pszSuffix);
+ }
else {
strText.Format(_T("已运行：%02d:%02d:%02d %s"), h, m, s, pszSuffix);
}
--
Gitblit v1.9.3