Igor-Melnikov/ISEbd-21_Melnikov_I.O._BlacksmithWorkshop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

мердж 5 -> 6 #8

Merged
Igor-Melnikov merged 3 commits from lab5 into lab6 2023-04-24 00:08:41 +04:00
Conversation 0 Commits 3 Files Changed 1 +9 -8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bb4806b4d1 - Show all commits

17
BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs
View File

@ -35,7 +35,7 @@ namespace BlacksmithWorkShopBusinessLogic.BusinessLogics
/// <returns></returns>
public List<ReportManufactureComponentViewModel> GetManufactureComponent()
{
var components = _componentStorage.GetFullList();
//var components = _componentStorage.GetFullList();
var manufactures = _manufactureStorage.GetFullList();
var list = new List<ReportManufactureComponentViewModel>();
foreach (var manufacture in manufactures)
@ -47,14 +47,15 @@ namespace BlacksmithWorkShopBusinessLogic.BusinessLogics
TotalCount = 0,
TotalSum = 0
};
foreach (var component in components)
foreach (var component in manufacture.ManufactureComponents)
{
if (manufacture.ManufactureComponents.ContainsKey(component.Id))
{
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;
}
//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;
record.TotalSum += component.Value.Item2 * componentCost;
}
list.Add(record);
}