From 636a0e56fb705177dbd043a90e47c4b8be20f8fc Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 24 十二月 2024 10:01:30 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 67 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 12 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 6e357a9..e53c4fa 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"
@@ -18,15 +18,15 @@
{
}
- /// <summary>
- /// 灏哤MS浠诲姟鎺ㄩ�佽嚦WCS
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
- public WebResponseContent PushTasksToWCS()
- {
- return Service.PushTasksToWCS();
- }
+ ///// <summary>
+ ///// 灏哤MS浠诲姟鎺ㄩ�佽嚦WCS
+ ///// </summary>
+ ///// <returns></returns>
+ //[HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
+ //public WebResponseContent PushTasksToWCS()
+ //{
+ // return Service.PushTasksToWCS();
+ //}
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟
@@ -35,17 +35,20 @@
/// <param name="stationCode"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("RequestInboundTask"), AllowAnonymous]
- public WebResponseContent RequestInboundTask(string palletCode, string stationCode)
+ public WebResponseContent RequestInboundTask([FromBody] SaveModel saveModel)
{
- return Service.RequestInboundTask(palletCode, stationCode);
+ return Service.RequestInboundTask(saveModel);
}
+ //public WebResponseContent RequestInboundTask(string palletCode, string stationCode)
+ //{
+ // return Service.RequestInboundTask(palletCode, stationCode);
+ //}
/// <summary>
/// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
- /// <param name="palletType">鎵樼洏绫诲瀷</param>
/// <returns></returns>
[HttpPost, HttpGet, Route("AssignInboundTaskLocation"), AllowAnonymous]
public WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo)
@@ -63,5 +66,45 @@
{
return Service.InboundTaskCompleted(taskNum);
}
+
+ /// <summary>
+ /// 鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="orderDetailId"></param>
+ /// <param name="stockSelectViews"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GenerateOutboundTask"), AllowAnonymous]
+ public WebResponseContent GenerateOutboundTask(int orderDetailId, [FromBody]List<StockSelectViewDTO> stockSelectViews)
+ {
+ return Service.GenerateOutboundTask(orderDetailId, stockSelectViews);
+ }
+
+ /// <summary>
+ /// 鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
+ public WebResponseContent GenerateOutboundTask(int[] keys)
+ {
+ return Service.GenerateOutboundTask(keys);
+ }
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("OutboundTaskCompleted"), AllowAnonymous]
+ public WebResponseContent OutboundTaskCompleted(int taskNum)
+ {
+ return Service.OutboundTaskCompleted(taskNum);
+ }
+
+ [HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
+ public WebResponseContent IsRelocation(int taskNum, string locationCode)
+ {
+ return Service.IsRelocation(taskNum, locationCode);
+ }
}
}
--
Gitblit v1.9.3