添加仓库的启用禁用状态，优化修改分区接口，优化提升机job，添加海康仓位到仓位接口

yanjinhui

2 天以前 1dce8a2ad238624ea832e0418557b4a5b53dce23

 ´úÂë¹ÜÀí/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,19 +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 WebResponseContent ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
        public WMSReturn ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs)
        {
            return _taskService.ReceiveWMSTask(taskDTOs);
            WebResponseContent content = _taskService.ReceiveWMSTask(taskDTOs);
            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>
@@ -35,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>
@@ -90,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>
@@ -118,26 +111,24 @@
        /// </summary>
        /// <param name="AreaCode">区域号</param>
        /// <returns></returns>
        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);
        }
    }
}