From 85658479fada95845412913e4dfcb44d2c20d882 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期六, 31 五月 2025 00:24:34 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 103 insertions(+), 14 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
index eb3f432..fd839d3 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
@@ -1,5 +1,4 @@
锘縰sing WIDESEA_DTO;
-using static WIDESEA_DTO.RequestTaskDto;
namespace WIDESEA_WMSServer.Controllers;
@@ -29,21 +28,11 @@
/// <param name="saveModel">浠诲姟鍙�</param>
/// <returns>鎴愬姛鎴栧け璐�</returns>
[HttpGet, Route("CompleteTaskAsync"), AllowAnonymous]
+ //[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> CompleteTaskAsync(int taskNum)
{
return await _taskService.CompleteAsync(taskNum);
}
-
- /// <summary>
- /// 浠诲姟瀹屾垚
- /// </summary>
- /// <param name="saveModel">浠诲姟鍙�</param>
- /// <returns>鎴愬姛鎴栧け璐�</returns>
- //[HttpGet, Route("CompleteTaskByStation"), AllowAnonymous]
- //public async Task<WebResponseContent> CompleteTaskByStation(int taskNum)
- //{
- // return await _taskService.CompleteTaskByStation(taskNum);
- //}
/// <summary>
/// 妫�鏌ユ槸鍚﹂渶瑕佽繘琛岀Щ搴�
@@ -51,6 +40,7 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>浠诲姟</returns>
[HttpGet, Route("TransferCheckAsync"), AllowAnonymous]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> TransferCheckAsync(int taskNum)
{
return new WebResponseContent().OK(data: await _locationService.TransferCheckAsync(taskNum));
@@ -62,6 +52,7 @@
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
[HttpPost, AllowAnonymous, Route("RequestTaskAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> RequestTaskAsync([FromBody] RequestTaskDto input)
{
return await Service.RequestTaskAsync(input);
@@ -73,6 +64,7 @@
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
[HttpPost, AllowAnonymous, Route("RequestInTask")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> RequestInTask([FromBody] RequestTaskDto input)
{
return await Service.RequestInTask(input);
@@ -84,6 +76,7 @@
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
[HttpPost, AllowAnonymous, Route("RequestLocationTaskAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> UpdateExistingTask([FromBody] RequestTaskDto input)
{
return await Service.UpdateExistingTask(input);
@@ -95,20 +88,22 @@
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
[HttpPost, AllowAnonymous, Route("RequestTrayInTaskAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> RequestTrayInTaskAsync([FromBody] RequestTaskDto input)
{
return await Service.RequestTrayInTaskAsync(input);
}
/// <summary>
- /// 绌烘墭鐩�&婊＄洏鍑哄簱璇锋眰
+ /// 绌烘墭鐩樻弧鐩樺嚭搴撹姹�
/// </summary>
/// <param name="request">璇锋眰鏁版嵁</param>
/// <returns></returns>
[HttpPost, AllowAnonymous, Route("RequestTrayOutTaskAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> RequestTrayOutTaskAsync([FromBody] RequestOutTaskDto request)
{
- return await Service.RequestTrayOutTaskAsync(request.Position, request.Tag, request.AreaCdoe, request.ProductionLine);
+ return await Service.RequestTrayOutTaskAsync(request.Position, request.Tag, request.AreaCdoe, request.AreaCdoes, request.ProductionLine);
}
/// <summary>
@@ -117,6 +112,7 @@
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
[HttpPost, AllowAnonymous, Route("UpdateTaskStatus")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> UpdateTaskStatus([FromBody] UpdateStatusDto input)
{
return await Service.UpdateTaskStatus(input.TaskNum, input.TaskState);
@@ -128,6 +124,7 @@
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
[HttpGet, AllowAnonymous, Route("StockCheckingAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public WebResponseContent StockCheckingAsync()
{
return Service.StockCheckingAsync();
@@ -140,9 +137,23 @@
/// <param name="palletCode">鎵樼洏鍙�</param>
/// <returns></returns>
[HttpGet, AllowAnonymous, Route("CreateAndSendOutboundTask")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
public async Task<WebResponseContent> CreateAndSendOutboundTask(string locationCode, string palletCode)
{
return await Service.CreateAndSendOutboundTask(locationCode, palletCode);
+ }
+
+ /// <summary>
+ /// 闈欑疆NG鍏ュ簱
+ /// </summary>
+ /// <param name="locationCode">璐т綅鍙�</param>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestInBoundTaskNG")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
+ public async Task<WebResponseContent> RequestInBoundTaskNG([FromBody] RequestTaskDto input)
+ {
+ return await Service.CreateAndSendInboundTask(input.PalletCode, input.Position);
}
/// <summary>
@@ -151,8 +162,86 @@
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
[HttpPost, AllowAnonymous, Route("GetFROutTrayToCW")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 15 })] // 5绉掕妭娴�
public async Task<WebResponseContent> GetFROutTrayToCW([FromBody] RequestTaskDto input)
{
return await Service.GetFROutTrayToCW(input);
}
+
+ /// <summary>
+ /// DTS鐏鍑哄簱
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("EmergencyTask")]
+ public WebResponseContent EmergencyTask([FromBody] object input)
+ {
+ return Service.EmergencyTask(input);
+ }
+
+ /// <summary>
+ /// CW3 鍑哄簱鑷冲寘瑁�
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestOutTaskToBZAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
+ public async Task<WebResponseContent> RequestOutTaskToBZAsync([FromBody] RequestTaskDto input)
+ {
+ return await Service.RequestOutTaskToBZAsync(input);
+ }
+
+ /// <summary>
+ /// 鍒嗗绌烘鍏ュ簱鏀逛负鐩存帴鍑哄簱
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("SetEmptyOutbyInToOutAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
+ public async Task<WebResponseContent> SetEmptyOutbyInToOutAsync([FromBody] RequestTaskDto input)
+ {
+ return await Service.SetEmptyOutbyInToOutAsync(input);
+ }
+
+ /// <summary>
+ /// 鍒嗗绌烘鍑哄簱鏀逛负鐩存帴鍑哄簱
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("SetEmptyOutbyInToOutOneAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })] // 5绉掕妭娴�
+ public async Task<WebResponseContent> SetEmptyOutbyInToOutOneAsync([FromBody] RequestTaskDto input)
+ {
+ return await Service.SetEmptyOutbyInToOutOneAsync(input);
+ }
+ [HttpPost, AllowAnonymous, Route("GetTaskInfo")]
+ public WebResponseContent GetTaskInfo()
+ {
+ return Service.GetTaskInfo();
+ }
+ [HttpPost, AllowAnonymous, Route("GetStockInfo")]
+ public WebResponseContent GetStockInfo()
+ {
+ return Service.GetStockInfo();
+ }
+
+ /// <summary>
+ /// 鑾峰彇搴撳瓨淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("GetStockQuantity")]
+ public WebResponseContent GetStockQuantity()
+ {
+ return Service.GetStockQuantity();
+ }
+ [HttpPost, AllowAnonymous, Route("Getproductionvolume")]
+ public WebResponseContent Getproductionvolume()
+ {
+ return Service.Getproductionvolume();
+ }
+ [HttpPost, AllowAnonymous, Route("Getoutput")]
+ public WebResponseContent Getoutput()
+ {
+ return Service.Getoutput();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3