From 1faef6894400be9923b24038fddb7f9218bd7b6b Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 30 三月 2026 18:19:16 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 243 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 243 insertions(+), 0 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 dcc27d0..17d2a3f 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs
@@ -1,9 +1,11 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using System.DirectoryServices.Protocols;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
+using WIDESEA_DTO.GradingMachine;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
@@ -22,5 +24,246 @@
{
}
+ /// <summary>
+ /// 鍒涘缓鍏ュ簱浠诲姟
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("CreateTaskInbound"),AllowAnonymous]
+ public async Task<WebResponseContent?> CreateTaskInboundAsync([FromBody] CreateTaskDto taskDto)
+ {
+ return await Service.CreateTaskInboundAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鎸囧畾鐨勪换鍔¤鎯呭紓姝ュ垱寤烘柊鐨勫嚭搴撲换鍔�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("CreateTaskOutbound"), AllowAnonymous]
+ public async Task<WebResponseContent?> CreateTaskOutboundAsync([FromBody] CreateTaskDto taskDto)
+ {
+ return await Service.CreateTaskOutboundAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍙叆搴撹揣浣�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("GetTasksLocation"), AllowAnonymous]
+ public async Task<WebResponseContent?> GetTasksLocationAsync([FromBody] CreateTaskDto taskDto)
+ {
+ return await Service.GetTasksLocationAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 鍏ュ簱浠诲姟瀹屾垚锛氭坊鍔犲簱瀛橈紝淇敼璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁锛屾坊鍔犲巻鍙蹭换鍔℃暟鎹�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("InboundFinishTask"), AllowAnonymous]
+ public async Task<WebResponseContent?> InboundFinishTaskAsync([FromBody] CreateTaskDto taskDto)
+ {
+ return await Service.InboundFinishTaskAsync(taskDto);
+ }
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟瀹屾垚 锛氫慨鏀瑰簱瀛橈紝淇敼璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁锛屾坊鍔犲巻鍙蹭换鍔℃暟鎹�
+ /// </summary>
+ /// <param name="taskDto"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("OutboundFinishTask"), AllowAnonymous]
+ public async Task<WebResponseContent?> OutboundFinishTaskAsync([FromBody] CreateTaskDto taskDto)
+ {
+ return await Service.OutboundFinishTaskAsync(taskDto);
+ }
+
+ /// <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>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("GetOutBoundTrayTask"), AllowAnonymous]
+ public async Task<WebResponseContent?> GetOutBoundTrayTaskAsync([FromBody] CreateTaskDto taskDto)
+ {
+ return await Service.GetOutBoundTrayTaskAsync(taskDto);
+ }
+
+ /// <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] GradingMachineInputDto input)
+ {
+ return await Service.InOrOutCompletedAsync(input);
+ }
+
+ /// <summary>
+ /// 鍖栨垚鍒嗗鏌滃畾鏃跺悜鐗╂祦鏇存柊鍒嗗鏌滅姸鎬佷俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("SendLocationStatus"), AllowAnonymous]
+ public async Task<WebResponseContent?> SendLocationStatusAsync([FromBody] GradingMachineInputDto input)
+ {
+ return await Service.SendLocationStatusAsync(input);
+ }
+
+ /// <summary>
+ /// 鍒嗗鏌滃伐浣滃畬鎴愬悗璋冪敤姝ゆ帴鍙ｉ�氱煡鐗╂祦鍑哄簱
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("RequestOutbound"), AllowAnonymous]
+ public async Task<WebResponseContent?> RequestOutboundAsync([FromBody] GradingMachineInputDto input)
+ {
+ return await Service.RequestOutboundAsync(input);
+ }
+
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚鍒嗗璋冪敤鑾峰彇鎵樼洏涓婃瘡涓�氶亾鐢佃姱
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("GetPalletCodeCell"), AllowAnonymous]
+ public async Task<WebResponseContent?> GetPalletCodeCellAsync([FromBody] GradingMachineInputDto input)
+ {
+ return await Service.GetPalletCodeCellAsync(input);
+ }
+
+ #region 鏋佸嵎搴撲换鍔℃ā鍧�
+
+ /// <summary>
+ /// 鍑哄叆搴撶敵璇�
+ /// </summary>
+ /// <param name="applyInOutDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost("ApplyInOut"), AllowAnonymous]
+ public async Task<AGVResponse> ApplyInOutAsync([FromBody] ApplyInOutDto applyInOutDto)
+ {
+ return await Service.ApplyInOutAsync(applyInOutDto);
+ }
+ /// <summary>
+ /// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV
+ /// </summary>
+ /// <param name="outTaskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost, Route("OutTaskComplete"), AllowAnonymous]
+ public async Task<WebResponseContent> OutTaskComplete([FromBody] OutTaskCompleteDto outTaskCompleteDto)
+ {
+ return await Service.OutTaskComplete(outTaskCompleteDto);
+ }
+ ///// <summary>
+ ///// 浠诲姟瀹屾垚
+ ///// </summary>
+ ///// <param name="wCSTask">璇锋眰鍙傛暟</param>
+ ///// <returns></returns>
+ //[HttpPost, Route("TaskCompleted"), AllowAnonymous]
+ //public async Task<WebResponseContent?> TaskCompleted([FromBody] WCSTaskDTO wCSTask)
+ //{
+ // return await Service.TaskCompleted(wCSTask);
+ //}
+ /// <summary>
+ /// 杈撻�佺嚎鐢宠杩涘叆
+ /// </summary>
+ /// <param name="applyEnterDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost("ApplyEnter"), AllowAnonymous]
+ public async Task<AGVResponse?> ApplyEnterAsync([FromBody] ApplyEnterDto applyEnterDto)
+ {
+ return await Service.ApplyEnterAsync(applyEnterDto);
+ }
+
+ /// <summary>
+ /// 鍙栨斁璐у畬鎴�
+ /// </summary>
+ /// <param name="taskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost("TaskComplete"), AllowAnonymous]
+ public async Task<AGVResponse?> TaskCompleteAsync([FromBody] TaskCompleteDto taskCompleteDto)
+ {
+ return await Service.TaskCompleteAsync(taskCompleteDto);
+ }
+
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskCancelDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost("TaskCancel"), AllowAnonymous]
+ public async Task<AGVResponse?> TaskCancelAsync([FromBody] TaskCancelDto taskCancelDto)
+ {
+ return await Service.TaskCancelAsync(taskCancelDto);
+ }
+ #endregion 鏋佸嵎搴撲换鍔℃ā鍧�
}
}
--
Gitblit v1.9.3