From 90fa55064597236b9581304f232a607ffc7b730e Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期日, 12 四月 2026 10:50:26 +0800
Subject: [PATCH] fix(WCS): 解决OutboundTaskFlowService与TaskService的循环依赖
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
index 17d2a3f..c1494fa 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
@@ -29,7 +29,7 @@
/// </summary>
/// <param name="taskDto"></param>
/// <returns></returns>
- [HttpGet, HttpPost, Route("CreateTaskInbound"),AllowAnonymous]
+ [HttpGet, HttpPost, Route("CreateTaskInbound"), AllowAnonymous]
public async Task<WebResponseContent?> CreateTaskInboundAsync([FromBody] CreateTaskDto taskDto)
{
return await Service.CreateTaskInboundAsync(taskDto);
@@ -44,6 +44,17 @@
public async Task<WebResponseContent?> CreateTaskOutboundAsync([FromBody] CreateTaskDto taskDto)
{
return await Service.CreateTaskOutboundAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 鎵嬪姩鍒涘缓浠诲姟
+ /// </summary>
+ /// <param name="dto">鎵嬪姩鍒涘缓浠诲姟鍙傛暟</param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("CreateManualTask"), AllowAnonymous]
+ public async Task<WebResponseContent?> CreateManualTaskAsync([FromBody] CreateManualTaskDto dto)
+ {
+ return await Service.CreateManualTaskAsync(dto);
}
/// <summary>
@@ -102,7 +113,7 @@
}
/// <summary>
- /// 鍒涘缓绌烘墭鐩樺嚭搴撲换鍔�
+ /// 鍒涘缓绌烘墭鐩樺叆搴撲换鍔�
/// </summary>
/// <param name="taskDto"></param>
/// <returns></returns>
@@ -110,6 +121,17 @@
public async Task<WebResponseContent?> CreateTaskInboundTrayAsync([FromBody] CreateTaskDto taskDto)
{
return await Service.CreateTaskInboundTrayAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 绌烘墭鐩樺嚭搴撳畬鎴�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("OutboundFinishTaskTray"), AllowAnonymous]
+ public async Task<WebResponseContent?> OutboundFinishTaskTrayAsync([FromBody] CreateTaskDto taskDto)
+ {
+ return await Service.OutboundFinishTaskTrayAsync(taskDto);
}
/// <summary>
@@ -212,6 +234,7 @@
{
return await Service.ApplyInOutAsync(applyInOutDto);
}
+
/// <summary>
/// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV
/// </summary>
@@ -222,16 +245,7 @@
{
return await Service.OutTaskComplete(outTaskCompleteDto);
}
- ///// <summary>
- ///// 浠诲姟瀹屾垚
- ///// </summary>
- ///// <param name="wCSTask">璇锋眰鍙傛暟</param>
- ///// <returns></returns>
- //[HttpPost, Route("TaskCompleted"), AllowAnonymous]
- //public async Task<WebResponseContent?> TaskCompleted([FromBody] WCSTaskDTO wCSTask)
- //{
- // return await Service.TaskCompleted(wCSTask);
- //}
+
/// <summary>
/// 杈撻�佺嚎鐢宠杩涘叆
/// </summary>
@@ -264,6 +278,7 @@
{
return await Service.TaskCancelAsync(taskCancelDto);
}
+
#endregion 鏋佸嵎搴撲换鍔℃ā鍧�
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3