diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index b1dc2bd5..bd3d2172 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index 68f7c610..6a73de51 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -16,6 +16,7 @@ using WMS.Web.Domain.IService; using WMS.Web.Domain.IService.Public; using WMS.Web.Domain.Options; using WMS.Web.Domain.Values; +using WMS.Web.Repositories; namespace WMS.Web.Api.Controllers { @@ -294,5 +295,24 @@ namespace WMS.Web.Api.Controllers return await _outStockTaskService.GetInfo(id, loginInfo); } + /// + /// 出库任务单详情(根据订单号搜索) + /// + /// + /// + [HttpGet] + [Route("GetInfo/{billNo}")] + public async Task> GetInfoByNo([FromRoute] string billNo) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return Result.ReFailure(ResultCodes.Token_Invalid_Error); + + var entity = await _repositories.GetByBillNo(billNo); + if (entity == null) + return Result.ReFailure(ResultCodes.OutStockTaskNoData); + + return await _outStockTaskService.GetInfo(entity.Id, loginInfo); + } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 44b32b1b..f453c529 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -574,6 +574,13 @@ + + + 出库任务单详情(根据订单号搜索) + + + + 获取序列号信息 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 54678804..9b37c924 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -3414,6 +3414,13 @@ + + + 根据任务单号获取订单信息 + + + + 修改实体集合 diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs index a3c51c70..58357474 100644 --- a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs @@ -38,6 +38,13 @@ namespace WMS.Web.Domain.Infrastructure /// /// Task> GetListByBillNo(List billNos); + /// + /// 根据任务单号获取订单信息 + /// + /// + /// + Task GetByBillNo(string billNo); + /// 修改实体集合 Task EditEntityList(List entitys, bool isTransaction = true); //编辑 diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 21da6a82..f900ac7d 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -607,5 +607,20 @@ namespace WMS.Web.Repositories if (names.Count() == 0) return ""; return string.Join(",", names); } + /// + /// 获取订单信息 + /// + /// + /// + /// + public async Task GetByBillNo(string billNo) + { + var entity = await _context.OutStockTask + .Include(s => s.Details) + .ThenInclude(s => s.ErpDetails) + .FirstOrDefaultAsync(w => billNo.Equals(w.BillNo)); + + return entity.Clone(); + } } }