修复bug

This commit is contained in:
18942506660
2024-03-27 11:29:04 +08:00
parent 42bcb5230f
commit 21ca6e6ac1
3 changed files with 10 additions and 2 deletions

View File

@@ -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 materialNumbers = res.SelectMany(s => s.details).GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList();
var stockCodes = res.Select(s => s.StockCode).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) 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 materialNumbers = res.details.GroupBy(x => x.MaterialNumber).Select(x => x.Key).ToList();
var stockCodes = new List<string>() { res.StockCode }; var stockCodes = new List<string>() { res.StockCode };
var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, loginInfo.UserInfo.CompanyId); var orgCodes = new List<string>() { res.OrgCode };
var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId);
res.details.ForEach(x => res.details.ForEach(x =>
{ {
x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList(); x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber).ToList();

View File

@@ -26,6 +26,10 @@ namespace WMS.Web.Core.Dto.OutStockTask
///</summary> ///</summary>
public string StockName { get; set; } public string StockName { get; set; }
/// <summary> /// <summary>
/// 组织编码
///</summary>
public string OrgCode { get; set; }
/// <summary>
/// 详情 /// 详情
/// </summary> /// </summary>
public List<GetOutStockTaskByNoDetailsResponse> details { get; set; } = new List<GetOutStockTaskByNoDetailsResponse>(); public List<GetOutStockTaskByNoDetailsResponse> details { get; set; } = new List<GetOutStockTaskByNoDetailsResponse>();

View File

@@ -388,6 +388,7 @@ namespace WMS.Web.Repositories
foreach (var r in response) foreach (var r in response)
{ {
var entity = list.FirstOrDefault(f => f.Id == r.Id); var entity = list.FirstOrDefault(f => f.Id == r.Id);
r.OrgCode = entity.OrgCode;
r.StockCode = entity.StockCode; r.StockCode = entity.StockCode;
r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode); 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(); if (entity == null) return new GetOutStockTaskByNoResponse();
var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity); var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
response.OrgCode = entity.OrgCode;
response.StockCode = entity.StockCode; response.StockCode = entity.StockCode;
response.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode); response.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode);
//获取物料信息 显示物料三件套 //获取物料信息 显示物料三件套