From e4f94566b56fc7bceafe892f0a679f399115d590 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期三, 29 四月 2026 08:54:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 128 +++++++++++++++++++++++-------------------
1 files changed, 70 insertions(+), 58 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
index a027af3..23355d3 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
@@ -1,58 +1,70 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEAWCS_Core;
-using WIDESEAWCS_Core.BaseController;
-using WIDESEAWCS_DTO.TaskInfo;
-using WIDESEAWCS_ITaskInfoService;
-using WIDESEAWCS_Model.Models;
-
-namespace WIDESEAWCS_WCSServer.Controllers.Task
-{
- [Route("api/Task")]
- [ApiController]
- public class TaskController : ApiBaseController<ITaskService, Dt_Task>
- {
- private readonly IHttpContextAccessor _httpContextAccessor;
- public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor) : base(service)
- {
- _httpContextAccessor = httpContextAccessor;
- }
-
- [HttpPost, Route("ReceiveTask"), AllowAnonymous]
- public WebResponseContent ReceiveWMSTask([FromBody] List<WMSTaskDTO> taskDTOs)
- {
- return Service.ReceiveWMSTask(taskDTOs);
- }
-
- [HttpPost, Route("ReceiveManualTask"), AllowAnonymous]
- public WebResponseContent ReceiveManualTask([FromBody] List<WMSTaskDTO> taskDTOs)
- {
- return Service.ReceiveManualTask(taskDTOs);
- }
-
- [HttpPost, HttpGet(), Route("UpdateTaskExceptionMessage")]
- public WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message)
- {
- return Service.UpdateTaskExceptionMessage(taskNum, message);
- }
-
- [HttpPost, HttpGet, Route("UpdateTaskStatusToNext")]
- public WebResponseContent UpdateTaskStatusToNext(int taskNum)
- {
- return Service.UpdateTaskStatusToNext(taskNum);
- }
-
- [HttpPost, HttpGet, Route("TaskStatusRecovery")]
- public WebResponseContent TaskStatusRecovery(int taskNum)
- {
- return Service.TaskStatusRecovery(taskNum);
- }
-
- [HttpPost, HttpGet, Route("RollbackTaskStatusToLast")]
- public WebResponseContent RollbackTaskStatusToLast(int taskNum)
- {
- return Service.RollbackTaskStatusToLast(taskNum);
- }
- }
-}
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Channels;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseController;
+using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
+
+namespace WIDESEAWCS_WCSServer.Controllers.Task
+{
+ [Route("api/Task")]
+ [ApiController]
+ public class TaskController : ApiBaseController<ITaskService, Dt_Task>
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor) : base(service)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ }
+
+ [HttpPost, Route("ReceiveTask"), AllowAnonymous]
+ public WebResponseContent ReceiveWMSTask([FromBody] List<WMSTaskDTO> taskDTOs)
+ {
+ return Service.ReceiveWMSTask(taskDTOs);
+ }
+
+ [HttpPost, Route("ReceiveManualTask"), AllowAnonymous]
+ public WebResponseContent ReceiveManualTask([FromBody] List<WMSTaskDTO> taskDTOs)
+ {
+ return Service.ReceiveManualTask(taskDTOs);
+ }
+
+ [HttpPost, HttpGet(), Route("UpdateTaskExceptionMessage")]
+ public WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message)
+ {
+ return Service.UpdateTaskExceptionMessage(taskNum, message);
+ }
+
+ [HttpPost, HttpGet, Route("UpdateTaskStatusToNext")]
+ public WebResponseContent UpdateTaskStatusToNext(int taskNum)
+ {
+ return Service.UpdateTaskStatusToNext(taskNum);
+ }
+
+ [HttpPost, HttpGet, Route("TaskStatusRecovery")]
+ public WebResponseContent TaskStatusRecovery(int taskNum)
+ {
+ return Service.TaskStatusRecovery(taskNum);
+ }
+
+ [HttpPost, HttpGet, Route("RollbackTaskStatusToLast")]
+ public WebResponseContent RollbackTaskStatusToLast(int taskNum)
+ {
+ return Service.RollbackTaskStatusToLast(taskNum);
+ }
+
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ [HttpPost, Route("CancelTask"), AllowAnonymous]
+ public WebResponseContent CancelTask(int taskNum)
+ {
+ return Service.CancelTask(taskNum);
+ }
+ }
+}
--
Gitblit v1.9.3