From afbd9149dd39d33d66bb27eaf9ac34c3de36ac7a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 03 三月 2026 10:29:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs | 105 +++++++---------------------------------------------
1 files changed, 15 insertions(+), 90 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 c6df471..1edd6ad 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"
@@ -21,32 +21,21 @@
_taskService = taskService;
_stationMangerService = stationMangerService;
}
+
+
+
+
+
/// <summary>
/// WMS涓嬪彂浠诲姟
/// </summary>
/// <param name="taskDTOs"></param>
/// <returns></returns>
[HttpPost, Route("ReceiveTask"), AllowAnonymous]
- public object ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
+ public WMSReturn ReceiveWMSTask([FromBody] List<WMSTasksDTO> 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
- };
- }
+ return WMSReturnMethod.ReturnWMS(content);
}
/// <summary>
@@ -55,26 +44,10 @@
/// <param name="wMSCancelTask"></param>
/// <returns></returns>
[HttpPost, Route("CancelWMSTask"), AllowAnonymous]
- public object CancelWMSTask([FromBody] WMSCancelTask wMSCancelTask)
+ public WMSReturn CancelWMSTask([FromBody] WMSCancelTask 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
- };
- }
+ return WMSReturnMethod.ReturnWMS(content);
}
/// <summary>
@@ -83,26 +56,10 @@
/// <param name="updateTaskPriority"></param>
/// <returns></returns>
[HttpPost, Route("UpdateWMSTaskPriority"), AllowAnonymous]
- public object UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority updateTaskPriority)
+ public WMSReturn UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority 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
- };
- }
+ return WMSReturnMethod.ReturnWMS(content);
}
/// <summary>
@@ -111,26 +68,10 @@
/// <param name="WMSUpdateLocationArea"></param>
/// <returns></returns>
[HttpPost, Route("ModifyWMSLayoutZone"), AllowAnonymous]
- public object ModifyWMSLayoutZone([FromBody] WMSUpdateLocationArea wMSUpdateLocationArea)
+ public WMSReturn 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
- };
- }
+ return WMSReturnMethod.ReturnWMS(content);
}
/// <summary>
@@ -139,26 +80,10 @@
/// <param name="AreaCode">鍖哄煙鍙�</param>
/// <returns></returns>
[HttpPost, Route("LocationInquiry"), AllowAnonymous]
- public object LocationInquiry(string AreaCode)
+ public WMSReturn 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
- };
- }
+ return WMSReturnMethod.ReturnWMS(content);
}
}
}
--
Gitblit v1.9.3