From f590d457f629d4a7cf6a5e2f77f5454d807e90db Mon Sep 17 00:00:00 2001
From: zhangchengsong <zhangchengsong@hnkhzn.com>
Date: 星期三, 08 四月 2026 14:09:15 +0800
Subject: [PATCH] 添加手动删除任务按钮功能
---
项目代码/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 81776e1..ce778b0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -123,14 +123,17 @@
{
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
BaseDal.UpdateData(task);
-
string Result = WMSTaskStatusEnum.outsuccess.GetDescription();
if (task.Creater.Equals("WMS"))
{
//鍚屾缁欎笂娓稿弽棣堜换鍔″畬鎴�
Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
- if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success")
+ {
+ WriteLog.Write_Log("璋冨彇涓婃父杩斿洖澶辫触", "瀹屾垚鍫嗗灈鏈轰换鍔″け璐�", $"鏉＄爜:銆恵task.PalletCode}銆�,浠诲姟鍙凤細銆恵task.TaskNum}銆�");
+ return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ }
}
task.ModifyDate = DateTime.Now;
BaseDal.DeleteData(task);
@@ -147,7 +150,11 @@
{
Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
- if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success")
+ {
+ WriteLog.Write_Log("璋冨彇涓婃父杩斿洖澶辫触", "瀹屾垚鍫嗗灈鏈轰换鍔″け璐�", $"鏉＄爜:銆恵task.PalletCode}銆�,浠诲姟鍙凤細銆恵task.TaskNum}銆�");
+ return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ }
}
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
@@ -165,7 +172,11 @@
{
Dt_roadwayinfo roadwayinfo = _Dt_roadwayinfoService.GetRoadwayinfo(task.Roadway);
CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, roadwayinfo.WarehouseInvType, "");
- if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ if (command.status != "success")
+ {
+ WriteLog.Write_Log("璋冨彇涓婃父杩斿洖澶辫触", "瀹屾垚鍫嗗灈鏈轰换鍔″け璐�", $"鏉＄爜:銆恵task.PalletCode}銆�,浠诲姟鍙凤細銆恵task.TaskNum}銆�");
+ return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+ }
}
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
@@ -697,5 +708,32 @@
}
return content;
}
+ /// <summary>
+ /// 鎵嬪姩鍒犻櫎浠诲姟
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+
+ public WebResponseContent CreateDelete(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null)
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = App.User?.UserName;
+ task.Remark = "浜哄伐鎵嬪姩鍒犻櫎";
+ content.Status = BaseDal.DeleteData(task);
+ _task_HtyService.AddTaskHty(task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鎵嬪姩鍒犻櫎浠诲姟");
+ }
+ catch(Exception e)
+ {
+ WebResponseContent.Instance.Error(e.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3