From 21ca6e6ac130d8bfe64b888608136f3cd0ea93a9 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 27 Mar 2024 11:29:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/Controllers/OutStockTaskController.cs | 6 ++++-- .../Dto/OutStockTask/GetOutStockTaskByNoResponse.cs | 4 ++++ src/WMS.Web.Repositories/OutStockTaskRepositories.cs | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index 09ace893..c34e4523 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -142,7 +142,8 @@ namespace WMS.Web.Api.Controllers //获取物料对应的仓位 var materialNumbers = res.SelectMany(s => s.details).GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList(); var stockCodes = res.Select(s => s.StockCode).ToList(); - var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId); + var orgCodes = res.Select(s => s.OrgCode).ToList(); + var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); foreach (var r in res) { @@ -201,7 +202,8 @@ namespace WMS.Web.Api.Controllers //获取物料对应的仓位 var materialNumbers = res.details.GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList(); var stockCodes = new List() { res.StockCode }; - var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId); + var orgCodes = new List() { res.OrgCode }; + var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); res.details.ForEach(x => { x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList(); diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs index f6ecc1b2..f3bfced4 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs @@ -26,6 +26,10 @@ namespace WMS.Web.Core.Dto.OutStockTask /// public string StockName { get; set; } /// + /// 组织编码 + /// + public string OrgCode { get; set; } + /// /// 详情 /// public List details { get; set; } = new List(); diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index 5a3a9fa9..3fab6d47 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -388,6 +388,7 @@ namespace WMS.Web.Repositories foreach (var r in response) { var entity = list.FirstOrDefault(f => f.Id == r.Id); + r.OrgCode = entity.OrgCode; r.StockCode = entity.StockCode; r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode); } @@ -420,6 +421,7 @@ namespace WMS.Web.Repositories if (entity == null) return new GetOutStockTaskByNoResponse(); var response = _mapper.Map(entity); + response.OrgCode = entity.OrgCode; response.StockCode = entity.StockCode; response.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode); //获取物料信息 显示物料三件套 From 81e53613c6a327cc19fe5855f488be816ed40276 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Wed, 27 Mar 2024 11:32:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/OutStockTaskController.cs | 4 ++-- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 15 +++++++++++++++ .../OutStockTask/GetOutStockTaskByNoResponse.cs | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index c34e4523..5e7c1284 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -149,7 +149,7 @@ namespace WMS.Web.Api.Controllers { r.details.ForEach(x => { - x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList(); + x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == r.StockCode && t.OrgCode == r.OrgCode).Select(s => s.SubStock).ToList(); }); } @@ -206,7 +206,7 @@ namespace WMS.Web.Api.Controllers var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); res.details.ForEach(x => { - x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList(); + x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == res.StockCode && t.OrgCode == res.OrgCode).Select(s => s.SubStock).ToList(); }); return Result.ReSuccess(res); diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index bf6d1531..03e4c98c 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4379,6 +4379,16 @@ 仓位名称 + + + 组织 + + + + + 仓库 + + 单据编号 @@ -4629,6 +4639,11 @@ 仓库名 + + + 组织编码 + + 详情 diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs index f3bfced4..9fdd7bf0 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs @@ -60,6 +60,6 @@ namespace WMS.Web.Core.Dto.OutStockTask /// /// 物料对应的仓位有哪些 /// - public List MaterialSubStocks { get; set; } = new List(); + public List MaterialSubStocks { get; set; } = new List(); } }