ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消任务提示优化

Browse Source
This commit is contained in:
hehaibing-1996
2025-03-21 10:44:27 +08:00
parent aaf9352414
commit f7554c688c
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WCS.BLL/Manager/AGVManager.cs
View File

@ -421,13 +421,21 @@ namespace WCS.BLL.Manager
}; };
var response = ApiHelp.GetDataFromHttp<AGVResponseModel>(url, body, "POST", true); var response = ApiHelp.GetDataFromHttp<AGVResponseModel>(url, body, "POST", true);
if (response.code == "0" && response.message == "成功") if (response != null && response.code == "0" && response.message == "成功")
{ {
//取消会统一在后台线程更新 //取消会统一在后台线程更新
//agvTask.TaskStatus = Model.ApiModel.AGV.TaskStatusEnum.取消完成; //agvTask.TaskStatus = Model.ApiModel.AGV.TaskStatusEnum.取消完成;
//DbHelp.db.Updateable(agvTask).ExecuteCommand(); //DbHelp.db.Updateable(agvTask).ExecuteCommand();
} }
else if (response == null)
{
response = new AGVResponseModel()
{
code = "-1",
message = $"请求超时，请检查网络连接",
};
}
return response; return response;
} }
} }

4
WCS.WebApi/Controllers/AgvTaskController.cs
View File

@ -168,7 +168,7 @@ namespace WCS.WebApi.Controllers
#region 调用RCS进行取消任务 #region 调用RCS进行取消任务
var response = AGVManager.CancelTask(agvTask); var response = AGVManager.CancelTask(agvTask);
if (response.code == "0" && response.message == "成功") if (response != null && response.code == "0" && response.message == "成功")
{ {
return new ResponseCommon() return new ResponseCommon()
{ {
@ -181,7 +181,7 @@ namespace WCS.WebApi.Controllers
return new ResponseCommon() return new ResponseCommon()
{ {
Code = 201, Code = 201,
Message = response.message, Message = response?.message,
}; };
} }
#endregion #endregion