From 0f710285d9f02e3d4cea19557e17945e9ef9532b Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期五, 01 五月 2026 09:48:49 +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/RobotTaskController.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs
index ee7754c..e43311b 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs
@@ -1,14 +1,8 @@
-锘縰sing Autofac.Core;
-using Masuit.Tools;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
-using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseController;
-using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_DTO.TaskInfo;
-using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
@@ -20,22 +14,29 @@
{
public RobotTaskController(IRobotTaskService service) : base(service)
{
-
}
+
[HttpGet, HttpPost, Route("DeleteRobotTask"), AllowAnonymous]
public WebResponseContent DeleteRobotTask(int id)
{
- if (Service.DeleteRobotTask(id)){
+ if (Service.DeleteRobotTask(id))
+ {
return WebResponseContent.Instance.OK();
}
return WebResponseContent.Instance.Error();
}
+ [HttpGet, HttpPost, Route("GetRobotTaskTotalNum"), AllowAnonymous]
+ public int GetRobotTaskTotalNum(int taskType, string? palletCode)
+ {
+ return Service.GetRobotTaskTotalNum(taskType, palletCode);
+ }
+
// 鎵嬪姩鏈烘鎵嬩换鍔�
[HttpGet, HttpPost, Route("CreateRobotTaskManually"), AllowAnonymous]
- public WebResponseContent CreateRobotTaskManually([FromBody] ManualRobotTaskDto request)
+ public WebResponseContent CreateRobotTaskManually([FromBody] ManualRobotTaskDto request)
{
return Service.CreateRobotTaskManually(request);
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3