From 5bedccab71622d4c0f3b9e75966802be704ee019 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期四, 12 三月 2026 14:20:23 +0800
Subject: [PATCH] 1
---
WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs b/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
index 7dbdafd..da98ce6 100644
--- a/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
+++ b/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
@@ -1,4 +1,5 @@
-锘縰sing HslCommunication.WebSocket;
+锘縰sing Autofac.Core.Resolving.Middleware;
+using HslCommunication.WebSocket;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -25,7 +26,7 @@
//private readonly WebSocketServer _webSocketServer;
private readonly ITaskService _taskService;
private readonly ITaskRepository _taskRepository;
- public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension ,ITaskService taskService,ITaskRepository taskRepository /*, WebSocketServer webSocketServer*/) : base(service)
+ public TaskController(ITaskService service, IHttpContextAccessor httpContextAccessor, IRouterExtension routerExtension, ITaskService taskService, ITaskRepository taskRepository /*, WebSocketServer webSocketServer*/) : base(service)
{
_httpContextAccessor = httpContextAccessor;
_routerExtension = routerExtension;
@@ -40,11 +41,20 @@
return Service.ReceiveWMSTask(taskDTOs);
}
+
+ [HttpPost, Route("ReceiveCPTask"), AllowAnonymous]
+ public WebResponseContent ReceiveWMSCPTask([FromBody] List<WMSTaskDTO> taskDTOs)
+ {
+ return Service.ReceiveWMSCPTask(taskDTOs);
+ }
+
+
[HttpPost, HttpGet, Route("RequestAssignLocation"), AllowAnonymous]
public string? RequestAssignLocation(int taskNum, string roadwayNo)
{
return Service.RequestAssignLocation(taskNum, roadwayNo);
}
+
[HttpPost, HttpGet, Route("UpdateTaskExceptionMessage")]
public WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message)
@@ -91,6 +101,12 @@
{
return Service.AgvCarrying(row, startColumn, endColumn, layer, targetLayer);
}
+
+ [HttpPost, HttpGet, Route("LedShowTask"), AllowAnonymous]
+ public WebResponseContent LedShowTask(string stationCode, string palletCode, int taskType)
+ {
+ return Service.LedShowTask(stationCode,palletCode,taskType);
+ }
//[HttpPost, HttpGet, Route("WebSocketPushMessage"), AllowAnonymous]
//public WebResponseContent WebSocketPushMessage(string message)
//{
@@ -121,7 +137,7 @@
{
return WebResponseContent.Instance.Error("鏈壘鍒拌浠诲姟淇℃伅");
}
- if(task.TaskState == TaskStatusEnum.SC_Executing.ObjToInt())
+ if (task.TaskState == TaskStatusEnum.SC_Executing.ObjToInt())
{
_taskService.UpdateTask(task, TaskStatusEnum.SC_Execute);
}
@@ -131,14 +147,14 @@
}
return WebResponseContent.Instance.OK();
}
- catch(Exception ex)
+ catch (Exception ex)
{
return WebResponseContent.Instance.Error(ex.Message);
}
}
- //RGV鍏ュ簱浠诲姟閲嶅彂
- [HttpPost, HttpGet, Route("RGVTaskResending"), AllowAnonymous]
+ //鍫嗗灈鏈轰换鍔′紭鍏堟墽琛�
+ [HttpPost, HttpGet, Route("StackerCraneTaskPriority"), AllowAnonymous]
public WebResponseContent StackerCraneTaskPriority(int taskNum)
{
try
@@ -148,14 +164,15 @@
{
return WebResponseContent.Instance.Error("鏈壘鍒拌浠诲姟淇℃伅");
}
- if (task.TaskState == TaskStatusEnum.RGV_Executing.ObjToInt())
+ if (task.TaskState == TaskStatusEnum.SC_Execute.ObjToInt())
{
- _taskService.UpdateTask(task, TaskStatusEnum.RGV_NEW);
+ task.Grade = 98;
}
else
{
- return WebResponseContent.Instance.Error("闈濺GV鎵ц涓姸鎬�");
+ return WebResponseContent.Instance.Error("闈炲爢鍨涙満寰呮墽琛岀姸鎬�");
}
+ _taskRepository.UpdateData(task);
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3