From 63e1ee997a5318e628b992f969bdac2fec6dbf14 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期四, 04 十二月 2025 14:39:00 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs"
index 6970330..d88993d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task/TaskController.cs"
@@ -1,4 +1,5 @@
-锘縰sing WIDESEA_DTO;
+锘縰sing Org.BouncyCastle.Asn1.Mozilla;
+using WIDESEA_DTO;
namespace WIDESEA_WMSServer.Controllers.Task;
@@ -23,7 +24,7 @@
/// </summary>
/// <param name="saveModel">浠诲姟鍙�</param>
/// <returns>鎴愬姛鎴栧け璐�</returns>
- [HttpGet, Route("CompleteTaskAsync"), AllowAnonymous]
+ [HttpGet,HttpPost, Route("CompleteTaskAsync"), AllowAnonymous]
public async Task<WebResponseContent> CompleteTaskAsync(int taskNum)
{
return await Service.CompleteAsync(taskNum);
@@ -34,7 +35,7 @@
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
- [HttpPost, Route("TaskCancel"), AllowAnonymous]
+ [HttpPost, HttpGet,Route("TaskCancel"), AllowAnonymous]
public WebResponseContent TaskCancel(int taskNum)
{
return Service.TaskCancel(taskNum);
@@ -44,7 +45,7 @@
/// 鑾峰彇浠诲姟淇℃伅
/// </summary>
/// <returns></returns>
- [HttpPost, Route("GetTaskInfo")]
+ [HttpPost, HttpGet, Route("GetTaskInfo")]
public WebResponseContent GetTaskInfo()
{
return Service.GetTaskInfo();
@@ -55,23 +56,18 @@
/// </summary>
/// <param name="input">璇锋眰鏁版嵁</param>
/// <returns></returns>
- [HttpPost, AllowAnonymous, Route("RequestInboundTaskAsync")]
+ [HttpPost, HttpGet, AllowAnonymous, Route("RequestInboundTaskAsync")]
[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })]
public async Task<WebResponseContent> RequestInboundTaskAsync([FromBody] RequestTaskDto input)
{
return await Service.RequestInboundTaskAsync(input);
}
- /// <summary>
- /// 鏇存柊璐т綅浠诲姟鐘舵�佸埌涓嬩竴涓妭鐐�
- /// </summary>
- /// <param name="input">璇锋眰鏁版嵁</param>
- /// <returns></returns>
- [HttpPost, AllowAnonymous, Route("RequestLocationAsync")]
+ [HttpPost, HttpGet, AllowAnonymous, Route("RequestRelocationTaskAsync")]
[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })]
- public async Task<WebResponseContent> RequestLocationAsync([FromBody] RequestTaskDto input)
+ public Task<WebResponseContent> RequestRelocationTaskAsync(string SourceAddress, string TargetAddress)
{
- return await Service.RequestLocationAsync(input);
+ return Service.RequestRelocationTaskAsync(SourceAddress, TargetAddress);
}
/// <summary>
@@ -79,7 +75,7 @@
/// </summary>
/// <param name="request">璇锋眰鏁版嵁</param>
/// <returns></returns>
- [HttpPost, AllowAnonymous, Route("RequestOutboundTaskAsync")]
+ [HttpPost, HttpGet, AllowAnonymous, Route("RequestOutboundTaskAsync")]
[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })]
public async Task<Dt_Task> RequestOutboundTaskAsync([FromBody] RequestTaskDto taskDto)
{
@@ -87,15 +83,29 @@
}
/// <summary>
- /// 绌烘墭鐩樻弧鐩樺嚭搴撹姹�
+ /// 鍑哄簱鑷崇紦瀛樺尯
/// </summary>
/// <param name="request">璇锋眰鏁版嵁</param>
/// <returns></returns>
- [HttpPost, AllowAnonymous, Route("OtherOutBoundTaskAsync")]
+ [HttpPost, HttpGet, AllowAnonymous, Route("OutBoundTaskAsync")]
[TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 2 })]
- public Task<WebResponseContent> OtherOutBoundTaskAsync(string palletCode)
+ public Task<WebResponseContent> OutBoundTaskAsync(string palletCode, string remark, int doubleTray)
{
- return Service.OtherOutBoundTaskAsync(palletCode);
+ return Service.OutBoundTaskAsync(palletCode, remark, doubleTray);
+ }
+
+ [HttpPost, HttpGet, AllowAnonymous, Route("OtherOutBoundTaskAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 2 })]
+ public Task<WebResponseContent> OtherOutBoundTaskAsync([FromBody] List<DtStockInfoDetail> details)
+ {
+ return Service.OtherOutBoundTaskAsync(details);
+ }
+
+ [HttpPost, HttpGet, AllowAnonymous, Route("HandAllocateOutBoundTaskAsync")]
+ [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 2 })]
+ public Task<WebResponseContent> HandAllocateOutBoundTaskAsync([FromBody] List<DtStockInfoDetail> details)
+ {
+ return Service.HandAllocateOutBoundTaskAsync(details);
}
/// <summary>
@@ -144,16 +154,28 @@
}
[HttpPost, AllowAnonymous, Route("AGVIsNeedRelocationAsync")]
- [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })]
public async Task<WebResponseContent> AGVIsNeedRelocationAsync([FromBody] RequestTaskDto taskDto)
{
return await Service.AGVIsNeedRelocationAsync(taskDto);
}
- [HttpPost, AllowAnonymous, Route("SendERPTaskCompletion")]
- [TypeFilter(typeof(ThrottleFilter), Arguments = new object[] { 5 })]
- public Task<WebResponseContent> ERPAllocate(string palletCode)
+ [HttpPost, AllowAnonymous, Route("UpdateStartLocationInfo")]
+ public async Task<WebResponseContent> UpdateStartLocationInfo([FromBody]Dt_Task task)
{
- return Service.ERPAllocate(palletCode);
+ return await Service.UpdateStartLocationInfo(task);
+ }
+ [HttpPost,HttpGet, AllowAnonymous, Route("RequestLocation")]
+ public Task<WebResponseContent> RequestLocation(string palletCode)
+ {
+ return Service.RequestLocation(palletCode);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨彁鍗囨満
+ /// </summary>
+ [HttpGet, HttpPost, AllowAnonymous, Route("elevator")]
+ public Task<WebResponseContent> InitializationElevator()
+ {
+ return Service.InitializationElevator();
}
}
\ No newline at end of file
--
Gitblit v1.9.3