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 | 81 +++++++---------------------------------
1 files changed, 14 insertions(+), 67 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 5ccc081..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,13 +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_Core;
using WIDESEAWCS_Core.BaseController;
-using WIDESEAWCS_Core.Enums;
-using WIDESEAWCS_DTO.TaskInfo;
-using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
@@ -19,78 +15,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("AddRobotTask"), AllowAnonymous]
- public WebResponseContent AddRobotTask([FromBody] RobotMoveRequest request)
+
+ [HttpGet, HttpPost, Route("GetRobotTaskTotalNum"), AllowAnonymous]
+ public int GetRobotTaskTotalNum( int taskType, string? palletCode)
{
- try
- {
- Dt_RobotTask robotTask = new Dt_RobotTask();
- robotTask.RobotTaskNum = Random.Shared.StrictNext();
- robotTask.RobotRoadway = "鎹㈢洏鏈烘鎵�";
- robotTask.RobotTaskType = 510;
- robotTask.RobotTaskState = 300;
- robotTask.RobotTaskTotalNum = 48;
- robotTask.RobotGrade = 1;
- robotTask.RobotDispatchertime = DateTime.Now;
- robotTask.RobotRemark = "浜哄伐鎵嬪姩鍒涘缓";
- robotTask.RobotSourceAddressPalletCode = request.robotSourceAddressPalletCode;
- robotTask.RobotTargetAddressPalletCode = request.robotTargetAddressPalletCode;
- // 鏍规嵁鏂瑰悜璁剧疆婧愬拰鐩爣
- switch (request.Forward)
- {
- case 1:
- robotTask.RobotSourceAddress = "1";
- robotTask.RobotSourceAddressLineCode = "11010";
- robotTask.RobotTargetAddress = "3";
- robotTask.RobotTargetAddressLineCode = "2103";
- break;
- case 2:
- robotTask.RobotSourceAddress = "2";
- robotTask.RobotSourceAddressLineCode = "11001";
- robotTask.RobotTargetAddress = "4";
- robotTask.RobotTargetAddressLineCode = "2101";
- break;
- case 3:
- robotTask.RobotSourceAddress = "3";
- robotTask.RobotSourceAddressLineCode = "2103";
- robotTask.RobotTargetAddress = "1";
- robotTask.RobotTargetAddressLineCode = "11010";
- break;
- case 4:
- robotTask.RobotSourceAddress = "4";
- robotTask.RobotSourceAddressLineCode = "2101";
- robotTask.RobotTargetAddress = "2";
- robotTask.RobotTargetAddressLineCode = "11001";
- break;
- default:
- return WebResponseContent.Instance.Error($"娣诲姞鏈哄櫒浜轰换鍔″け璐�");
- }
-
- return Service.AddData(robotTask);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"娣诲姞鏈哄櫒浜轰换鍔″け璐�: {ex.Message}");
- }
+ return Service.GetRobotTaskTotalNum(taskType, palletCode);
}
-
+ // 鎵嬪姩鏈烘鎵嬩换鍔�
+ [HttpGet, HttpPost, Route("CreateRobotTaskManually"), AllowAnonymous]
+ public WebResponseContent CreateRobotTaskManually([FromBody] ManualRobotTaskDto request)
+ {
+ return Service.CreateRobotTaskManually(request);
+ }
}
-}
-public class RobotMoveRequest
-{
- public int Forward { get; set; }
- public String robotSourceAddressPalletCode { get; set; }
- public String robotTargetAddressPalletCode { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3