From 5c558a6cea6040c49dfde7a7ab8f61c84d4b11fc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 06 六月 2025 16:34:15 +0800
Subject: [PATCH] 1.当前搬送任务的人工终止操作。

---
 SourceCode/Bond/Servo/CRobotTaskDlg.cpp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CRobotTaskDlg.cpp b/SourceCode/Bond/Servo/CRobotTaskDlg.cpp
index b354216..cb39af5 100644
--- a/SourceCode/Bond/Servo/CRobotTaskDlg.cpp
+++ b/SourceCode/Bond/Servo/CRobotTaskDlg.cpp
@@ -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