MeiRuiAn/HuaiAn.git

			@@ -4,6 +4,7 @@
			using Microsoft.AspNetCore.Mvc;
			using System.Collections.Generic;
			using WIDESEA_Common.CommonEnum;
			using WIDESEA_Common.LocationEnum;
			using WIDESEA_Core;
			using WIDESEA_Core.BaseController;
			using WIDESEA_Core.Enums;
			@@ -42,9 +43,9 @@
			/// <param name="palletType"></param>
			/// <returns></returns>
			[HttpPost, HttpGet, Route("AssignLocation"), AllowAnonymous]
			public Dt_LocationInfo? AssignLocation(string roadwayNo, PalletTypeEnum palletType)
			public Dt_LocationInfo? AssignLocation(string roadwayNo, PalletTypeEnum palletType, int warehouseId)
			{
			return Service.AssignLocation(roadwayNo, palletType);
			return Service.AssignLocation(roadwayNo, palletType, warehouseId);
			}

			/// <summary>
			@@ -68,5 +69,19 @@
			{
			return Service.LocationDisableStatus(keys); ;
			}

			[HttpPost, Route("UpdateLocationStatus"), AllowAnonymous]
			public WebResponseContent UpdateLocationStatus(string locationCode, PalletTypeEnum palletType, LocationStatusEnum locationStatus, int warehousId)
			{
			try
			{
			Service.UpdateLocationStatus(locationCode, palletType, locationStatus, warehousId);
			return WebResponseContent.Instance.OK();
			}
			catch (Exception e)
			{
			return WebResponseContent.Instance.Error(e.Message);
			}
			}
			}
			}