From 02d1df7b4fa1a0e686c112e7bf3c8e794ba42b82 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 10:04:26 +0800
Subject: [PATCH] 1. 添加设备配方绑定
---
SourceCode/Bond/Servo/CRobotTaskDlg.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRobotTaskDlg.cpp b/SourceCode/Bond/Servo/CRobotTaskDlg.cpp
index b354216..ab90d5b 100644
--- a/SourceCode/Bond/Servo/CRobotTaskDlg.cpp
+++ b/SourceCode/Bond/Servo/CRobotTaskDlg.cpp
@@ -58,7 +58,7 @@
CEquipment* pSrcEq = theApp.m_model.getMaster().getEquipment(pRobotTask->getSrcPosition());
CEquipment* pDstEq = theApp.m_model.getMaster().getEquipment(pRobotTask->getTarPosition());
- ROBOT_CMD_PARAM& param = pRobotTask->getRobotCmdParam();
+ ROBOT_CMD_PARAM& param = pRobotTask->getRobotCmdParam(ACTION_TRANSFER);
auto format_time = [](time_t t) -> CString {
if (t == 0) {
@@ -194,8 +194,10 @@
void CRobotTaskDlg::OnBnClickedAbortTask()
{
- if (m_pRobotTask) {
- m_pRobotTask->abort();
- AfxMessageBox(_T("浠诲姟宸插仠姝€��"));
+ int ret = AfxMessageBox(_T("纭瑕佺粓姝㈠綋鍓嶆惉閫佷换鍔″悧?闄ら潪鍙戠敓浜嗗紓甯革紝鍚﹀垯璇蜂笉瑕佹墜鍔ㄧ粓姝换鍔★紒"), MB_OKCANCEL | MB_ICONEXCLAMATION);
+ if (ret != IDOK) {
+ return;
}
+
+ theApp.m_model.getMaster().abortCurrentTask();
}
\ No newline at end of file
--
Gitblit v1.9.3