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

修复bug

Browse Source
This commit is contained in:
tongfei
2023-12-08 14:53:26 +08:00
parent 8b72c5bb0a
commit 0aba076c50
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/WMS.Web.Domain/Services/BoxInventoryService.cs
View File

@@ -552,23 +552,27 @@ namespace WMS.Web.Domain.Services
x.StockCode = current_box_invetory.StockCode; x.StockCode = current_box_invetory.StockCode;
x.SubStockId = current_box_invetory.SubStockId; x.SubStockId = current_box_invetory.SubStockId;
} }
//3.1先通过中间层的明细的箱明细找到中间层明细的IDS ////3.1先通过中间层的明细的箱明细找到中间层明细的IDS
var current_materialDetails_ids = dtoData.Details.SelectMany(t => t.BoxsDetails).Where(t => t.BoxId == x.BoxId).GroupBy(t => t.DetailId).Select(t => t.Key).ToList(); //var current_materialDetails_ids = dtoData.Details.SelectMany(t => t.BoxsDetails).Where(t => t.BoxId == x.BoxId).GroupBy(t => t.DetailId).Select(t => t.Key).ToList();
//3.2再通过找到的IDS获取中间层的明细 ////3.2再通过找到的IDS获取中间层的明细
var current_materialDetails = dtoData.Details.Where(t => current_materialDetails_ids.Contains(t.Id)).ToList(); //var current_materialDetails = dtoData.Details.Where(t => current_materialDetails_ids.Contains(t.Id)).ToList();
//3.3遍历-组装箱库存要的dto明细 ////3.3遍历-组装箱库存要的dto明细
if (current_materialDetails != null && current_materialDetails.Count != 0) //if (current_materialDetails != null && current_materialDetails.Count != 0)
foreach (var detItem in dtoData.Details.SelectMany(x => x.BoxsDetails).ToList())
{ {
foreach (var detItem in current_materialDetails) if (x.BoxId == detItem.BoxId)
{ {
var current_det= dtoData.Details.Where(x => x.Id == detItem.DetailId).FirstOrDefault();
//2.2组装明细 //2.2组装明细
var det = new BoxInventoryGenerateDetailsDto(); var det = new BoxInventoryGenerateDetailsDto();
det.MaterialId = detItem.MaterialId; det.MaterialId = current_det==null?0: current_det.MaterialId;
det.Qty = detItem.Qty; det.Qty = detItem.Qty;
det.SerialNumbers = detItem.SerialNumbers; det.SerialNumbers = detItem.SerialNumbers;
x.Details.Add(det); x.Details.Add(det);
} }
} }
}); });
//提交处理 //提交处理

4
src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs
View File

@@ -90,9 +90,9 @@ namespace WMS.Web.Repositories
query = query.Where(w => (int)w.OrderType == dto.OrderType.Value); query = query.Where(w => (int)w.OrderType == dto.OrderType.Value);
if (dto.CreateBeginDate != null) if (dto.CreateBeginDate != null)
query = query.Where(w => w.CreateTime >= dto.CreateBeginDate.Value); query = query.Where(w => w.CreateTime.Date >= dto.CreateBeginDate.Value);
if (dto.CreateEndDate != null) if (dto.CreateEndDate != null)
query = query.Where(w => w.CreateTime <= dto.CreateEndDate.Value); query = query.Where(w => w.CreateTime.Date <= dto.CreateEndDate.Value);
int total = await query.CountAsync(); int total = await query.CountAsync();