Merge branch 'clh' into liuyang

mrDarker

2025-09-04 1c8098f74227411b5417c560eb7e6d7c0a61ae6e

 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());
@@ -951,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("当前有机台发生错误，不能启动，请确认解决问题后再尝试重新启动！");
@@ -958,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);
         }
      }
@@ -969,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);
         }
      }
@@ -979,7 +1021,9 @@
      }
   }
   else if (id == IDC_BUTTON_JOBS) {
      AfxMessageBox("IDC_BUTTON_CJOBS");
      CControlJobDlg dlg;
      dlg.SetControlJob(theApp.m_model.m_master.getControlJob());
      dlg.DoModal();
   }
   else if (id == IDC_BUTTON_PORT_CONFIG) {
      CPortConfigurationDlg dlg;
@@ -1096,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);
   }