мердж 5 -> 6 #8

Merged
Igor-Melnikov merged 3 commits from lab5 into lab6 2023-04-24 00:08:41 +04:00
Showing only changes of commit 124865cd54 - Show all commits

View File

@ -35,7 +35,6 @@ namespace BlacksmithWorkShopBusinessLogic.BusinessLogics
/// <returns></returns>
public List<ReportManufactureComponentViewModel> GetManufactureComponent()
{
//var components = _componentStorage.GetFullList();
var manufactures = _manufactureStorage.GetFullList();
var list = new List<ReportManufactureComponentViewModel>();
foreach (var manufacture in manufactures)
@ -49,9 +48,6 @@ namespace BlacksmithWorkShopBusinessLogic.BusinessLogics
};
foreach (var component in manufacture.ManufactureComponents)
{
//record.Components.Add((component.ComponentName, manufacture.ManufactureComponents[component.Id].Item2, component.Cost * manufacture.ManufactureComponents[component.Id].Item2));
//record.TotalCount += manufacture.ManufactureComponents[component.Id].Item2;
//record.TotalSum += component.Cost * manufacture.ManufactureComponents[component.Id].Item2;
double componentCost = _componentStorage.GetElement(new() { Id = component.Key })?.Cost ?? 0;
record.Components.Add(new(component.Value.Item1.ComponentName, component.Value.Item2, componentCost));
record.TotalCount += component.Value.Item2;