Compare commits

..

No commits in common. "b9bfcda5c19e78b2d0cbe33b012b6abecd608237" and "9348e3a207017063067b0b2756b786a859006766" have entirely different histories.

2 changed files with 7 additions and 5 deletions

View File

@ -33,6 +33,7 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
/// Получение списка компонент с указанием, в каких изделиях используются /// Получение списка компонент с указанием, в каких изделиях используются
public List<ReportCarComponentViewModel> GetCarComponents() public List<ReportCarComponentViewModel> GetCarComponents()
{ {
var components = _componentStorage.GetFullList();
var cars = _carStorage.GetFullList(); var cars = _carStorage.GetFullList();
var list = new List<ReportCarComponentViewModel>(); var list = new List<ReportCarComponentViewModel>();
foreach (var car in cars) foreach (var car in cars)
@ -43,10 +44,13 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
Components = new List<(string Component, int Count)>(), Components = new List<(string Component, int Count)>(),
TotalCount = 0 TotalCount = 0
}; };
foreach (var component in car.CarComponents.Values) foreach (var component in components)
{ {
record.Components.Add((component.Item1.ComponentName, component.Item2)); if (car.CarComponents.ContainsKey(component.Id))
record.TotalCount += component.Item2; {
record.Components.Add(new(component.ComponentName, car.CarComponents[component.Id].Item2));
record.TotalCount += car.CarComponents[component.Id].Item2;
}
} }
list.Add(record); list.Add(record);
} }

View File

@ -10,7 +10,6 @@ using System.Reflection.Metadata;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System.Xml.Linq;
namespace AutomobilePlantDatabaseImplement.Implements namespace AutomobilePlantDatabaseImplement.Implements
{ {
@ -101,7 +100,6 @@ namespace AutomobilePlantDatabaseImplement.Implements
} }
car.Update(model); car.Update(model);
car.UpdateComponents(context, model);
context.SaveChanges(); context.SaveChanges();
context.Database.CommitTransaction(); context.Database.CommitTransaction();