This commit is contained in:
tongfei
2024-03-12 18:05:15 +08:00
parent 76af7a49ce
commit 8d08b97888

View File

@@ -175,30 +175,29 @@ namespace WMS.Web.Repositories
DeliveredQty = s.detail.DeliveredQty, DeliveredQty = s.detail.DeliveredQty,
ReceiveQty = s.detail.ReceiveQty, ReceiveQty = s.detail.ReceiveQty,
//采购:可入库数量=应入库数量-收货数量-已交数量+该明细的入库数量之和; //采购:可入库数量=应入库数量-收货数量-已交数量+该明细的入库数量之和;
AvailableQty = s.detail.AccruedQty - s.detail.ReceiveQty- s.detail.DeliveredQty+s.detail.RealityQty, //AvailableQty = s.detail.AccruedQty - s.detail.ReceiveQty- s.detail.DeliveredQty+s.detail.RealityQty,
AvailableQty = s.detail.AccruedQty - s.detail.ReceiveQty - s.detail.DeliveredQty,
Remark = s.detail.Remark, Remark = s.detail.Remark,
ErpDetailId=s.detail.ErpDetailId ErpDetailId=s.detail.ErpDetailId
}).ToListAsync(); }).ToListAsync();
//找到入库单通过erp明细ID //找到入库单通过erp明细ID
//var erpDetIds = list.GroupBy(x => x.ErpDetailId).Select(x => x.Key).ToList(); var erpDetIds = list.GroupBy(x => x.ErpDetailId).Select(x => x.Key).ToList();
//var instockDets= await _context.InStockDetails.Where(x =>erpDetIds.Contains(x.ErpDetailId)).ToListAsync(); var instockDets = await _context.InStockDetails.Where(x => erpDetIds.Contains(x.ErpDetailId)).ToListAsync();
//if (instockDets != null && instockDets.Count != 0) if (instockDets != null && instockDets.Count != 0)
//{ {
// list.ForEach(x => list.ForEach(x =>
// { {
// var current_instock_dets= instockDets.Where(t => t.ErpDetailId == x.ErpDetailId && t.MaterialId==x.MaterialId && t.Qty!=0).ToList(); var current_instock_dets = instockDets.Where(t => t.ErpDetailId == x.ErpDetailId && t.MaterialId == x.MaterialId && t.Qty != 0).ToList();
// if (current_instock_dets != null && current_instock_dets.Count != 0 && x.ErpDetailId==current_instock_dets.FirstOrDefault().ErpDetailId) if (current_instock_dets != null && current_instock_dets.Count != 0 && x.ErpDetailId == current_instock_dets.FirstOrDefault().ErpDetailId)
// { {
// //+该明细的入库数量之和;在这里处理 //+该明细的入库数量之和;在这里处理
// var instock_qty = current_instock_dets.Sum(s => s.Qty); var instock_qty = current_instock_dets.Sum(s => s.Qty);
// x.AvailableQty = x.AvailableQty + instock_qty; x.AvailableQty = x.AvailableQty + instock_qty;
// } }
// }); });
//} }
return list; return list;