From a4c0e9759befb4e8efa91e322370afe9d4673d4b Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 02 三月 2026 10:36:56 +0800
Subject: [PATCH] 优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 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..59a8897 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,6 +2,7 @@
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_ITaskInfoService;
@@ -17,15 +18,29 @@
{
_taskService = taskService;
}
+
+
+ public WMSReturn ReturnWMS(WebResponseContent content, int successCode = 0, int failCode = 404)
+ {
+ return new WMSReturn
+ {
+ code = content.Status ? successCode : failCode,
+ msg = content.Message ?? (content.Status ? "鎿嶄綔鎴愬姛" : "鎿嶄綔澶辫触"),
+ data = content.Status ? content.Data : null
+ };
+ }
+
+
/// <summary>
/// WMS涓嬪彂浠诲姟
/// </summary>
/// <param name="taskDTOs"></param>
/// <returns></returns>
[HttpPost, Route("ReceiveTask"), AllowAnonymous]
- public WebResponseContent ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
+ public WMSReturn ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
{
- return _taskService.ReceiveWMSTask(taskDTOs);
+ WebResponseContent content = _taskService.ReceiveWMSTask(taskDTOs);
+ return ReturnWMS(content);
}
/// <summary>
@@ -34,9 +49,10 @@
/// <param name="wMSCancelTask"></param>
/// <returns></returns>
[HttpPost, Route("CancelWMSTask"), AllowAnonymous]
- public WebResponseContent CancelWMSTask([FromBody] WMSCancelTask wMSCancelTask)
+ public WMSReturn CancelWMSTask([FromBody] WMSCancelTask wMSCancelTask)
{
- return _taskService.CancelWMSTask(wMSCancelTask);
+ WebResponseContent content = _taskService.CancelWMSTask(wMSCancelTask);
+ return ReturnWMS(content);
}
/// <summary>
@@ -45,10 +61,34 @@
/// <param name="updateTaskPriority"></param>
/// <returns></returns>
[HttpPost, Route("UpdateWMSTaskPriority"), AllowAnonymous]
- public WebResponseContent UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority updateTaskPriority)
+ public WMSReturn UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority updateTaskPriority)
{
- return _taskService.UpdateWMSTaskPriority(updateTaskPriority);
+ WebResponseContent content = _taskService.UpdateWMSTaskPriority(updateTaskPriority);
+ return ReturnWMS(content);
}
+ /// <summary>
+ /// 淇敼搴撲綅鍒嗗尯
+ /// </summary>
+ /// <param name="WMSUpdateLocationArea"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ModifyWMSLayoutZone"), AllowAnonymous]
+ public WMSReturn ModifyWMSLayoutZone([FromBody] WMSUpdateLocationArea wMSUpdateLocationArea)
+ {
+ WebResponseContent content = _taskService.ModifyWMSLayoutZone(wMSUpdateLocationArea);
+ return ReturnWMS(content);
+ }
+
+ /// <summary>
+ /// 鍖哄煙搴撲綅淇℃伅鏌ヨ
+ /// </summary>
+ /// <param name="AreaCode">鍖哄煙鍙�</param>
+ /// <returns></returns>
+ [HttpPost, Route("LocationInquiry"), AllowAnonymous]
+ public WMSReturn LocationInquiry(string AreaCode)
+ {
+ WebResponseContent content = _taskService.LocationInquiry(AreaCode);
+ return ReturnWMS(content);
+ }
}
}
--
Gitblit v1.9.3