This commit is contained in:
tongfei
2024-03-11 15:37:10 +08:00
parent 8c36fc9399
commit e0183a8563
2 changed files with 9 additions and 4 deletions

View File

@@ -341,7 +341,7 @@ namespace WMS.Web.Domain.Services
{ {
task.Details.ForEach(x => task.Details.ForEach(x =>
{ {
var current_entityDets = dto.Details.Where(t => t.ErpDetailId == x.ErpDetailId).ToList(); var current_entityDets = dto.Details.Where(t => t.ErpDetailId == x.ErpDetailId && t.MaterialId==x.MaterialId).ToList();
if (current_entityDets != null && current_entityDets.Count != 0 && x.ErpDetailId == current_entityDets.FirstOrDefault().ErpDetailId) if (current_entityDets != null && current_entityDets.Count != 0 && x.ErpDetailId == current_entityDets.FirstOrDefault().ErpDetailId)
{ {
var current_entityDet_matQty = current_entityDets.Sum(x => x.Qty); var current_entityDet_matQty = current_entityDets.Sum(x => x.Qty);
@@ -477,7 +477,7 @@ namespace WMS.Web.Domain.Services
{ {
task.Details.ForEach(x => task.Details.ForEach(x =>
{ {
var current_entityDets = entity.Details.Where(t => t.ErpDetailId == x.ErpDetailId).ToList(); var current_entityDets = entity.Details.Where(t => t.ErpDetailId == x.ErpDetailId && t.MaterialId==x.MaterialId).ToList();
if (current_entityDets != null && current_entityDets.Count != 0 && x.ErpDetailId == current_entityDets.FirstOrDefault().ErpDetailId) if (current_entityDets != null && current_entityDets.Count != 0 && x.ErpDetailId == current_entityDets.FirstOrDefault().ErpDetailId)
{ {
var current_entityDet_matQty = current_entityDets.Sum(x => x.Qty); var current_entityDet_matQty = current_entityDets.Sum(x => x.Qty);

View File

@@ -93,9 +93,14 @@ namespace WMS.Web.Repositories
/// <returns></returns> /// <returns></returns>
public async Task<List<InStockTask>> GetList(List<int> ids) public async Task<List<InStockTask>> GetList(List<int> ids)
{ {
//var entitys = await _context.InStockTask
// .Include(s => s.Details.Where(x=>x.AccruedQty>0))
// .Where(f => ids.Contains(f.Id) && f.Details.Where(x=>x.AccruedQty>0).Count()>0)
// .ToListAsync();
//return entitys;
var entitys = await _context.InStockTask var entitys = await _context.InStockTask
.Include(s => s.Details.Where(x=>x.AccruedQty>0)) .Include(s => s.Details)
.Where(f => ids.Contains(f.Id) && f.Details.Where(x=>x.AccruedQty>0).Count()>0) .Where(f => ids.Contains(f.Id))
.ToListAsync(); .ToListAsync();
return entitys; return entitys;
} }