From 07d83d2d583f96ddd7df98bbb202c98f3b073cd4 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 10 三月 2026 13:41:02 +0800
Subject: [PATCH] 添加前端任务状态枚举，以及历史任务页面
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 085080c..57bffd8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -181,11 +181,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{agvContent.data.returnInfo}");
}
}
@@ -207,11 +207,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK($"鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触{fOURBOTReturn.data}");
}
}
#endregion
@@ -231,11 +231,11 @@
{
//鐩存帴绉诲叆鍘嗗彶
BaseDal.DeleteAndMoveIntoHty(dt_Task, OperateTypeEnum.鑷姩瀹屾垚);
- content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
+ content.OK("鍙栨秷{dt_Task.WMSTaskNum}浠诲姟鎴愬姛", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{hIKROBOTReturn.data}");
}
}
@@ -270,7 +270,7 @@
if (logObject != null)
{
- _trackloginfoService.AddTrackLog(logObject, content, $"鍙栨秷{deviceName}浠诲姟", "", "");
+ _trackloginfoService.AddTrackLog(logObject, content, $"鍙栨秷{deviceName}浠诲姟,", "", "");
}
}
return content;
@@ -311,7 +311,6 @@
{
taskId = dt_Task.WMSTaskNum,
reportTime = DateTime.Now.ToString(),
- district = dt_Task.Roadway,//浠诲姟搴撳尯
priorityCode = updateTaskPriority.taskPriority,
};
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(UpdateGALAXISTaskGrade));
@@ -322,11 +321,11 @@
{
BaseDal.UpdateData(dt_Task);
- content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK($"淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{agvContent.data.returnInfo}");
+ content.Error($"{dt_Task.WMSTaskNum}浠诲姟澶辫触,閿欒淇℃伅锛歿agvContent.data.returnInfo}");
}
}
#endregion
@@ -346,11 +345,11 @@
if (fOURBOTReturn.returnCode == 0 && fOURBOTReturn.returnUserMsg == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{fOURBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭細{fOURBOTReturn.data}");
}
}
@@ -370,11 +369,11 @@
if (hIKROBOTReturn.code == "SUCCESS0" && hIKROBOTReturn.message == "鎴愬姛")
{
BaseDal.UpdateData(dt_Task);
- content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.OK("淇敼{dt_Task.WMSTaskNum}浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
else
{
- content.Error($"浠诲姟澶辫触{hIKROBOTReturn.data}");
+ content.Error($"浠诲姟{dt_Task.WMSTaskNum}澶辫触锛岄敊璇俊鎭瘂hIKROBOTReturn.data}");
}
}
#endregion
--
Gitblit v1.9.3