From cb25acc46bf41863e068b6f968f1592b7a14d1c9 Mon Sep 17 00:00:00 2001 From: helongyang <647556386@qq.com> Date: 星期六, 13 九月 2025 08:12:14 +0800 Subject: [PATCH] 功能更新优化 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Completed.cs | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 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 7c452cc..88eaa6f 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" @@ -55,7 +55,7 @@ /// 浠诲姟淇℃伅鎺ㄩ�佽嚦WCS /// </summary> /// <returns></returns> - public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "") + public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "", string agvtaskNum = "") { try { @@ -69,6 +69,7 @@ taskDTOs.ForEach(x => { x.AGVArea = agvDescription; + x.AGVTaskNum = agvtaskNum; }); string url = AppSettings.Get("WCS"); @@ -135,5 +136,42 @@ 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) + { + try + { + Dt_Task task = await Repository.QueryFirstAsync(x => x.TaskNum == taskNum); + if (task == null) + { + return await Task.FromResult(WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�")); + } + if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup) + { + return await Task.FromResult(InboundTaskCompleted(taskNum)); + } + else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) + { + return await Task.FromResult(OutboundTaskCompleted(taskNum)); + } + else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup) + { + return await Task.FromResult(RelocationTaskCompleted(task)); + } + else + { + return await Task.FromResult(WebResponseContent.Instance.Error($"鏈壘鍒拌绫诲瀷浠诲姟,浠诲姟绫诲瀷:{task.TaskType}")); + } + } + catch (Exception ex) + { + return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message)); + } + } } } -- Gitblit v1.9.3