From 1dce8a2ad238624ea832e0418557b4a5b53dce23 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 13 四月 2026 17:44:55 +0800
Subject: [PATCH] 添加仓库的启用禁用状态，优化修改分区接口，优化提升机job，添加海康仓位到仓位接口
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs | 169 +++++++++++++++++++++++--------------------------------
1 files changed, 71 insertions(+), 98 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 d2a3697..4476a15 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"
@@ -5,6 +5,7 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core;
using WIDESEAWCS_DTO.WMS;
+using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ITaskInfoService;
namespace WIDESEAWCS_Server.Controllers.WMS
@@ -14,36 +15,47 @@
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涓嬪彂浠诲姟
/// </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>
+ /// 瀹瑰櫒娴佸姩璇锋眰
+ /// </summary>
+ /// <param name="taskDTOs"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ContainerRequest"), AllowAnonymous]
+ public WMSReturn ContainerRequest([FromBody] WMSContainerFlow wMSContainerFlow)
+ {
+ WebResponseContent content = _taskService.ContainerRequest(wMSContainerFlow);
+ return WMSReturnMethod.ReturnWMS(content);
+ }
+
+ /// <summary>
+ /// 骞冲簱璐т綅涓婁笅鏋跺鍣�
+ /// </summary>
+ /// <param name="taskDTOs"></param>
+ /// <returns></returns>
+ [HttpPost, Route("UpOrDownContainer"), AllowAnonymous]
+ public WMSReturn UpOrDownContainer([FromBody] WMSUpOrDownContainerDTO wMSUpOrDown)
+ {
+ WebResponseContent content = _taskService.UpOrDownContainer(wMSUpOrDown);
+ return WMSReturnMethod.ReturnWMS(content);
}
/// <summary>
@@ -52,54 +64,22 @@
/// <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>
- /// 淇敼浠诲姟浼樺厛绾�
+ /// 璐ㄦ缁撴灉鍙嶉
/// </summary>
- /// <param name="updateTaskPriority"></param>
+ /// <param name="iQC"></param>
/// <returns></returns>
- [HttpPost, Route("UpdateWMSTaskPriority"), AllowAnonymous]
- public object UpdateWMSTaskPriority([FromBody] WMSUpdateTaskPriority updateTaskPriority)
+ [HttpPost, Route("IQCResult"), AllowAnonymous]
+ public WMSReturn IQCResult([FromBody] IQCResultDTO iQC)
{
- 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
- };
- }
+ WebResponseContent content = _taskService.IQCResult(iQC);
+ return WMSReturnMethod.ReturnWMS(content);
}
/// <summary>
@@ -107,27 +87,23 @@
/// </summary>
/// <param name="WMSUpdateLocationArea"></param>
/// <returns></returns>
- [HttpPost, Route("ModifyWMSLayoutZone"), AllowAnonymous]
- public object ModifyWMSLayoutZone([FromBody] WMSUpdateLocationArea wMSUpdateLocationArea)
+ [HttpPost, Route("UpdateArea"), AllowAnonymous]
+ public WMSReturn UpdateArea([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>
+ /// 淇敼浠诲姟浼樺厛绾�
+ /// </summary>
+ /// <param name="updateTaskPriority"></param>
+ /// <returns></returns>
+ [HttpPost, Route("UpdateTaskGrade"), AllowAnonymous]
+ public WMSReturn UpdateTaskGrade([FromBody] WMSUpdateTaskPriority updateTaskPriority)
+ {
+ WebResponseContent content = _taskService.UpdateWMSTaskPriority(updateTaskPriority);
+ return WMSReturnMethod.ReturnWMS(content);
}
/// <summary>
@@ -135,27 +111,24 @@
/// </summary>
/// <param name="AreaCode">鍖哄煙鍙�</param>
/// <returns></returns>
- [HttpPost, Route("LocationInquiry"), AllowAnonymous]
- public object LocationInquiry(string AreaCode)
+ [HttpGet, HttpPost, Route("QueryStation"), AllowAnonymous]
+ public WMSReturn QueryStation([FromBody] WMSGetLocationInfo getLocationInfo)
{
- 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
- };
- }
+ WebResponseContent content = _taskService.LocationInquiry(getLocationInfo);
+ return WMSReturnMethod.ReturnWMS(content);
+ }
+
+
+ /// <summary>
+ /// 鏇存柊涓嶅悓浠撳簱鐨勫簱浣嶇姸鎬侊紝绂佺敤鍚敤
+ /// </summary>
+ /// <param name="upLocationStatusDTO"></param>
+ /// <returns></returns>
+ [HttpGet, HttpPost, Route("UpLocationStatus"), AllowAnonymous]
+ public WMSReturn UpLocationStatus([FromBody]UpLocationStatusDTO upLocationStatusDTO)
+ {
+ WebResponseContent content = _taskService.UpLocationStatus(upLocationStatusDTO);
+ return WMSReturnMethod.ReturnWMS(content);
}
}
}
--
Gitblit v1.9.3