From 2ebccf831b56d30089924f2eefa2d790e2b8f3fc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 07 八月 2025 09:20:21 +0800
Subject: [PATCH] 1.为CVariable增加值的设置和获取 2.当发生Port状态改变为InUse时，此时也刚好获取到CarrierID，上报S6F11_CarrierID_Readed
---
SourceCode/Bond/Servo/ServoDlg.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index baeec28..84b1f21 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -22,6 +22,10 @@
#include "UserManager.h"
#include "SystemLogManager.h"
#include "PortConfigurationDlg.h"
+#include "CHMPropertyDlg.h"
+#include "CPageVarialbles.h"
+#include "CPageReport.h"
+#include "CPageCollectionEvent.h"
#ifdef _DEBUG
@@ -118,6 +122,8 @@
ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SETTINGS, &CServoDlg::OnUpdateMenuFileSettings)
ON_COMMAND(ID_MENU_FILE_SECSTEST, &CServoDlg::OnMenuFileSecsTest)
ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SECSTEST, &CServoDlg::OnUpdateMenuFileSecsTest)
+ ON_COMMAND(ID_MENU_PROJECT_VARIABLE_LIST, &CServoDlg::OnMenuProjectVarialbleList)
+ ON_UPDATE_COMMAND_UI(ID_MENU_PROJECT_VARIABLE_LIST, &CServoDlg::OnUpdateMenuProjectVarialbleList)
ON_COMMAND(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnMenuTestMessageSet)
ON_UPDATE_COMMAND_UI(ID_MENU_TEST_MESSAGE_SET, &CServoDlg::OnUpdateMenuTestMessageSet)
ON_COMMAND(ID_MENU_TEST_MESSAGE_CLEAR, &CServoDlg::OnMenuTestMessageClear)
@@ -183,6 +189,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_CT)->EnableWindow(TRUE);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
m_pMyStatusbar->setBackgroundColor(STATUSBAR_BK_NORMAL);
m_pMyStatusbar->setForegroundColor(RGB(0, 0, 0));
@@ -198,13 +205,15 @@
}
else if (state == SERVO::MASTERSTATE::MSERROR) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->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) {
+ else if (state == SERVO::MASTERSTATE::RUNNING || state == SERVO::MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->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);
m_pMyStatusbar->setForegroundColor(RGB(255, 255, 255));
@@ -241,6 +250,15 @@
}
}
}
+ else if (RX_CODE_LOADPORT_STATUS_CHANGED == code) {
+ SERVO::CLoadPort* pLoadPort = nullptr;
+ if (pAny->getPtrValue("ptr", (void*&)pLoadPort)) {
+ //CPortConfigurationDlg dlg;
+ //dlg.setCurSelPort(pLoadPort->getIndex());
+ //dlg.DoModal();
+ }
+ }
+
if (RX_CODE_PASSIVE_STATUS_CHANGED == code) {
int state = 0;
pAny->getIntValue("exCode", state);
@@ -548,6 +566,30 @@
}
void CServoDlg::OnUpdateMenuFileExit(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(TRUE);
+}
+
+void CServoDlg::OnMenuProjectVarialbleList()
+{
+ CHMPropertyDlg dlg(_T("Variable | Rreport | Collection Event"), 658, 788);
+
+ CPageCollectionEvent* pPage1 = new CPageCollectionEvent();
+ pPage1->Create(IDD_PAGE_COLLECTION_EVENT);
+ dlg.addPage(pPage1, "Event");
+
+ CPageReport* pPage2 = new CPageReport();
+ pPage2->Create(IDD_PAGE_REPORT);
+ dlg.addPage(pPage2, "Report");
+
+ CPageVarialbles* pPage3 = new CPageVarialbles();
+ pPage3->Create(IDD_PAGE_VARIABLE);
+ dlg.addPage(pPage3, "Variable");
+
+ dlg.DoModal();
+}
+
+void CServoDlg::OnUpdateMenuProjectVarialbleList(CCmdUI* pCmdUI)
{
pCmdUI->Enable(TRUE);
}
@@ -898,6 +940,18 @@
else {
if (theApp.m_model.getMaster().start() == 0) {
m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_CT)->EnableWindow(FALSE);
+ }
+ }
+ }
+ else if (id == IDC_BUTTON_RUN_CT) {
+ if (theApp.m_model.getMaster().getState() == SERVO::MASTERSTATE::MSERROR) {
+ AfxMessageBox("当前有机台发生错误，不能启动，请确认解决问题后再尝试重新启动！");
+ }
+ else {
+ if (theApp.m_model.getMaster().startContinuousTransfer() == 0) {
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN)->EnableWindow(FALSE);
+ m_pTopToolbar->GetBtn(IDC_BUTTON_RUN_CT)->EnableWindow(FALSE);
}
}
}
@@ -1018,6 +1072,9 @@
if (state == SERVO::MASTERSTATE::RUNNING) {
strText.Format(_T("正在运行：%02d:%02d:%02d %s"), h, m, s, pszSuffix);
}
+ else if (state == SERVO::MASTERSTATE::RUNNING_CONTINUOUS_TRANSFER) {
+ strText.Format(_T("千传模式：%02d:%02d:%02d %s"), h, m, s, pszSuffix);
+ }
else {
strText.Format(_T("已运行：%02d:%02d:%02d %s"), h, m, s, pszSuffix);
}
--
Gitblit v1.9.3