safgerd/PIbd-23_Minhasapov_R.H._AutomobilePlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LabWork06_Base: Фиксы

Browse Source
This commit is contained in:
Safgerd 2023-04-23 16:03:47 +04:00
parent 5f91171e83
commit 73549e4a7b
4 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs
View File

@ -63,7 +63,8 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
DateCreate = viewModel.DateCreate,
DateImplement = viewModel.DateImplement,
Count = viewModel.Count,
Sum = viewModel.Sum
Sum = viewModel.Sum,
ImplementerId = viewModel.ImplementerId
};
if (rawModel.ImplementerId.HasValue)

20
AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/WorkModeling.cs
View File

@ -54,7 +54,7 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
{
return;
}
await RunOrderInWork(implementer, orders);
await RunOrderInWork(implementer);
await Task.Run(() =>
{
@ -98,31 +98,33 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
});
}
private async Task RunOrderInWork(ImplementerViewModel implementer, List<OrderViewModel> allOrders)
private async Task RunOrderInWork(ImplementerViewModel implementer)
{
if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0)
if (_orderLogic == null || implementer == null)
{
return;
}
try
{
// Выбираем из всех заказов тот, который выполняется данным исполнителем
var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
{
ImplementerId = implementer.Id,
Status = OrderStatus.Выполняется
}));
if (runOrder == null)
{
return;
}
_logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
// доделываем работу
await Task.Delay(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
_orderLogic.FinishOrder(new OrderBindingModel
_orderLogic.DeliveryOrder(new OrderBindingModel
{
Id = runOrder.Id
});
// отдыхаем
await Task.Delay(implementer.Qualification * _rnd.Next(10, 100));
Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
}
// заказа может не быть, просто игнорируем ошибку
catch (InvalidOperationException ex)

4
AutomobilePlant/AutomobilePlantDatabaseImplement/Implements/OrderStorage.cs
View File

@ -16,10 +16,6 @@ namespace AutomobilePlantDatabaseImplement.Implements
{
public OrderViewModel? GetElement(OrderSearchModel model)
{
if (!model.Id.HasValue)
{
return null;
}
using var context = new AutomobilePlantDatabase();
return context.Orders
.Include(x => x.Car)

4
AutomobilePlant/AutomobilePlantDatabaseImplement/Models/Order.cs
View File

@ -83,8 +83,8 @@ namespace AutomobilePlantDatabaseImplement.Models
DateImplement = DateImplement,
Id = Id,
Status = Status,
CarName = Car.CarName,
ClientFIO = Client.ClientFIO,
CarName = Car?.CarName ?? string.Empty,
ClientFIO = Client?.ClientFIO ?? string.Empty,
ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
};
}