From e2655143a06ee42eec06a97b045f33a09fbb3a3f Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期二, 24 十二月 2024 17:40:18 +0800
Subject: [PATCH] 合并更改
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 bc14b7d..53d61a3 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
@@ -108,7 +108,7 @@
[HttpPost, AllowAnonymous, Route("RequestTrayOutTaskAsync")]
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>
@@ -146,6 +146,18 @@
}
/// <summary>
+ /// 闈欑疆NG鍏ュ簱
+ /// </summary>
+ /// <param name="locationCode">璐т綅鍙�</param>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestInBoundTaskNG")]
+ public async Task<WebResponseContent> RequestInBoundTaskNG([FromBody] RequestTaskDto input)
+ {
+ return await Service.CreateAndSendInboundTask(input.PalletCode, input.Position);
+ }
+
+ /// <summary>
/// 甯告俯琛ョ┖鎵樼洏鑷冲垎瀹�
/// </summary>
/// <param name="input">璇锋眰鏁版嵁</param>
@@ -161,9 +173,21 @@
/// </summary>
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
- [HttpPost, AllowAnonymous, Route("EmergencyTask")]
- public WebResponseContent EmergencyTask([FromBody] object input)
+ //[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")]
+ public async Task<WebResponseContent> RequestOutTaskToBZAsync([FromBody] RequestTaskDto input)
{
- return Service.EmergencyTask(input);
+ return await Service.RequestOutTaskToBZAsync(input);
}
}
\ No newline at end of file
--
Gitblit v1.9.3