diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index 4b96d126..aa14e25c 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -199,28 +199,26 @@ namespace WMS.Web.Api.Controllers /// [HttpGet] [Route("GetErp_SubUcStock/{number}/{orgCode}")] - public async Task>> GetErp_SubUcStock([FromRoute] string number,[FromRoute] string orgCode, [FromQuery] string name) + public async Task>> GetErp_SubUcStock([FromRoute] string number, [FromRoute] string orgCode, [FromQuery] string name) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return Result>.ReFailure(ResultCodes.Token_Invalid_Error); List list = new List(); - //if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD")) - //{ - //var subs = await _erpService.BillQueryForSubStock(number,orgCode); - var subs = await _erpService.BillQueryForSubStock(null, null); - foreach (var s in subs.Data.Skip(0).Take(10))//.Where(w => w.Name.Contains(name) + if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD")) + return Result>.ReSuccess(list); + + var subs = await _erpService.BillQueryForSubStock(number, orgCode); + //var subs = await _erpService.BillQueryForSubStock(null, null); + list = subs.Data.Where(w => w.Name.Contains(name)).Select(s => new UcStockResponse() { - list.Add(new UcStockResponse() - { - Id = s.Id, - Code = s.Code, - Name = s.Name, - Disable = false - }); - } - //} + Id = s.Id, + Code = s.Code, + Name = s.Name, + Disable = false + }).ToList();//.Skip(0).Take(10) + return Result>.ReSuccess(list); } @@ -330,7 +328,7 @@ namespace WMS.Web.Api.Controllers return Result.ReFailure(ResultCodes.Token_Invalid_Error); var result = await _boxInventoryRepositories.GetInfoBy(boxBillNo); - BoxResponse boxResponse= _mapper.Map(result); + BoxResponse boxResponse = _mapper.Map(result); if (boxResponse != null) { var materials_result = await _erpService.BillQueryForMaterial();