diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index aa5c4455..ded6fb28 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -80,6 +80,23 @@ namespace WMS.Web.Api.Controllers return ResultList.ReSuccess(list); } + /// + /// 来源单-编号模糊查询-pad + /// + /// + /// + [HttpPost] + [Route("InStockTask/{code}")] + public async Task> InStockTask([FromRoute] string code) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); + + var list = await _inStockTaskRepositories.GetListBy(code); + return ResultList.ReSuccess(list); + } + /// /// 采购订单物料明细和箱物料明细-对比-pad /// diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 54e963e2..5940d92e 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -115,6 +115,13 @@ + + + 来源单-编号模糊查询-pad + + + + 采购订单物料明细和箱物料明细-对比-pad diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 168a37e7..ff6b2e05 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -236,10 +236,11 @@ namespace WMS.Web.Repositories if (materials_result.IsSuccess) materials = materials_result.Data.ToList(); + //这里只查状态为:部分入库和等待收货 var query = _context.InStockTaskDetails .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) - .Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + sourceBillNo + "%")); + .Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + sourceBillNo + "%") && (w.order.Status== InstockStatus.Part || w.order.Status==InstockStatus.Wait)); if(type.HasValue) query = query.Where(w => w.order.Type == type.Value);