From ba998c70b77180668f295e65e07f3a62bf85e5ee Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期三, 17 十二月 2025 10:26:03 +0800
Subject: [PATCH] 最新
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 63937d9..bec6036 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -877,9 +877,8 @@
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
bool taskmsseg = BaseDal.DeleteData(task);
- //bool res = AddTaskHistory(task);
- //return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
- return null;
+ bool res = AddTaskHistory(task,"鎵嬪姩鍙栨秷");
+ return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
}
@@ -888,7 +887,7 @@
/// </summary>
/// <param name="task">浠诲姟瀵硅薄</param>
/// <returns>鏄惁娣诲姞鎴愬姛</returns>
- public static bool AddTaskHistory(Dt_Task task)
+ public static bool AddTaskHistory(Dt_Task task,string operateType)
{
try
{
@@ -905,7 +904,7 @@
}
// 娣诲姞鍘嗗彶璁板綍
- bool result = taskHtyService.AddTaskHistory(task, "鑷姩瀹屾垚");
+ bool result = taskHtyService.AddTaskHistory(task, operateType);
return result;
}
@@ -918,5 +917,21 @@
}
+ /// <summary>
+ /// 鎵嬪姩瀹屾垚鎺ュ彛
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+
+ public WebResponseContent WCSManualTaskCompleted(int taskNum)
+ {
+ //鏌ヨ浠诲姟淇℃伅
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ bool taskmsseg = BaseDal.DeleteData(task);
+ bool res = AddTaskHistory(task, "鎵嬪姩瀹屾垚");
+ return taskmsseg && res ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
+ }
}
}
--
Gitblit v1.9.3