From f82511343cf2c8ecf3981954e7eb92172d72a905 Mon Sep 17 00:00:00 2001
From: Huangxiaoqiang-03 <1247017146@qq.com>
Date: 星期二, 05 十一月 2024 17:26:08 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 139 ++++++++++++++++++++++++++++------------------
1 files changed, 85 insertions(+), 54 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..b7ab9a6 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"
@@ -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
{
@@ -591,6 +606,7 @@
}
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
{
--
Gitblit v1.9.3