From 2ef99428f9be29ec299029782edb97baef88e126 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 18 三月 2026 14:19:20 +0800
Subject: [PATCH] feat: 完成WCS/WMS任务链路与设备调度改造
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
index 5f0f297..30de01d 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
@@ -4,7 +4,7 @@
using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
-using WIDESEA_DTO;
+using WIDESEA_DTO.GradingMachine;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -79,6 +79,17 @@
}
/// <summary>
+ /// 绉诲簱浠诲姟瀹屾垚锛氫慨鏀瑰簱瀛樹綅缃笌鐘舵�侊紝淇敼婧�/鐩爣璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("RelocationFinishTask"), AllowAnonymous]
+ public async Task<WebResponseContent?> RelocationFinishTaskAsync([FromBody] CreateTaskDto taskDto)
+ {
+ return await Service.RelocationFinishTaskAsync(taskDto);
+ }
+
+ /// <summary>
/// 鍒涘缓绌烘墭鐩樺嚭搴撲换鍔�
/// </summary>
/// <param name="taskDto"></param>
@@ -90,12 +101,67 @@
}
/// <summary>
+ /// 鍒涘缓绌烘墭鐩樺嚭搴撲换鍔�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("CreateTaskInboundTray"), AllowAnonymous]
+ public async Task<WebResponseContent?> CreateTaskInboundTrayAsync([FromBody] CreateTaskDto taskDto)
+ {
+ return await Service.CreateTaskInboundTrayAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 淇敼浠诲姟鐘舵�侊紙鏍规嵁浠诲姟ID淇敼涓烘寚瀹氱姸鎬侊級
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("UpdateTaskByStatus"), AllowAnonymous]
+ public async Task<WebResponseContent?> UpdateTaskByStatusAsync([FromBody] UpdateTaskDto taskDto)
+ {
+ return await Service.UpdateTaskByStatusAsync(taskDto.Id, taskDto.NewStatus);
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏈烘鎵嬬粍鐩樹换鍔�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("CreateRobotGroupPalletTask"), AllowAnonymous]
+ public async Task<WebResponseContent?> CreateRobotGroupPalletTaskAsync([FromBody] StockDTO taskDto)
+ {
+ return await Service.CreateRobotGroupPalletTaskAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏈烘鎵嬫媶鐩樹换鍔�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("CreateRobotSplitPalletTask"), AllowAnonymous]
+ public async Task<WebResponseContent?> CreateRobotSplitPalletTaskAsync([FromBody] StockDTO taskDto)
+ {
+ return await Service.CreateRobotSplitPalletTaskAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏈烘鎵嬫崲鐩樹换鍔�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("CreateRobotChangePalletTask"), AllowAnonymous]
+ public async Task<WebResponseContent?> CreateRobotChangePalletTaskAsync([FromBody] StockDTO taskDto)
+ {
+ return await Service.CreateRobotChangePalletTaskAsync(taskDto);
+ }
+
+ /// <summary>
/// 鍫嗗灈鏈哄彇鏀捐揣瀹屾垚鍚庣墿娴侀�氱煡鍖栨垚鍒嗗鏌滃畬鎴愪俊鍙�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet, HttpPost, Route("InOrOutCompleted"), AllowAnonymous]
- public async Task<WebResponseContent?> InOrOutCompletedAsync([FromBody] InputDto input)
+ public async Task<WebResponseContent?> InOrOutCompletedAsync([FromBody] GradingMachineInputDto input)
{
return await Service.InOrOutCompletedAsync(input);
}
@@ -106,7 +172,7 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpGet, HttpPost, Route("SendLocationStatus"), AllowAnonymous]
- public async Task<WebResponseContent?> SendLocationStatusAsync([FromBody] InputDto input)
+ public async Task<WebResponseContent?> SendLocationStatusAsync([FromBody] GradingMachineInputDto input)
{
return await Service.SendLocationStatusAsync(input);
}
@@ -117,7 +183,7 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpGet, HttpPost, Route("RequestOutbound"), AllowAnonymous]
- public async Task<WebResponseContent?> RequestOutboundAsync([FromBody] InputDto input)
+ public async Task<WebResponseContent?> RequestOutboundAsync([FromBody] GradingMachineInputDto input)
{
return await Service.RequestOutboundAsync(input);
}
@@ -128,7 +194,7 @@
/// <param name="input"></param>
/// <returns></returns>
[HttpGet, HttpPost, Route("GetPalletCodeCell"), AllowAnonymous]
- public async Task<WebResponseContent?> GetPalletCodeCellAsync([FromBody] InputDto input)
+ public async Task<WebResponseContent?> GetPalletCodeCellAsync([FromBody] GradingMachineInputDto input)
{
return await Service.GetPalletCodeCellAsync(input);
}
--
Gitblit v1.9.3