From 0705cb6170a9ba77ba48bbb6dcebb9cf3d73cbea Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 14 十月 2025 02:12:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Completed.cs | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Completed.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Completed.cs"
index 88eaa6f..d24aae0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Completed.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Completed.cs"
@@ -136,13 +136,38 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+
+ /// <summary>
+ /// 鍥炶皟wcs鎵嬪姩鍙栨秷浠诲姟
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ public WebResponseContent FeedBackWCSTaskHandCancel(int taskNum)
+ {
+ try
+ {
+ Dt_ApiInfo? url = _apiInfoRepository.QueryData(x => x.ApiCode == APIEnum.FeedBackWCSTaskHandCancel.ToString()).First();
+ string? apiAddress = url.ApiAddress;
+ if (string.IsNullOrEmpty(apiAddress))
+ {
+ return WebResponseContent.Instance.Error($"{taskNum},鏈壘鍒癢CS浠诲姟瀹屾垚鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�");
+ }
+ string responseStr = HttpHelper.Get(apiAddress + "?taskNum=" + taskNum);
+ WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(responseStr) ?? WebResponseContent.Instance.Error("鏈壘鍒颁换鍔″畬鎴愯繑鍥炲��");
+ return content;
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
/// <summary>
/// 浠诲姟鍙栨秷
/// </summary>
/// <param name="taskNum"></param>
/// <param name="warehouseId"></param>
/// <returns></returns>
- public async Task<WebResponseContent> TaskHandCancel(int taskNum,int warehouseId)
+ public async Task<WebResponseContent> TaskHandCancel(int taskNum)
{
try
{
@@ -153,15 +178,15 @@
}
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
{
- return await Task.FromResult(InboundTaskCompleted(taskNum));
+ return await Task.FromResult(InboundTaskHandCancel(taskNum));
}
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
- return await Task.FromResult(OutboundTaskCompleted(taskNum));
+ return await Task.FromResult(OutboundTaskHandCancel(taskNum));
}
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
{
- return await Task.FromResult(RelocationTaskCompleted(task));
+ return await Task.FromResult(RelocationTaskHandCancel(task));
}
else
{
--
Gitblit v1.9.3