From f7554c688cc3ca2a975d055632764d26196c8f89 Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Fri, 21 Mar 2025 10:44:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BB=BB=E5=8A=A1=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WCS.BLL/Manager/AGVManager.cs | 10 +++++++++- WCS.WebApi/Controllers/AgvTaskController.cs | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/WCS.BLL/Manager/AGVManager.cs b/WCS.BLL/Manager/AGVManager.cs index 62198ec..287a135 100644 --- a/WCS.BLL/Manager/AGVManager.cs +++ b/WCS.BLL/Manager/AGVManager.cs @@ -421,13 +421,21 @@ namespace WCS.BLL.Manager }; var response = ApiHelp.GetDataFromHttp(url, body, "POST", true); - if (response.code == "0" && response.message == "成功") + if (response != null && response.code == "0" && response.message == "成功") { //取消会统一在后台线程更新 //agvTask.TaskStatus = Model.ApiModel.AGV.TaskStatusEnum.取消完成; //DbHelp.db.Updateable(agvTask).ExecuteCommand(); } + else if (response == null) + { + response = new AGVResponseModel() + { + code = "-1", + message = $"请求超时，请检查网络连接", + }; + } return response; } } diff --git a/WCS.WebApi/Controllers/AgvTaskController.cs b/WCS.WebApi/Controllers/AgvTaskController.cs index b613e24..88d72d6 100644 --- a/WCS.WebApi/Controllers/AgvTaskController.cs +++ b/WCS.WebApi/Controllers/AgvTaskController.cs @@ -168,7 +168,7 @@ namespace WCS.WebApi.Controllers #region 调用RCS进行取消任务 var response = AGVManager.CancelTask(agvTask); - if (response.code == "0" && response.message == "成功") + if (response != null && response.code == "0" && response.message == "成功") { return new ResponseCommon() { @@ -181,7 +181,7 @@ namespace WCS.WebApi.Controllers return new ResponseCommon() { Code = 201, - Message = response.message, + Message = response?.message, }; } #endregion