From 3a5e73739050cda77ab84b40f25325052ee1589d Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 08 一月 2025 23:06:55 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 13 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 c82f6bb..ab095ee 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"
@@ -10,6 +10,9 @@
namespace WIDESEA_WMSServer.Controllers.TaskInfo
{
+ /// <summary>
+ /// 浠诲姟
+ /// </summary>
[Route("api/Task")]
[ApiController]
public class TaskController : ApiBaseController<ITaskService, Dt_Task>
@@ -18,15 +21,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,9 +38,15 @@
/// <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);
+ }
+
+ [HttpPost, HttpGet, Route("DeviceRequestInboundTask"), AllowAnonymous]
+ public WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode)
+ {
+ return Service.DeviceRequestInboundTask(stationCode, roadwayNo, palletCode);
}
/// <summary>
@@ -45,7 +54,6 @@
/// </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)
@@ -82,7 +90,7 @@
/// <param name="keys"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("GenerateOutboundTasks"), AllowAnonymous]
- public WebResponseContent GenerateOutboundTask(int[] keys)
+ public WebResponseContent GenerateOutboundTask([FromBody] int[] keys)
{
return Service.GenerateOutboundTask(keys);
}
@@ -97,5 +105,50 @@
{
return Service.OutboundTaskCompleted(taskNum);
}
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="locationCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
+ public WebResponseContent IsRelocation(int taskNum, string locationCode)
+ {
+ return Service.IsRelocation(taskNum, locationCode);
+ }
+
+ /// <summary>
+ /// 浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
+ public WebResponseContent TaskCompleted(int taskNum)
+ {
+ return Service.TaskCompleted(taskNum);
+ }
+
+ /// <summary>
+ /// 鍗曚釜浠诲姟鎺ㄩ�佽嚦WCS
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="agvDescription"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("PushTasksToWCSSingle"), AllowAnonymous]
+ public WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "")
+ {
+ return Service.PushTasksToWCSSingle(taskNum, agvDescription);
+ }
+ /// <summary>
+ /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ [HttpPost, Route("Outbound"), AllowAnonymous]
+ public WebResponseContent Outbound(int id)
+ {
+ return Service.Outbound(id);
+ }
}
}
--
Gitblit v1.9.3