Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

昨天 b489f865bab00bedfce5e8f772095600b8034ac0

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs

@@ -9,6 +9,7 @@
using WIDESEA_Core.BaseController;
using WIDESEA_Core.Enums;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.System;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
@@ -29,6 +30,16 @@
        }

        /// <summary>
        /// èŽ·å–æ—§WMS系统辅料仓库存
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("GetContainerInfo"), AllowAnonymous]
        public WebResponseContent GetContainerInfo()
        {
            return Service.GetContainerInfo();
        }

        /// <summary>
        /// åˆå§‹åŒ–货位
        /// </summary>
        /// <param name="initializationLocationDTO"></param>
@@ -46,9 +57,9 @@
        /// <param name="palletType"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("AssignLocation"), AllowAnonymous]
        public Dt_LocationInfo? AssignLocation(string roadwayNo, PalletTypeEnum palletType, int warehouseId)
        public Dt_LocationInfo? AssignLocation(string roadwayNo, int palletType, int warehouseId, int heightType)
        {
            return Service.AssignLocation(roadwayNo, palletType, warehouseId);
            return Service.AssignLocation(roadwayNo, palletType, warehouseId, heightType: heightType);
        }

        /// <summary>
@@ -74,7 +85,7 @@
        }

        [HttpPost, Route("UpdateLocationStatus"), AllowAnonymous]
        public WebResponseContent UpdateLocationStatus(string locationCode, PalletTypeEnum palletType, LocationStatusEnum locationStatus, int warehousId)
        public WebResponseContent UpdateLocationStatus(string locationCode, int palletType, LocationStatusEnum locationStatus, int warehousId)
        {
            try
            {
@@ -86,5 +97,18 @@
                return WebResponseContent.Instance.Error(e.Message);
            }
        }
        [HttpPost, Route("GetLocationRoadway"), AllowAnonymous]
        public WebResponseContent GetLocationRoadway()
        {
            try
            {
                List<DictionaryDTO> dictionaryDTOs = Service.Repository.QueryData().GroupBy(x => new { x.RoadwayNo, x.WarehouseId }).Select(x => new DictionaryDTO { Key = x.Key.WarehouseId, Value = x.Key.RoadwayNo }).ToList() ;
                return WebResponseContent.Instance.OK(data: dictionaryDTOs);
            }
            catch (Exception e)
            {
                return WebResponseContent.Instance.Error(e.Message);
            }
        }
    }
}