Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPu...

yanjinhui

2 天以前 fe596f9db05103917c9257348edcbd3ecb5b46e8

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMS/WMSController.cs

@@ -47,6 +47,18 @@
        }

        /// <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>
        /// å–消任务
        /// </summary>
        /// <param name="wMSCancelTask"></param>
@@ -59,7 +71,7 @@
        }

        /// <summary>
        /// è´¨æ£€ç»“果反馈
        /// å¤–检结果反馈
        /// </summary>
        /// <param name="iQC"></param>
        /// <returns></returns>
@@ -100,10 +112,23 @@
        /// <param name="AreaCode">区域号</param>
        /// <returns></returns>
        [HttpGet, HttpPost, Route("QueryStation"), AllowAnonymous]
        public WMSReturn QueryStation(WMSGetLocationInfo getLocationInfo)
        public WMSReturn QueryStation([FromBody] WMSGetLocationInfo getLocationInfo)
        {
            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);
        }
    }
}