From e1f772ef890e46813b62a08aa8e77a258f6add2c Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 02 三月 2026 10:04:23 +0800
Subject: [PATCH] 添加任务完成反馈给WMS
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs | 124 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 117 insertions(+), 7 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs"
index c3d1c8e..c6df471 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs"
@@ -2,8 +2,10 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
using WIDESEAWCS_Core;
using WIDESEAWCS_DTO.WMS;
+using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ITaskInfoService;
namespace WIDESEAWCS_Server.Controllers.WMS
@@ -13,9 +15,11 @@
public class WMSController : ControllerBase
{
private readonly ITaskService _taskService;
- public WMSController(ITaskService taskService)
+ private readonly IStationMangerService _stationMangerService;
+ public WMSController(ITaskService taskService, IStationMangerService stationMangerService)
{
_taskService = taskService;
+ _stationMangerService = stationMangerService;
}
/// <summary>
/// WMS涓嬪彂浠诲姟
@@ -23,9 +27,26 @@
/// <param name="taskDTOs"></param>
/// <returns></returns>
[HttpPost, Route("ReceiveTask"), AllowAnonymous]
- public WebResponseContent ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
+ public object ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
{
- return _taskService.ReceiveWMSTask(taskDTOs);
+ WebResponseContent content = _taskService.ReceiveWMSTask(taskDTOs);
+ if (!content.Status)
+ {
+ return new
+ {
+ code = "404",
+ msg = content.Message
+ };
+ }
+ else
+ {
+ return new
+ {
+ code = "0",
+ msg = content.Message,
+ data = content.Data
+ };
+ }
}
/// <summary>
@@ -34,9 +55,26 @@
/// <param name="wMSCancelTask"></param>
/// <returns></returns>
[HttpPost, Route("CancelWMSTask"), AllowAnonymous]
- public WebResponseContent CancelWMSTask([FromBody] WMSCancelTask wMSCancelTask)
+ public object CancelWMSTask([FromBody] WMSCancelTask wMSCancelTask)
{
- return _taskService.CancelWMSTask(wMSCancelTask);
+ WebResponseContent content = _taskService.CancelWMSTask(wMSCancelTask);
+ if (!content.Status)
+ {
+ return new
+ {
+ code = "404",
+ msg = content.Message
+ };
+ }
+ else
+ {
+ return new
+ {
+ code = "0",
+ msg = content.Message,
+ data = content.Data
+ };
+ }
}
/// <summary>
@@ -45,10 +83,82 @@
/// <param name="updateTaskPriority"></param>
/// <returns></returns>
[HttpPost, Route("UpdateWMSTaskPriority"), AllowAnonymous]
- public WebResponseContent UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority updateTaskPriority)
+ public object UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority updateTaskPriority)
{
- return _taskService.UpdateWMSTaskPriority(updateTaskPriority);
+ WebResponseContent content = _taskService.UpdateWMSTaskPriority(updateTaskPriority);
+ if (!content.Status)
+ {
+ return new
+ {
+ code = "404",
+ msg = content.Message
+ };
+ }
+ else
+ {
+ return new
+ {
+ code = "0",
+ msg = content.Message,
+ data = content.Data
+ };
+ }
}
+ /// <summary>
+ /// 淇敼搴撲綅鍒嗗尯
+ /// </summary>
+ /// <param name="WMSUpdateLocationArea"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ModifyWMSLayoutZone"), AllowAnonymous]
+ public object ModifyWMSLayoutZone([FromBody] WMSUpdateLocationArea wMSUpdateLocationArea)
+ {
+ WebResponseContent content = _taskService.ModifyWMSLayoutZone(wMSUpdateLocationArea);
+ if (!content.Status)
+ {
+ return new
+ {
+ code = "404",
+ msg = content.Message
+ };
+ }
+ else
+ {
+ return new
+ {
+ code = "0",
+ msg = content.Message,
+ data = content.Data
+ };
+ }
+ }
+
+ /// <summary>
+ /// 鍖哄煙搴撲綅淇℃伅鏌ヨ
+ /// </summary>
+ /// <param name="AreaCode">鍖哄煙鍙�</param>
+ /// <returns></returns>
+ [HttpPost, Route("LocationInquiry"), AllowAnonymous]
+ public object LocationInquiry(string AreaCode)
+ {
+ WebResponseContent content = _taskService.LocationInquiry(AreaCode);
+ if (!content.Status)
+ {
+ return new
+ {
+ code = "404",
+ msg = content.Message
+ };
+ }
+ else
+ {
+ return new
+ {
+ code = "0",
+ msg = content.Message,
+ data = content.Data
+ };
+ }
+ }
}
}
--
Gitblit v1.9.3