From 4f39dcc195f28fa275fc2d065fbf1bf6a46c21b7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 00:41:18 +0800
Subject: [PATCH] 优化出入库逻辑
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 81 +++++++++++++---------------------------
1 files changed, 26 insertions(+), 55 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 927cfa0..cbee66c 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"
@@ -416,11 +416,11 @@
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
BaseDal.UpdateData(task);
- //var response = HttpHelpers.Post<WebResponseContent>(url + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "鏇存柊浠诲姟鐘舵��");
- //if (!response.Status)
- //{
- // _unitOfWorkManage.RollbackTran();
- //}
+ var response = HttpHelpers.Post<WebResponseContent>(url + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "鏇存柊浠诲姟鐘舵��");
+ if (!response.Status)
+ {
+ throw new Exception(response.Message);
+ }
_unitOfWorkManage.CommitTran();
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskStatus}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskStatus}銆�");
content = WebResponseContent.Instance.OK();
@@ -473,7 +473,7 @@
/// </summary>
/// <param name="taskNum">浠诲姟缂栧彿</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- public WebResponseContent StackCraneTaskCompleted(int taskNum)
+ public WebResponseContent StackCraneTaskCompleted(int taskNum, string Modifier = "")
{
WebResponseContent content = new WebResponseContent();
try
@@ -482,30 +482,21 @@
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
task.ModifyDate = DateTime.Now;
- task.Modifier = "WMS";
+ if (App.User.UserId > 0) Modifier = App.User.UserName;
+ task.Modifier = Modifier.IsNullOrEmpty() ? "WMS" : Modifier;
if (task.TaskType == (int)TaskTypeEnum.Outbound || task.TaskType == (int)TaskTypeEnum.PalletOutbound)
{
_unitOfWorkManage.BeginTran();
task.TaskStatus = (int)OutTaskStatusEnum.OutFinish;
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
- if (App.User.UserId > 0)
- {
- task.Modifier = "System";
- 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);
- }
- }
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
_unitOfWorkManage.CommitTran();
+ if (!Modifier.IsNullOrEmpty())
+ {
+ var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCompleted?taskNum=" + task.TaskNum, "", "浠诲姟瀹屾垚");
+ if (!response.Status) throw new Exception(response.Message);
+ }
return content.OK();
}
else if (task.TaskType == (int)TaskTypeEnum.Inbound || task.TaskType == (int)TaskTypeEnum.PalletInbound)
@@ -513,24 +504,14 @@
_unitOfWorkManage.BeginTran();
task.TaskStatus = (int)InTaskStatusEnum.InFinish;
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
- if (App.User.UserId > 0)
- {
- task.Modifier = "System";
- 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);
- }
- }
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
_unitOfWorkManage.CommitTran();
+ if (!Modifier.IsNullOrEmpty())
+ {
+ var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCompleted?taskNum=" + task.TaskNum, "", "浠诲姟瀹屾垚");
+ if (!response.Status) throw new Exception(response.Message);
+ }
return content.OK();
}
else if (task.TaskType == (int)TaskTypeEnum.Relocation)
@@ -538,24 +519,14 @@
_unitOfWorkManage.BeginTran();
task.TaskStatus = (int)RelocationTaskStatusEnum.RelocationFinish;
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ搴撳畬鎴�");
- if (App.User.UserId > 0)
- {
- task.Modifier = "System";
- 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);
- }
- }
BaseDal.DeleteData(task);
_task_HtyService.AddTaskHty(task);
_unitOfWorkManage.CommitTran();
+ if (!Modifier.IsNullOrEmpty())
+ {
+ var response = HttpHelpers.Post<WebResponseContent>(url + "TaskCompleted?taskNum=" + task.TaskNum, "", "浠诲姟瀹屾垚");
+ if (!response.Status) throw new Exception(response.Message);
+ }
return content.OK();
}
else
@@ -565,12 +536,12 @@
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
- content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆�,寮傚父淇℃伅锛歿ex.Message}");
+ //_unitOfWorkManage.RollbackTran();
+ content = WebResponseContent.Instance.OK($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆�,寮傚父淇℃伅锛歿ex.Message}");
}
finally
{
- WriteLog.GetLog("瀹屾垚浠诲姟").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "")}{Environment.NewLine}浠诲姟鍙凤細{taskNum}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "瀹屾垚浠诲姟");
+ WriteLog.GetLog("瀹屾垚浠诲姟").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "鍫嗗灈鏈�")}{Environment.NewLine}浠诲姟鍙凤細{taskNum}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "瀹屾垚浠诲姟");
}
return content;
}
--
Gitblit v1.9.3