diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs index 2f2d8aa97..3517ec18f 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Inventories/BalanceController.cs @@ -609,22 +609,23 @@ public class BalanceController : AbpController /// /// /// + /// /// [HttpPost("get-recommend-balance-erplocation")] - public async Task> GetRecommendBalanceByErpLocation(string itemCode, bool isPackingCode,string erpLocationCode) + public async Task> GetRecommendBalanceByErpLocation(SearchErpAndLocation erpLocationCode) { - var codes=await _locationAppService.GetListByErpLocationCodes(new List{erpLocationCode}).ConfigureAwait(false); + var codes=await _locationAppService.GetListByErpLocationCodes(new List{ erpLocationCode.erpLocationCode}).ConfigureAwait(false); if(codes.Any()){ //获取可用库存 var input = new RecommendBalanceRequestInput { - ItemCode = itemCode, + ItemCode = erpLocationCode.itemCode, Qty = decimal.MaxValue, Statuses = new EditableList { EnumInventoryStatus.OK }, Locations = codes.Select(p=>p.Code).ToList(), - IsPackingCode = isPackingCode + IsPackingCode = erpLocationCode.isPackingCode }; var usableList = await _balanceAppService.GetUsableListAsync(input).ConfigureAwait(false); @@ -704,40 +705,11 @@ public class BalanceController : AbpController public int LocationRow { get; set; } } - /* - /// - /// 查询库余额 - /// - /// - /// - [HttpPost("get-list-balance-by-input")] - public async Task> GetListBalanceByInputAsync(List enumLocationTypes) - { - var sfsInventoryRequestInputBase= new BalanceRequestInput - { - MaxResultCount =list.pageSize, - SkipCount = (listInput.pageIndex - 1) * listInput.pageSize, - Sorting = listInput.sortBy, - Condition = new Condition() - { - Filters = new List() - } - } - - var balanceDTOs = await _balanceAppService.GetListAsync(); - - return balanceDTOs; - } - - /// - /// 获取可以上架的库存状态 - /// - /// - /// - [HttpGet("allow-putaway-inventory-status")] - public virtual async Task> GetAllowPutawayInventoryStatusAsync() + public class SearchErpAndLocation { - return await _balanceAppService .GetAllowPutawayInventoryStatusAsync(); + public string itemCode { get; set; } + public bool isPackingCode { get; set; } + public string erpLocationCode { get; set; } } - */ + }