From c38154df95a2c2fa1bd32c45f6be9c0d98e37440 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 67 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 8116ffe..f84c7dc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -42,7 +42,7 @@
{
return Service.RequestInboundTask(saveModel);
}
-
+
/// <summary>
/// 绌虹鍏ュ簱
/// </summary>
@@ -177,15 +177,56 @@
return Service.GenerateOutboundTasks(keys);
}
/// <summary>
- /// 鐢熸垚MESPP浠撳ぇ鍗峰嚭搴撲换鍔�
+ /// 鐢熸垚鎴愬搧鍑哄簱浠诲姟
/// </summary>
- /// <param name="keys"></param>
+ /// <param name="ProOutNo">鍑哄簱璁㈠崟鍙�</param>
+ /// <param name="StationCode">绔欏彴鍦板潃</param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("MESPPGenerateOutboundTasks"), AllowAnonymous]
- public WebResponseContent MESPPGenerateOutboundTasks([FromBody] int[] keys)
+ [HttpPost, HttpGet, Route("OutProductTask"), AllowAnonymous]
+ public async Task<WebResponseContent> OutProductTask([FromBody] int[] keys, string StationCode)
{
- return Service.MESPPGenerateOutboundTasks(keys);
+ return await Service.OutProductTask(keys, StationCode);
}
+ /// <summary>
+ /// 鎴愬搧浣欐枡閫�搴撳叆浠�
+ /// </summary>
+ /// <param name="barCode"></param>
+ /// <param name="startPoint"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("BackProductTask"), AllowAnonymous]
+ public WebResponseContent BackProductTask(string barCode, string startPoint)
+ {
+ return Service.BackProductTask(barCode, startPoint);
+ }
+ /// <summary>
+ /// 鎴愬搧绌烘鍥炲簱
+ /// </summary>
+ /// <param name="barCode"></param>
+ /// <param name="startPoint"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("EmptyBackTask"), AllowAnonymous]
+ public WebResponseContent EmptyBackTask(string barCode, string startPoint)
+ {
+ return Service.EmptyBackTask(barCode, startPoint);
+ }
+ /// <summary>
+ /// 鐢熸垚鎴愬搧鎻愬簱浠诲姟
+ /// </summary>
+ [HttpPost, HttpGet, Route("OutProRworkTask"), AllowAnonymous]
+ public async Task<WebResponseContent> OutProRworkTask([FromBody] int[] keys, string StationCode)
+ {
+ return await Service.OutProductTask(keys, StationCode);
+ }
+ ///// <summary>
+ ///// 鐢熸垚MESPP浠撳ぇ鍗峰嚭搴撲换鍔�
+ ///// </summary>
+ ///// <param name="keys"></param>
+ ///// <returns></returns>
+ //[HttpPost, HttpGet, Route("MESPPGenerateOutboundTasks"), AllowAnonymous]
+ //public WebResponseContent MESPPGenerateOutboundTasks([FromBody] int[] keys)
+ //{
+ // return Service.MESPPGenerateOutboundTasks(keys);
+ //}
/// <summary>
/// 鍑哄簱浠诲姟瀹屾垚
/// </summary>
@@ -215,9 +256,9 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
- public WebResponseContent TaskCompleted(int taskNum)
+ public async Task<WebResponseContent> TaskCompleted(int taskNum)
{
- return Service.TaskCompleted(taskNum);
+ return await Service.TaskCompleted(taskNum);
}
/// <summary>
@@ -323,5 +364,15 @@
{
return Service.AGVTasks(saveModel);
}
+ /// <summary>
+ /// 鎴愬搧鎸囧畾鍑哄簱
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ [HttpPost, Route("OutProductSelect"), AllowAnonymous]
+ public WebResponseContent OutProductSelect(int orderDetailId,[FromBody] List<ProStockViewDTO> proStockViews)
+ {
+ return Service.OutProductSelect(orderDetailId, proStockViews);
+ }
}
}
--
Gitblit v1.9.3