From e43adae114f0edc580a20e84605c34ee0671c59d Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 04 一月 2025 09:36:40 +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 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 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 e4e773a..a42aa83 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>
/// 鐢宠鍏ュ簱浠诲姟
@@ -85,7 +88,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);
}
@@ -100,5 +103,40 @@
{
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);
+ }
}
}
--
Gitblit v1.9.3