From ff006f77f6267fc0d2c4ee810d897a85165f5b8f Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 30 四月 2026 22:08:29 +0800
Subject: [PATCH] Merge branch 'xiaoyang' into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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..af053f2 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,9 @@
-锘縰sing Autofac.Core;
+using 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,17 +15,24 @@
{
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)
@@ -38,4 +40,4 @@
return Service.CreateRobotTaskManually(request);
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3