From f51582d5b4b498f28513f215f91828ef181df4a1 Mon Sep 17 00:00:00 2001
From: Huangxiaoqiang-03 <1247017146@qq.com>
Date: 星期三, 06 十一月 2024 17:16:09 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 145 +++++++++++++++++++++++++++++-------------------
1 files changed, 88 insertions(+), 57 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 af65e7b..565201e 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"
@@ -400,7 +400,7 @@
try
{
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�!");
return UpdateTaskStatusToNext(task);
}
catch (Exception ex)
@@ -521,17 +521,22 @@
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
- var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCompleted?taskNum="+task.TaskNum,"" , "浠诲姟瀹屾垚");
- if (response.Status)
+ if(App.User.UserId > 0)
{
- _unitOfWorkManage.CommitTran();
- return content.OK();
+ var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCompleted?taskNum=" + task.TaskNum, "", "浠诲姟瀹屾垚");
+ if (response.Status)
+ {
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
+ }
+ else
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content = WebResponseContent.Instance.Error(response.Message);
+ }
}
- else
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error(response.Message);
- }
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
}
else if (task.TaskType == (int)TaskTypeEnum.Inbound || task.TaskType == (int)TaskTypeEnum.PalletInbound)
{
@@ -542,17 +547,22 @@
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
- var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCompleted?taskNum="+ task.TaskNum,"", "浠诲姟瀹屾垚");
- if (response.Status)
+ if (App.User.UserId > 0)
{
- _unitOfWorkManage.CommitTran();
- return content.OK();
+ var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCompleted?taskNum=" + task.TaskNum, "", "浠诲姟瀹屾垚");
+ if (response.Status)
+ {
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
+ }
+ else
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content = WebResponseContent.Instance.Error(response.Message);
+ }
}
- else
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error(response.Message);
- }
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
}
else if (task.TaskType== (int)TaskTypeEnum.Relocation)
{
@@ -563,17 +573,22 @@
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ搴撳畬鎴�");
- var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCompleted?taskNum=" + task.TaskNum, "", "浠诲姟瀹屾垚");
- if (response.Status)
+ if (App.User.UserId > 0)
{
- _unitOfWorkManage.CommitTran();
- return content.OK();
+ var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCompleted?taskNum=" + task.TaskNum, "", "浠诲姟瀹屾垚");
+ if (response.Status)
+ {
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
+ }
+ else
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content = WebResponseContent.Instance.Error(response.Message);
+ }
}
- else
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error(response.Message);
- }
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
}
else
{
@@ -587,10 +602,11 @@
}
finally
{
- WriteLog.GetLog("瀹屾垚浠诲姟").Write(JsonConvert.SerializeObject(content), "瀹屾垚浠诲姟");
+ WriteLog.GetLog("瀹屾垚浠诲姟").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "瀹屾垚浠诲姟");
}
return content;
}
+
public WebResponseContent TaskCancel(int taskNum)
{
WebResponseContent content = new WebResponseContent();
@@ -608,17 +624,22 @@
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳彇娑�");
- var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "浠诲姟鍙栨秷");
- if (response.Status)
+ if (App.User.UserId > 0)
{
- _unitOfWorkManage.CommitTran();
- return content.OK();
+ var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "鍙栨秷浠诲姟");
+ if (response.Status)
+ {
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
+ }
+ else
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content = WebResponseContent.Instance.Error(response.Message);
+ }
}
- else
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error(response.Message);
- }
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
}
else if (task.TaskType == (int)TaskTypeEnum.Inbound || task.TaskType == (int)TaskTypeEnum.PalletInbound)
{
@@ -629,17 +650,22 @@
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳彇娑�");
- var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "浠诲姟鍙栨秷");
- if (response.Status)
+ if (App.User.UserId > 0)
{
- _unitOfWorkManage.CommitTran();
- return content.OK();
+ var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "鍙栨秷浠诲姟");
+ if (response.Status)
+ {
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
+ }
+ else
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content = WebResponseContent.Instance.Error(response.Message);
+ }
}
- else
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error(response.Message);
- }
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
}
else if (task.TaskType == (int)TaskTypeEnum.Relocation)
{
@@ -650,17 +676,22 @@
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ搴撳彇娑�");
- var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "浠诲姟鍙栨秷");
- if (response.Status)
+ if (App.User.UserId > 0)
{
- _unitOfWorkManage.CommitTran();
- return content.OK();
+ var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCancel?taskNum=" + task.TaskNum, "", "鍙栨秷浠诲姟");
+ if (response.Status)
+ {
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
+ }
+ else
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content = WebResponseContent.Instance.Error(response.Message);
+ }
}
- else
- {
- _unitOfWorkManage.RollbackTran();
- return content = WebResponseContent.Instance.Error(response.Message);
- }
+ _unitOfWorkManage.CommitTran();
+ return content.OK();
}
else
{
@@ -674,7 +705,7 @@
}
finally
{
- WriteLog.GetLog("鍙栨秷浠诲姟").Write(JsonConvert.SerializeObject(content), "鍙栨秷浠诲姟");
+ WriteLog.GetLog("鍙栨秷浠诲姟").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "鍙栨秷浠诲姟");
}
}
/// <summary>
--
Gitblit v1.9.3