18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化接口

Browse Source
This commit is contained in:
tongfei
2024-03-27 11:27:54 +08:00
parent 57df8468fc
commit 42bcb5230f
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WMS.Web.Api/Controllers/InStockTaskController.cs
View File

@@ -184,7 +184,7 @@ namespace WMS.Web.Api.Controllers
var materialSubStocks= await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); var materialSubStocks= await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId);
list.ForEach(x => list.ForEach(x =>
{ {
x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.OrgCode==x.OrgCode).Select(x=>x.SubStock).ToList(); x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == x.StockCode && t.OrgCode == x.OrgCode).Select(x => x.SubStock).ToList();
}); });
return ResultList<SourceBillNoQueryResponse>.ReSuccess(list); return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
@@ -238,7 +238,7 @@ namespace WMS.Web.Api.Controllers
var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId);
list.SelectMany(x=>x.Details).ToList().ForEach(x => list.SelectMany(x=>x.Details).ToList().ForEach(x =>
{ {
x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.OrgCode == x.OrgCode).Select(x => x.SubStock).ToList(); x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode==x.StockCode && t.OrgCode == x.OrgCode).Select(x => x.SubStock).ToList();
}); });
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list); return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);

5
src/WMS.Web.Core/Dto/MaterialSubStock.cs
View File

@@ -28,5 +28,10 @@ namespace WMS.Web.Core.Dto
/// 组织 /// 组织
/// </summary> /// </summary>
public string OrgCode { get; set; } public string OrgCode { get; set; }
/// <summary>
/// 仓库
/// </summary>
public string StockCode { get; set; }
} }
} }

1
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -242,6 +242,7 @@ namespace WMS.Web.Repositories
MaterialNumber=x.MaterialNumber, MaterialNumber=x.MaterialNumber,
SubStockCode=x.SubStockCode, SubStockCode=x.SubStockCode,
OrgCode=x.OrgCode, OrgCode=x.OrgCode,
StockCode=x.StockCode,
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, x.SubStockCode + x.StockCode + x.OrgCode), SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, x.SubStockCode + x.StockCode + x.OrgCode),
}).ToListAsync(); }).ToListAsync();
} }