This commit is contained in:
tongfei
2024-03-18 11:03:51 +08:00
parent c0520b5cd3
commit 896450fd23
49 changed files with 394 additions and 536 deletions

View File

@@ -46,10 +46,10 @@ namespace WMS.Web.Domain.Services
{
//找到物料对应的即时库存明细
var orgCodes = dtos.Select(x => x.OrgCode).ToList();
var materialIds = dtos.Select(x => x.MaterialId).ToList();
var materialNumbers = dtos.Select(x => x.MaterialNumber).ToList();
var stockCodes = dtos.GroupBy(x => x.StockCode).Select(x => x.Key).ToList();
var subStockIds = dtos.GroupBy(x => x.SubStockId).Select(x => x.Key).ToList();
var inventoryDetails = await _inventoryDetailsRepositories.GetListBy(materialIds, stockCodes, subStockIds, orgCodes);
var subStockCodes = dtos.GroupBy(x => x.SubStockCode).Select(x => x.Key).ToList();
var inventoryDetails = await _inventoryDetailsRepositories.GetListBy(materialNumbers, stockCodes, subStockCodes, orgCodes);
var add_entitys = new List<InventoryDetails>();
@@ -60,9 +60,9 @@ namespace WMS.Web.Domain.Services
{
//2.1当前的即时库存明细
var currentDetail = inventoryDetails.Where(x =>
x.MaterialId == dto.MaterialId &&
x.MaterialNumber == dto.MaterialNumber &&
x.StockCode == dto.StockCode &&
x.SubStockId == dto.SubStockId &&
x.SubStockCode == dto.SubStockCode &&
x.OrgCode==dto.OrgCode).FirstOrDefault();
if (currentDetail == null)
{
@@ -114,17 +114,17 @@ namespace WMS.Web.Domain.Services
/// <summary>
/// 获取即时库存明细汇总
/// </summary>
/// <param name="mids"></param>
/// <param name="materialNumbers"></param>
/// <param name="stockCodes"></param>
/// <param name="orgCodes"></param>
/// <returns></returns>
public async Task<List<InventoryDetailsSummaryResponse>> GetInventoryDetailsSummary(List<int> mids, List<string> stockCodes, List<string> orgCodes)
public async Task<List<InventoryDetailsSummaryResponse>> GetInventoryDetailsSummary(List<string> materialNumbers, List<string> stockCodes, List<string> orgCodes)
{
var inventoryDetails = await _inventoryDetailsRepositories.GetListBy(mids, stockCodes, orgCodes);
var resultList = inventoryDetails.GroupBy(x => new { MaterialId = x.MaterialId, StockCode = x.StockCode, OrgCode = x.OrgCode })
var inventoryDetails = await _inventoryDetailsRepositories.GetListBy(materialNumbers, stockCodes, orgCodes);
var resultList = inventoryDetails.GroupBy(x => new { MaterialNumber = x.MaterialNumber, StockCode = x.StockCode, OrgCode = x.OrgCode })
.Select(x => new InventoryDetailsSummaryResponse()
{
MaterialId=x.Key.MaterialId,
MaterialNumber = x.Key.MaterialNumber,
StockCode=x.Key.StockCode,
OrgCode=x.Key.OrgCode,
Qty=x.Sum(t=>t.Qty)