From e43df6b023c22e6b0a4d1b5cb23c0d18203a41dc Mon Sep 17 00:00:00 2001 From: kamilia Date: Mon, 6 May 2024 21:14:20 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=B0=20=D1=82=D1=80=D0=B5=D1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataListSingleton.cs | 6 + .../AbstractShopListImplement/Implementer.cs | 56 ++++++ .../ImplementerStorage.cs | 107 +++++++++++ .../AbstractShopListImplement/Order.cs | 9 + .../BusinessLogics/ImplementerLogic.cs | 132 ++++++++++++++ .../BusinessLogics/OrderLogic.cs | 24 +++ .../BusinessLogics/WorkModeling.cs | 152 ++++++++++++++++ .../AircraftPlantContracts.csproj | 2 +- .../BindingModels/ImplementerBindingModel.cs | 18 ++ .../BindingModels/OrderBindingModel.cs | 5 + .../IImplementerLogic.cs | 20 +++ .../BusinessLogicsContracts/IOrderLogic.cs | 1 + .../BusinessLogicsContracts/IWorkProcess.cs | 15 ++ .../SearchModels/ImplementerSearchModel.cs | 15 ++ .../SearchModels/OrderSearchModel.cs | 5 +- .../StoragesContracts/IImplementerStorage.cs | 20 +++ .../ViewModels/ImplementerViewModel.cs | 23 +++ .../ViewModels/OrderViewModel.cs | 13 +- .../IImplementerModel.cs | 16 ++ .../AircraftPlantDataModels/IOrderModel.cs | 5 + .../AircraftPlantDatabase.cs | 1 + .../Implements/ImplementerStorage.cs | 98 +++++++++++ .../Implements/OrderStorage.cs | 48 ++++- .../Models/Implementer.cs | 64 +++++++ .../Models/Order.cs | 10 ++ .../DataFileSingleton.cs | 4 + .../AircraftPlantFileImplement/Implementer.cs | 79 +++++++++ .../ImplementerStorage.cs | 91 ++++++++++ .../AircraftPlantFileImplement/Order.cs | 7 + .../Controllers/ImplementerController.cs | 102 +++++++++++ AircraftPlant/AircraftPlantRestApi/Program.cs | 2 + .../FormImplementer.Designer.cs | 166 ++++++++++++++++++ .../AircraftPlantView/FormImplementer.cs | 137 +++++++++++++++ .../AircraftPlantView/FormImplementer.resx | 120 +++++++++++++ .../FormImplementers.Designer.cs | 110 ++++++++++++ .../AircraftPlantView/FormImplementers.cs | 104 +++++++++++ .../AircraftPlantView/FormImplementers.resx | 120 +++++++++++++ .../AircraftPlantView/FormMain.Designer.cs | 22 ++- AircraftPlant/AircraftPlantView/FormMain.cs | 9 + 39 files changed, 1928 insertions(+), 10 deletions(-) create mode 100644 AircraftPlant/AbstractShopListImplement/Implementer.cs create mode 100644 AircraftPlant/AbstractShopListImplement/ImplementerStorage.cs create mode 100644 AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/ImplementerLogic.cs create mode 100644 AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/WorkModeling.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/BindingModels/ImplementerBindingModel.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IImplementerLogic.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IWorkProcess.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/SearchModels/ImplementerSearchModel.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/StoragesContracts/IImplementerStorage.cs create mode 100644 AircraftPlant/AircraftPlantContracts»/ViewModels/ImplementerViewModel.cs create mode 100644 AircraftPlant/AircraftPlantDataModels/IImplementerModel.cs create mode 100644 AircraftPlant/AircraftPlantDatabaseImplement/Implements/ImplementerStorage.cs create mode 100644 AircraftPlant/AircraftPlantDatabaseImplement/Models/Implementer.cs create mode 100644 AircraftPlant/AircraftPlantFileImplement/Implementer.cs create mode 100644 AircraftPlant/AircraftPlantFileImplement/ImplementerStorage.cs create mode 100644 AircraftPlant/AircraftPlantRestApi/Controllers/ImplementerController.cs create mode 100644 AircraftPlant/AircraftPlantView/FormImplementer.Designer.cs create mode 100644 AircraftPlant/AircraftPlantView/FormImplementer.cs create mode 100644 AircraftPlant/AircraftPlantView/FormImplementer.resx create mode 100644 AircraftPlant/AircraftPlantView/FormImplementers.Designer.cs create mode 100644 AircraftPlant/AircraftPlantView/FormImplementers.cs create mode 100644 AircraftPlant/AircraftPlantView/FormImplementers.resx diff --git a/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs b/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs index 11b1cc2..362137c 100644 --- a/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs +++ b/AircraftPlant/AbstractShopListImplement/DataListSingleton.cs @@ -37,6 +37,11 @@ namespace AircraftPlantListImplement /// public List Clients { get; set; } + /// + /// Список классов-моделей исполнителей + /// + public List Implementers { get; set; } + /// /// Конструктор /// @@ -46,6 +51,7 @@ namespace AircraftPlantListImplement Orders = new List(); Planes = new List(); Clients = new List(); + Implementers = new List(); } /// /// Получить ссылку на класс diff --git a/AircraftPlant/AbstractShopListImplement/Implementer.cs b/AircraftPlant/AbstractShopListImplement/Implementer.cs new file mode 100644 index 0000000..5623ce6 --- /dev/null +++ b/AircraftPlant/AbstractShopListImplement/Implementer.cs @@ -0,0 +1,56 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantListImplement +{ + public class Implementer : IImplementerModel + { + public int Id { get; private set; } + public string ImplementerFIO { get; private set; } = string.Empty; + public string Password { get; private set; } = string.Empty; + public int WorkExperience { get; private set; } + public int Qualification { get; private set; } + public static Implementer? Create(ImplementerBindingModel? model) + { + if (model == null) + { + return null; + } + + return new Implementer() + { + Id = model.Id, + ImplementerFIO = model.ImplementerFIO, + Password = model.Password, + WorkExperience = model.WorkExperience, + Qualification = model.Qualification, + }; + } + public void Update(ImplementerBindingModel? model) + { + if (model == null) + { + return; + } + + ImplementerFIO = model.ImplementerFIO; + Password = model.Password; + WorkExperience = model.WorkExperience; + Qualification = model.Qualification; + } + public ImplementerViewModel GetViewModel => new() + { + Id = Id, + ImplementerFIO = ImplementerFIO, + Password = Password, + WorkExperience = WorkExperience, + Qualification = Qualification + }; + } +} \ No newline at end of file diff --git a/AircraftPlant/AbstractShopListImplement/ImplementerStorage.cs b/AircraftPlant/AbstractShopListImplement/ImplementerStorage.cs new file mode 100644 index 0000000..7055209 --- /dev/null +++ b/AircraftPlant/AbstractShopListImplement/ImplementerStorage.cs @@ -0,0 +1,107 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantListImplement +{ + public class ImplementerStorage : IImplementerStorage + { + private readonly DataListSingleton _source; + public ImplementerStorage() + { + _source = DataListSingleton.GetInstance(); + } + public List GetFullList() + { + var result = new List(); + foreach (var implementer in _source.Implementers) + { + result.Add(implementer.GetViewModel); + } + return result; + } + public List GetFilteredList(ImplementerSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + return result; + } + + foreach (var implementer in _source.Implementers) + { + if (implementer.ImplementerFIO.Contains(model.ImplementerFIO)) + { + result.Add(implementer.GetViewModel); + } + } + return result; + } + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue) + { + return null; + } + + foreach (var implementer in _source.Implementers) + { + if (model.Id.HasValue && model.Id == implementer.Id) + return implementer.GetViewModel; + if (!string.IsNullOrEmpty(model.ImplementerFIO) && !string.IsNullOrEmpty(model.Password) && + implementer.ImplementerFIO.Equals(model.ImplementerFIO) && implementer.Password.Equals(model.Password)) + return implementer.GetViewModel; + if (!string.IsNullOrEmpty(model.ImplementerFIO) && implementer.ImplementerFIO.Equals(model.ImplementerFIO)) + return implementer.GetViewModel; + } + return null; + } + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + model.Id = 1; + foreach (var implementer in _source.Implementers) + { + if (model.Id <= implementer.Id) + { + model.Id = implementer.Id + 1; + } + } + + var newImplementer = Implementer.Create(model); + if (newImplementer == null) + { + return null; + } + + _source.Implementers.Add(newImplementer); + return newImplementer.GetViewModel; + } + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + foreach (var implementer in _source.Implementers) + { + if (implementer.Id == model.Id) + { + implementer.Update(model); + return implementer.GetViewModel; + } + } + return null; + } + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + for (int i = 0; i < _source.Implementers.Count; ++i) + { + if (_source.Implementers[i].Id == model.Id) + { + var element = _source.Implementers[i]; + _source.Implementers.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} diff --git a/AircraftPlant/AbstractShopListImplement/Order.cs b/AircraftPlant/AbstractShopListImplement/Order.cs index 3a056b7..2446598 100644 --- a/AircraftPlant/AbstractShopListImplement/Order.cs +++ b/AircraftPlant/AbstractShopListImplement/Order.cs @@ -31,6 +31,11 @@ namespace AircraftPlantListImplement.Models /// public int ClientId { get; private set; } + /// + /// Идентификатор исполнителя + /// + public int? ImplementerId { get; private set; } + /// /// Количество изделий /// @@ -73,6 +78,7 @@ namespace AircraftPlantListImplement.Models Id = model.Id, PlaneId = model.PlaneId, ClientId = model.ClientId, + ImplementerId = model.ImplementerId, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -93,6 +99,8 @@ namespace AircraftPlantListImplement.Models Status = model.Status; DateImplement = model.DateImplement; + if (model.ImplementerId.HasValue) + ImplementerId = model.ImplementerId; } /// /// Получение модели заказа @@ -102,6 +110,7 @@ namespace AircraftPlantListImplement.Models Id = Id, PlaneId = PlaneId, ClientId = ClientId, + ImplementerId = ImplementerId, Count = Count, Sum = Sum, Status = Status, diff --git a/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/ImplementerLogic.cs b/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/ImplementerLogic.cs new file mode 100644 index 0000000..cd65fa1 --- /dev/null +++ b/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/ImplementerLogic.cs @@ -0,0 +1,132 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantBusinessLogic.BusinessLogics +{ + public class ImplementerLogic : IImplementerLogic + { + private readonly ILogger _logger; + + private readonly IImplementerStorage _implementerStorage; + + public ImplementerLogic(ILogger logger, IImplementerStorage implementerStorage) + { + _logger = logger; + _implementerStorage = implementerStorage; + } + + public List? ReadList(ImplementerSearchModel? model) + { + _logger.LogInformation("ReadList. ImplementerFIO:{ImplementerFIO}.Id:{Id}", model?.ImplementerFIO, model?.Id); + var list = model == null ? _implementerStorage.GetFullList() : _implementerStorage.GetFilteredList(model); + + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public ImplementerViewModel? ReadElement(ImplementerSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + + _logger.LogInformation("ReadElement. ImplementerFIO:{ImplementerFIO}.Id:{Id}", model.ImplementerFIO, model.Id); + + var element = _implementerStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + + public bool Create(ImplementerBindingModel model) + { + CheckModel(model); + + if (_implementerStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(ImplementerBindingModel model) + { + CheckModel(model); + + if (_implementerStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + + public bool Delete(ImplementerBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + + if (_implementerStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + private void CheckModel(ImplementerBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + throw new ArgumentNullException("У исполнителя должно быть ФИО", nameof(model.ImplementerFIO)); + } + if (string.IsNullOrEmpty(model.Password)) + { + throw new ArgumentNullException("У исполнителя должен быть пароль", nameof(model.Password)); + } + if (model.WorkExperience <= 0) + { + throw new ArgumentNullException("У исполнителя стаж должен быть больше 0", nameof(model.WorkExperience)); + } + if (model.Qualification <= 0) + { + throw new ArgumentNullException("У исполнителя квалификация должна быть больше 0", nameof(model.Qualification)); + } + + _logger.LogInformation("Implementer. ImplementerFIO:{ImplementerFIO}.Qualification:{Qualification}.WorkExperience:{WorkExperience} Id: {Id}", model.ImplementerFIO, model.Qualification, model.WorkExperience, model.Id); + var element = _implementerStorage.GetElement(new ImplementerSearchModel + { + ImplementerFIO = model.ImplementerFIO + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Исполнитель с таким ФИО уже существует"); + } + } + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/OrderLogic.cs b/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/OrderLogic.cs index f496482..c66e015 100644 --- a/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/OrderLogic.cs @@ -58,6 +58,30 @@ namespace AircraftPlantBusinessLogic.BusinessLogics return list; } /// + /// Получение отдельной записи + /// + /// + /// + /// + public OrderViewModel? ReadElement(OrderSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. Id:{ Id}", model.Id); + + var element = _orderStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + /// /// Создание заказа /// /// diff --git a/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/WorkModeling.cs b/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/WorkModeling.cs new file mode 100644 index 0000000..9d01d73 --- /dev/null +++ b/AircraftPlant/AircraftPlantBusinessLogic/BusinessLogics/WorkModeling.cs @@ -0,0 +1,152 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.BusinessLogicsContracts; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantBusinessLogic.BusinessLogics +{ + public class WorkModeling : IWorkProcess + { + private readonly ILogger _logger; + private readonly Random _rnd; + private IOrderLogic? _orderLogic; + public WorkModeling(ILogger logger) + { + _logger = logger; + _rnd = new Random(1000); + } + public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic) + { + _orderLogic = orderLogic; + var implementers = implementerLogic.ReadList(null); + if (implementers == null) + { + _logger.LogWarning("DoWork. Implementers is null"); + return; + } + + var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят }); + if (orders == null || orders.Count == 0) + { + _logger.LogWarning("DoWork. Orders is null or empty"); + return; + } + + _logger.LogDebug("DoWork for {Count} orders", orders.Count); + foreach (var implementer in implementers) + { + Task.Run(() => WorkerWorkAsync(implementer, orders)); + } + } + + /// + /// Имитация работы исполнителя + /// + /// + /// + private async Task WorkerWorkAsync(ImplementerViewModel implementer, List orders) + { + if (_orderLogic == null || implementer == null) + { + return; + } + await RunOrderInWork(implementer); + + await Task.Run(() => + { + foreach (var order in orders) + { + try + { + _logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id); + // пытаемся назначить заказ на исполнителя + lock (orderLock) + { + _orderLogic.TakeOrderInWork(new OrderBindingModel + { + Id = order.Id, + ImplementerId = implementer.Id + }); + } + + // делаем работу + Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count); + _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id); + _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = order.Id + }); + } + // кто-то мог уже перехватить заказ, игнорируем ошибку + catch (InvalidOperationException ex) + { + _logger.LogWarning(ex, "Error try get work"); + } + // заканчиваем выполнение имитации в случае иной ошибки + catch (Exception ex) + { + _logger.LogError(ex, "Error while do work"); + throw; + } + + // отдыхаем + Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100)); + } + }); + } + + /// + /// Ищем заказ, которые уже в работе (вдруг исполнителя прервали) + /// + /// + /// + private async Task RunOrderInWork(ImplementerViewModel implementer) + { + if (_orderLogic == null || implementer == null) + { + return; + } + try + { + 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); + // доделываем работу + Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count); + _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id); + _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = runOrder.Id + }); + + // отдыхаем + Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100)); + } + // заказа может не быть, просто игнорируем ошибку + catch (InvalidOperationException ex) + { + _logger.LogWarning(ex, "Error try get work"); + } + // а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации + catch (Exception ex) + { + _logger.LogError(ex, "Error while do work"); + throw; + } + } + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantContracts»/AircraftPlantContracts.csproj b/AircraftPlant/AircraftPlantContracts»/AircraftPlantContracts.csproj index 825be74..d2377af 100644 --- a/AircraftPlant/AircraftPlantContracts»/AircraftPlantContracts.csproj +++ b/AircraftPlant/AircraftPlantContracts»/AircraftPlantContracts.csproj @@ -2,7 +2,7 @@ net6.0 - AircraftPlantContracts_ + AircraftPlantContracts enable enable diff --git a/AircraftPlant/AircraftPlantContracts»/BindingModels/ImplementerBindingModel.cs b/AircraftPlant/AircraftPlantContracts»/BindingModels/ImplementerBindingModel.cs new file mode 100644 index 0000000..53469a2 --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/BindingModels/ImplementerBindingModel.cs @@ -0,0 +1,18 @@ +using AircraftPlantDataModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.BindingModels +{ + public class ImplementerBindingModel : IImplementerModel + { + public int Id { get; set; } + public string ImplementerFIO { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; + public int WorkExperience { get; set; } + public int Qualification { get; set; } + } +} diff --git a/AircraftPlant/AircraftPlantContracts»/BindingModels/OrderBindingModel.cs b/AircraftPlant/AircraftPlantContracts»/BindingModels/OrderBindingModel.cs index 4024a92..d5c963c 100644 --- a/AircraftPlant/AircraftPlantContracts»/BindingModels/OrderBindingModel.cs +++ b/AircraftPlant/AircraftPlantContracts»/BindingModels/OrderBindingModel.cs @@ -28,6 +28,11 @@ namespace AircraftPlantContracts.BindingModels /// public int ClientId { get; set; } + /// + /// Идентификатор исполнителя + /// + public int? ImplementerId { get; set; } + /// /// Количество изделий /// diff --git a/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IImplementerLogic.cs b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IImplementerLogic.cs new file mode 100644 index 0000000..8840aa6 --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IImplementerLogic.cs @@ -0,0 +1,20 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.BusinessLogicsContracts +{ + public interface IImplementerLogic + { + List? ReadList(ImplementerSearchModel? model); + ImplementerViewModel? ReadElement(ImplementerSearchModel? model); + bool Create(ImplementerBindingModel? model); + bool Update(ImplementerBindingModel? model); + bool Delete(ImplementerBindingModel? model); + } +} diff --git a/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IOrderLogic.cs b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IOrderLogic.cs index a3b5ca4..48cb448 100644 --- a/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IOrderLogic.cs +++ b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IOrderLogic.cs @@ -12,6 +12,7 @@ namespace AircraftPlantContracts.BusinessLogicsContracts public interface IOrderLogic { List? ReadList(OrderSearchModel? model); + OrderViewModel? ReadElement(OrderSearchModel model); bool CreateOrder(OrderBindingModel model); bool TakeOrderInWork(OrderBindingModel model); bool FinishOrder(OrderBindingModel model); diff --git a/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IWorkProcess.cs b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IWorkProcess.cs new file mode 100644 index 0000000..876e910 --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/BusinessLogicsContracts/IWorkProcess.cs @@ -0,0 +1,15 @@ +using AircraftPlantContracts.BusinessLogicsContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.BusinessLogicsContracts +{ + public interface IWorkProcess + { + void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic); + } + +} diff --git a/AircraftPlant/AircraftPlantContracts»/SearchModels/ImplementerSearchModel.cs b/AircraftPlant/AircraftPlantContracts»/SearchModels/ImplementerSearchModel.cs new file mode 100644 index 0000000..29a3394 --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/SearchModels/ImplementerSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.SearchModels +{ + public class ImplementerSearchModel + { + public int? Id { get; set; } + public string? ImplementerFIO { get; set; } + public string? Password { get; set; } + } +} diff --git a/AircraftPlant/AircraftPlantContracts»/SearchModels/OrderSearchModel.cs b/AircraftPlant/AircraftPlantContracts»/SearchModels/OrderSearchModel.cs index af6cf71..4975b61 100644 --- a/AircraftPlant/AircraftPlantContracts»/SearchModels/OrderSearchModel.cs +++ b/AircraftPlant/AircraftPlantContracts»/SearchModels/OrderSearchModel.cs @@ -1,4 +1,5 @@ -using System; +using AircraftPlantDataModels.Enums; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -10,6 +11,8 @@ namespace AircraftPlantContracts.SearchModels { public int? Id { get; set; } public int? ClientId { get; set; } + public int? ImplementerId { get; set; } + public OrderStatus? Status { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } } diff --git a/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IImplementerStorage.cs b/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IImplementerStorage.cs new file mode 100644 index 0000000..43d19cf --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/StoragesContracts/IImplementerStorage.cs @@ -0,0 +1,20 @@ +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.StoragesContracts +{ + public interface IImplementerStorage + { + List GetFullList(); + List GetFilteredList(ImplementerSearchModel model); + ImplementerViewModel? GetElement(ImplementerSearchModel model); + ImplementerViewModel? Insert(ImplementerBindingModel model); + ImplementerViewModel? Update(ImplementerBindingModel model); + ImplementerViewModel? Delete(ImplementerBindingModel model); + } +} diff --git a/AircraftPlant/AircraftPlantContracts»/ViewModels/ImplementerViewModel.cs b/AircraftPlant/AircraftPlantContracts»/ViewModels/ImplementerViewModel.cs new file mode 100644 index 0000000..5a96ee4 --- /dev/null +++ b/AircraftPlant/AircraftPlantContracts»/ViewModels/ImplementerViewModel.cs @@ -0,0 +1,23 @@ +using AircraftPlantDataModels; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantContracts.ViewModels +{ + public class ImplementerViewModel : IImplementerModel + { + public int Id { get; set; } + [DisplayName("ФИО исполнителя")] + public string ImplementerFIO { get; set; } = string.Empty; + [DisplayName("Пароль")] + public string Password { get; set; } = string.Empty; + [DisplayName("Опыт работы")] + public int WorkExperience { get; set; } + [DisplayName("Квалификация")] + public int Qualification { get; set; } + } +} diff --git a/AircraftPlant/AircraftPlantContracts»/ViewModels/OrderViewModel.cs b/AircraftPlant/AircraftPlantContracts»/ViewModels/OrderViewModel.cs index 7e17c6d..62c76af 100644 --- a/AircraftPlant/AircraftPlantContracts»/ViewModels/OrderViewModel.cs +++ b/AircraftPlant/AircraftPlantContracts»/ViewModels/OrderViewModel.cs @@ -41,7 +41,18 @@ namespace AircraftPlantContracts.ViewModels /// [DisplayName("ФИО клиента")] public string ClientFIO { get; set; } = string.Empty; - + + /// + /// Идентификатор исполнителя + /// + public int? ImplementerId { get; set; } + + /// + /// ФИО исполнителя + /// + [DisplayName("ФИО исполнителя")] + public string ImplementerFIO { get; set; } = string.Empty; + /// /// Количество изделий /// diff --git a/AircraftPlant/AircraftPlantDataModels/IImplementerModel.cs b/AircraftPlant/AircraftPlantDataModels/IImplementerModel.cs new file mode 100644 index 0000000..2378b36 --- /dev/null +++ b/AircraftPlant/AircraftPlantDataModels/IImplementerModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantDataModels +{ + public interface IImplementerModel : IId + { + string ImplementerFIO { get; } + string Password { get; } + int WorkExperience { get; } + int Qualification { get; } + } +} diff --git a/AircraftPlant/AircraftPlantDataModels/IOrderModel.cs b/AircraftPlant/AircraftPlantDataModels/IOrderModel.cs index dc17f38..03d2e08 100644 --- a/AircraftPlant/AircraftPlantDataModels/IOrderModel.cs +++ b/AircraftPlant/AircraftPlantDataModels/IOrderModel.cs @@ -22,6 +22,11 @@ namespace AircraftPlantDataModels.Models /// int ClientId { get; } + /// + /// Идентификатор исполнителя + /// + int? ImplementerId { get; } + /// /// Количество изделий /// diff --git a/AircraftPlant/AircraftPlantDatabaseImplement/AircraftPlantDatabase.cs b/AircraftPlant/AircraftPlantDatabaseImplement/AircraftPlantDatabase.cs index 832be49..550c374 100644 --- a/AircraftPlant/AircraftPlantDatabaseImplement/AircraftPlantDatabase.cs +++ b/AircraftPlant/AircraftPlantDatabaseImplement/AircraftPlantDatabase.cs @@ -24,5 +24,6 @@ namespace AircraftPlantDatabaseImplement public virtual DbSet PlaneComponents { set; get; } public virtual DbSet Orders { set; get; } public virtual DbSet Clients { set; get; } + public virtual DbSet Implementers { set; get; } } } diff --git a/AircraftPlant/AircraftPlantDatabaseImplement/Implements/ImplementerStorage.cs b/AircraftPlant/AircraftPlantDatabaseImplement/Implements/ImplementerStorage.cs new file mode 100644 index 0000000..f20f8f7 --- /dev/null +++ b/AircraftPlant/AircraftPlantDatabaseImplement/Implements/ImplementerStorage.cs @@ -0,0 +1,98 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.StoragesContracts; +using AircraftPlantContracts.ViewModels; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantDatabaseImplement.Implements +{ + public class ImplementerStorage : IImplementerStorage + { + public List GetFullList() + { + using var context = new AircraftPlantDatabase(); + return context.Implementers + .Include(x => x.Orders) + .Select(x => x.GetViewModel) + .ToList(); + } + public List GetFilteredList(ImplementerSearchModel model) + { + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + return new(); + } + + using var context = new AircraftPlantDatabase(); + return context.Implementers + .Include(x => x.Orders) + .Where(x => x.ImplementerFIO.Contains(model.ImplementerFIO)) + .Select(x => x.GetViewModel) + .ToList(); + } + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + using var context = new AircraftPlantDatabase(); + if (model.Id.HasValue) + return context.Implementers + .Include(x => x.Orders) + .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)? + .GetViewModel; + + else if (!string.IsNullOrEmpty(model.ImplementerFIO) && !string.IsNullOrEmpty(model.Password)) + return context.Implementers.Include(x => x.Orders) + .FirstOrDefault(x => x.ImplementerFIO == model.ImplementerFIO && x.Password == model.Password)? + .GetViewModel; + + else if (!string.IsNullOrEmpty(model.ImplementerFIO)) + return context.Implementers.Include(x => x.Orders) + .FirstOrDefault(x => x.ImplementerFIO == model.ImplementerFIO)? + .GetViewModel; + + return null; + } + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + var newImplementer = Implementer.Create(model); + if (newImplementer == null) + { + return null; + } + + using var context = new AircraftPlantDatabase(); + context.Implementers.Add(newImplementer); + context.SaveChanges(); + return newImplementer.GetViewModel; + } + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + using var context = new AircraftPlantDatabase(); + var implementer = context.Implementers.Include(x => x.Orders).FirstOrDefault(x => x.Id == model.Id); + if (implementer == null) + { + return null; + } + + implementer.Update(model); + context.SaveChanges(); + return implementer.GetViewModel; + } + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + using var context = new AircraftPlantDatabase(); + var element = context.Implementers.Include(x => x.Orders).FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + context.Implementers.Remove(element); + context.SaveChanges(); + return element.GetViewModel; + } + return null; + } + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantDatabaseImplement/Implements/OrderStorage.cs b/AircraftPlant/AircraftPlantDatabaseImplement/Implements/OrderStorage.cs index 745c49e..1a86b27 100644 --- a/AircraftPlant/AircraftPlantDatabaseImplement/Implements/OrderStorage.cs +++ b/AircraftPlant/AircraftPlantDatabaseImplement/Implements/OrderStorage.cs @@ -15,13 +15,14 @@ namespace AircraftPlantDatabaseImplement.Implements return context.Orders .Include(x => x.Plane) .Include(x => x.Client) + .Include(x => x.Implementer) .Select(x => x.GetViewModel) .ToList(); } public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue && !model.ClientId.HasValue && (!model.DateFrom.HasValue || !model.DateTo.HasValue)) + if (!model.Id.HasValue && !model.ClientId.HasValue && (!model.DateFrom.HasValue || !model.DateTo.HasValue) && model.Status == null) { return new(); } @@ -31,16 +32,29 @@ namespace AircraftPlantDatabaseImplement.Implements return context.Orders .Include(x => x.Client) .Include(x => x.Plane) + .Include(x => x.Implementer) .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) .Select(x => x.GetViewModel) .ToList(); } + if (model.Status.HasValue) + { + return context.Orders + .Include(x => x.Plane) + .Include(x => x.Client) + .Include(x => x.Implementer) + .Where(x => x.Status == model.Status) + .Select(x => x.GetViewModel) + .ToList(); + } + if (model.ClientId.HasValue) { return context.Orders .Include(x => x.Plane) .Include(x => x.Client) + .Include(x => x.Implementer) .Where(x => x.ClientId == model.ClientId) .Select(x => x.GetViewModel) .ToList(); @@ -61,11 +75,37 @@ namespace AircraftPlantDatabaseImplement.Implements return null; } using var context = new AircraftPlantDatabase(); - return context.Orders + if (model.Id.HasValue) + { + return context.Orders .Include(x => x.Plane) .Include(x => x.Client) - .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))? - .GetViewModel; + .Include(x => x.Implementer) + .FirstOrDefault(x => x.Id == model.Id) + ?.GetViewModel; + } + + if (model.ImplementerId.HasValue && model.Status.HasValue) + { + return context.Orders + .Include(x => x.Plane) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => x.ImplementerId == model.ImplementerId && x.Status == model.Status) + ?.GetViewModel; + } + + if (model.ImplementerId.HasValue) + { + return context.Orders + .Include(x => x.Plane) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => x.ImplementerId == model.ImplementerId) + ?.GetViewModel; + } + + return null; } public OrderViewModel? Insert(OrderBindingModel model) diff --git a/AircraftPlant/AircraftPlantDatabaseImplement/Models/Implementer.cs b/AircraftPlant/AircraftPlantDatabaseImplement/Models/Implementer.cs new file mode 100644 index 0000000..f6176d2 --- /dev/null +++ b/AircraftPlant/AircraftPlantDatabaseImplement/Models/Implementer.cs @@ -0,0 +1,64 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantDatabaseImplement.Models +{ + public class Implementer : IImplementerModel + { + public int Id { get; private set; } + [Required] + public string ImplementerFIO { get; private set; } = string.Empty; + [Required] + public string Password { get; private set; } = string.Empty; + [Required] + public int WorkExperience { get; private set; } + [Required] + public int Qualification { get; private set; } + [ForeignKey("ImplementerId")] + public virtual List Orders { get; set; } = new(); + public static Implementer? Create(ImplementerBindingModel model) + { + if (model == null) + { + return null; + } + + return new Implementer() + { + Id = model.Id, + ImplementerFIO = model.ImplementerFIO, + Password = model.Password, + WorkExperience = model.WorkExperience, + Qualification = model.Qualification + }; + } + public void Update(ImplementerBindingModel model) + { + if (model == null) + { + return; + } + + ImplementerFIO = model.ImplementerFIO; + Password = model.Password; + WorkExperience = model.WorkExperience; + Qualification = model.Qualification; + } + public ImplementerViewModel GetViewModel => new() + { + Id = Id, + ImplementerFIO = ImplementerFIO, + Password = Password, + WorkExperience = WorkExperience, + Qualification = Qualification, + }; + } +} diff --git a/AircraftPlant/AircraftPlantDatabaseImplement/Models/Order.cs b/AircraftPlant/AircraftPlantDatabaseImplement/Models/Order.cs index abfece9..fe4a767 100644 --- a/AircraftPlant/AircraftPlantDatabaseImplement/Models/Order.cs +++ b/AircraftPlant/AircraftPlantDatabaseImplement/Models/Order.cs @@ -20,6 +20,10 @@ namespace AircraftPlantDatabaseImplement.Models public Client Client { get; set; } = new(); + public int? ImplementerId { get; set; } + + public virtual Implementer? Implementer { get; set; } = new(); + [Required] public int Count { get; set; } @@ -47,6 +51,8 @@ namespace AircraftPlantDatabaseImplement.Models Plane = context.Planes.First(x => x.Id == model.PlaneId), ClientId = model.ClientId, Client = context.Clients.First(x => x.Id == model.ClientId), + ImplementerId = model.ImplementerId, + Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -63,6 +69,8 @@ namespace AircraftPlantDatabaseImplement.Models } Status = model.Status; DateImplement = model.DateImplement; + if (model.ImplementerId.HasValue) + ImplementerId = model.ImplementerId; } public OrderViewModel GetViewModel => new() @@ -72,6 +80,8 @@ namespace AircraftPlantDatabaseImplement.Models PlaneName = Plane.PlaneName, ClientId = ClientId, ClientFIO = Client.ClientFIO, + ImplementerId = ImplementerId, + ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty, Count = Count, Sum = Sum, Status = Status, diff --git a/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs b/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs index fac96aa..9f98dcd 100644 --- a/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs +++ b/AircraftPlant/AircraftPlantFileImplement/DataFileSingleton.cs @@ -15,10 +15,12 @@ namespace AircraftPlantFileImplement private readonly string OrderFileName = "Order.xml"; private readonly string PlaneFileName = "Plane.xml"; private readonly string ClientFileName = "Client.xml"; + private readonly string ImplementerFileName = "Implementer.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Planes { get; private set; } public List Clients { get; set; } + public List Implementers { get; set; } public static DataFileSingleton GetInstance() { if (instance == null) @@ -31,12 +33,14 @@ namespace AircraftPlantFileImplement public void SavePlanes() => SaveData(Planes, PlaneFileName, "Planes", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); + public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Planes = LoadData(PlaneFileName, "Plane", x => Plane.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; + Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { diff --git a/AircraftPlant/AircraftPlantFileImplement/Implementer.cs b/AircraftPlant/AircraftPlantFileImplement/Implementer.cs new file mode 100644 index 0000000..3755ba8 --- /dev/null +++ b/AircraftPlant/AircraftPlantFileImplement/Implementer.cs @@ -0,0 +1,79 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace AircraftPlantFileImplement +{ + public class Implementer : IImplementerModel + { + public int Id { get; private set; } + public string ImplementerFIO { get; private set; } = string.Empty; + public string Password { get; private set; } = string.Empty; + public int WorkExperience { get; private set; } + public int Qualification { get; private set; } + public static Implementer? Create(ImplementerBindingModel? model) + { + if (model == null) + { + return null; + } + + return new Implementer() + { + Id = model.Id, + ImplementerFIO = model.ImplementerFIO, + Password = model.Password, + WorkExperience = model.WorkExperience, + Qualification = model.Qualification, + }; + } + public static Implementer? Create(XElement element) + { + if (element == null) + { + return null; + } + + return new Implementer() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ImplementerFIO = element.Element("ImplementerFIO")!.Value, + Password = element.Element("Password")!.Value, + WorkExperience = Convert.ToInt32(element.Element("WorkExperience")!.Value), + Qualification = Convert.ToInt32(element.Element("Qualification")!.Value) + }; + } + public void Update(ImplementerBindingModel? model) + { + if (model == null) + { + return; + } + + ImplementerFIO = model.ImplementerFIO; + Password = model.Password; + WorkExperience = model.WorkExperience; + Qualification = model.Qualification; + } + public ImplementerViewModel GetViewModel => new() + { + Id = Id, + ImplementerFIO = ImplementerFIO, + Password = Password, + WorkExperience = WorkExperience, + Qualification = Qualification + }; + public XElement GetXElement => new("Implementer", + new XAttribute("Id", Id), + new XElement("ImplementerFIO", ImplementerFIO), + new XElement("Password", Password), + new XElement("WorkExperience", WorkExperience), + new XElement("Qualification", Qualification)); + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantFileImplement/ImplementerStorage.cs b/AircraftPlant/AircraftPlantFileImplement/ImplementerStorage.cs new file mode 100644 index 0000000..60c6f60 --- /dev/null +++ b/AircraftPlant/AircraftPlantFileImplement/ImplementerStorage.cs @@ -0,0 +1,91 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.StoragesContracts; +using AircraftPlantContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AircraftPlantFileImplement +{ + public class ImplementerStorage : IImplementerStorage + { + private readonly DataFileSingleton _source; + public ImplementerStorage() + { + _source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return _source.Implementers + .Select(x => x.GetViewModel) + .ToList(); + } + public List GetFilteredList(ImplementerSearchModel model) + { + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + return new(); + } + + return _source.Implementers + .Where(x => x.ImplementerFIO.Contains(model.ImplementerFIO)) + .Select(x => x.GetViewModel) + .ToList(); + } + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + if (!string.IsNullOrEmpty(model.ImplementerFIO) || model.Id.HasValue) + { + return _source.Implementers.FirstOrDefault(x => + (!string.IsNullOrEmpty(model.ImplementerFIO) && x.ImplementerFIO == model.ImplementerFIO) || + (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + else if (!string.IsNullOrEmpty(model.ImplementerFIO) && !string.IsNullOrEmpty(model.Password)) + return _source.Implementers.FirstOrDefault(x => + x.ImplementerFIO == model.ImplementerFIO && x.Password == model.Password)?.GetViewModel; + + return null; + } + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1; + + var newImplementer = Implementer.Create(model); + if (newImplementer == null) + { + return null; + } + + _source.Implementers.Add(newImplementer); + _source.SaveImplementers(); + return newImplementer.GetViewModel; + } + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + var implementer = _source.Implementers.FirstOrDefault(x => x.Id == model.Id); + if (implementer == null) + { + return null; + } + + implementer.Update(model); + _source.SaveImplementers(); + return implementer.GetViewModel; + } + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + var element = _source.Implementers.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + _source.Implementers.Remove(element); + _source.SaveImplementers(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/AircraftPlant/AircraftPlantFileImplement/Order.cs b/AircraftPlant/AircraftPlantFileImplement/Order.cs index 4be03f1..bf3af81 100644 --- a/AircraftPlant/AircraftPlantFileImplement/Order.cs +++ b/AircraftPlant/AircraftPlantFileImplement/Order.cs @@ -16,6 +16,7 @@ namespace AircraftPlantFileImplement.Models public int Id { get; private set; } public int PlaneId { get; private set; } public int ClientId { get; private set; } + public int? ImplementerId { get; private set; } public int Count { get; private set; } public double Sum { get; private set; } public OrderStatus Status { get; private set; } @@ -32,6 +33,7 @@ namespace AircraftPlantFileImplement.Models Id = model.Id, PlaneId = model.PlaneId, ClientId = model.ClientId, + ImplementerId = model.ImplementerId, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -50,6 +52,7 @@ namespace AircraftPlantFileImplement.Models Id = Convert.ToInt32(element.Attribute("Id")!.Value), PlaneId = Convert.ToInt32(element.Element("PlaneId")!.Value), ClientId = Convert.ToInt32(element.Element("ClientId")!.Value), + ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value), Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), @@ -66,12 +69,15 @@ namespace AircraftPlantFileImplement.Models Status = model.Status; DateImplement = model.DateImplement; + if (model.ImplementerId.HasValue) + ImplementerId = model.ImplementerId; } public OrderViewModel GetViewModel => new() { Id = Id, PlaneId = PlaneId, ClientId = ClientId, + ImplementerId = ImplementerId, Count = Count, Sum = Sum, Status = Status, @@ -82,6 +88,7 @@ namespace AircraftPlantFileImplement.Models new XAttribute("Id", Id), new XElement("PlaneId", PlaneId), new XElement("ClientId", ClientId), + new XElement("ImplementerId", ImplementerId), new XElement("Count", Count.ToString()), new XElement("Sum", Sum.ToString()), new XElement("Status", Status.ToString()), diff --git a/AircraftPlant/AircraftPlantRestApi/Controllers/ImplementerController.cs b/AircraftPlant/AircraftPlantRestApi/Controllers/ImplementerController.cs new file mode 100644 index 0000000..2c2543a --- /dev/null +++ b/AircraftPlant/AircraftPlantRestApi/Controllers/ImplementerController.cs @@ -0,0 +1,102 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.BusinessLogicsContracts; +using AircraftPlantContracts.SearchModels; +using AircraftPlantContracts.ViewModels; +using AircraftPlantDataModels.Enums; +using DocumentFormat.OpenXml.Office2010.Excel; +using Microsoft.AspNetCore.Mvc; + +namespace AircraftPlantRestApi.Controllers +{ + [Route("api/[controller]/[action]")] + [ApiController] + public class ImplementerController : Controller + { + private readonly ILogger _logger; + private readonly IOrderLogic _order; + private readonly IImplementerLogic _logic; + public ImplementerController(IOrderLogic order, IImplementerLogic logic, ILogger logger) + { + _logger = logger; + _order = order; + _logic = logic; + } + [HttpGet] + public ImplementerViewModel? Login(string login, string password) + { + try + { + return _logic.ReadElement(new ImplementerSearchModel + { + ImplementerFIO = login, + Password = password + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка авторизации сотрудника"); + throw; + } + } + [HttpGet] + public List? GetNewOrders() + { + try + { + return _order.ReadList(new OrderSearchModel + { + Status = OrderStatus.Принят + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения новых заказов"); + throw; + } + } + [HttpGet] + public OrderViewModel? GetImplementerOrder(int implementerId) + { + try + { + return _order.ReadElement(new OrderSearchModel + { + ImplementerId = implementerId + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения текущего заказа исполнителя"); + + throw; + } + } + [HttpPost] + public void TakeOrderInWork(OrderBindingModel model) + { + try + { + _order.TakeOrderInWork(model); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу", model.Id); + throw; + } + } + [HttpPost] + public void FinishOrder(OrderBindingModel model) + { + try + { + _order.FinishOrder(model); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о готовности заказа с№{ Id}", model.Id); + throw; + } + } + } +} + diff --git a/AircraftPlant/AircraftPlantRestApi/Program.cs b/AircraftPlant/AircraftPlantRestApi/Program.cs index 947cb58..677f5b7 100644 --- a/AircraftPlant/AircraftPlantRestApi/Program.cs +++ b/AircraftPlant/AircraftPlantRestApi/Program.cs @@ -13,10 +13,12 @@ builder.Logging.AddLog4Net("log4net.config"); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddControllers(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle diff --git a/AircraftPlant/AircraftPlantView/FormImplementer.Designer.cs b/AircraftPlant/AircraftPlantView/FormImplementer.Designer.cs new file mode 100644 index 0000000..0d4910f --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormImplementer.Designer.cs @@ -0,0 +1,166 @@ +namespace AircraftPlantView +{ + partial class FormImplementer + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + labelImplementerFIO = new Label(); + labelPassword = new Label(); + labelWorkExperience = new Label(); + labelQualification = new Label(); + numericUpDownWorkExperience = new NumericUpDown(); + numericUpDownQualification = new NumericUpDown(); + textBoxImplementerFIO = new TextBox(); + textBoxPassword = new TextBox(); + buttonSave = new Button(); + buttonCancel = new Button(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWorkExperience).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownQualification).BeginInit(); + SuspendLayout(); + // + // labelImplementerFIO + // + labelImplementerFIO.AutoSize = true; + labelImplementerFIO.Location = new Point(12, 23); + labelImplementerFIO.Name = "labelImplementerFIO"; + labelImplementerFIO.Size = new Size(45, 20); + labelImplementerFIO.TabIndex = 0; + labelImplementerFIO.Text = "ФИО:"; + // + // labelPassword + // + labelPassword.AutoSize = true; + labelPassword.Location = new Point(12, 64); + labelPassword.Name = "labelPassword"; + labelPassword.Size = new Size(65, 20); + labelPassword.TabIndex = 1; + labelPassword.Text = "Пароль:"; + // + // labelWorkExperience + // + labelWorkExperience.AutoSize = true; + labelWorkExperience.Location = new Point(12, 106); + labelWorkExperience.Name = "labelWorkExperience"; + labelWorkExperience.Size = new Size(105, 20); + labelWorkExperience.TabIndex = 2; + labelWorkExperience.Text = "Опыт работы:"; + // + // labelQualification + // + labelQualification.AutoSize = true; + labelQualification.Location = new Point(12, 148); + labelQualification.Name = "labelQualification"; + labelQualification.Size = new Size(120, 20); + labelQualification.TabIndex = 3; + labelQualification.Text = "Классификация:"; + // + // numericUpDownWorkExperience + // + numericUpDownWorkExperience.Location = new Point(153, 104); + numericUpDownWorkExperience.Name = "numericUpDownWorkExperience"; + numericUpDownWorkExperience.Size = new Size(256, 27); + numericUpDownWorkExperience.TabIndex = 4; + // + // numericUpDownQualification + // + numericUpDownQualification.Location = new Point(153, 148); + numericUpDownQualification.Name = "numericUpDownQualification"; + numericUpDownQualification.Size = new Size(256, 27); + numericUpDownQualification.TabIndex = 5; + // + // textBoxImplementerFIO + // + textBoxImplementerFIO.Location = new Point(153, 20); + textBoxImplementerFIO.Name = "textBoxImplementerFIO"; + textBoxImplementerFIO.Size = new Size(256, 27); + textBoxImplementerFIO.TabIndex = 6; + // + // textBoxPassword + // + textBoxPassword.Location = new Point(153, 61); + textBoxPassword.Name = "textBoxPassword"; + textBoxPassword.Size = new Size(256, 27); + textBoxPassword.TabIndex = 7; + // + // buttonSave + // + buttonSave.Location = new Point(213, 197); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(94, 29); + buttonSave.TabIndex = 8; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += buttonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(315, 197); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 9; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += buttonCancel_Click; + // + // FormImplementer + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(425, 239); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(textBoxPassword); + Controls.Add(textBoxImplementerFIO); + Controls.Add(numericUpDownQualification); + Controls.Add(numericUpDownWorkExperience); + Controls.Add(labelQualification); + Controls.Add(labelWorkExperience); + Controls.Add(labelPassword); + Controls.Add(labelImplementerFIO); + Name = "FormImplementer"; + Text = "Исполнитель"; + Load += FormImplementer_Load; + ((System.ComponentModel.ISupportInitialize)numericUpDownWorkExperience).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownQualification).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelImplementerFIO; + private Label labelPassword; + private Label labelWorkExperience; + private Label labelQualification; + private NumericUpDown numericUpDownWorkExperience; + private NumericUpDown numericUpDownQualification; + private TextBox textBoxImplementerFIO; + private TextBox textBoxPassword; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormImplementer.cs b/AircraftPlant/AircraftPlantView/FormImplementer.cs new file mode 100644 index 0000000..736a715 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormImplementer.cs @@ -0,0 +1,137 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.BusinessLogicsContracts; +using AircraftPlantContracts.SearchModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AircraftPlantView +{ + public partial class FormImplementer : Form + { + /// + /// Логгер + /// + private readonly ILogger _logger; + + /// + /// Бизнес-логика для исполнителей + /// + private readonly IImplementerLogic _logic; + + /// + /// Идентификатор + /// + private int? _id; + public int Id { set { _id = value; } } + + /// + /// Конструктор + /// + /// + /// + public FormImplementer(ILogger logger, IImplementerLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + /// + /// Загрузка информации о исполнителе + /// + /// + /// + private void FormImplementer_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + try + { + _logger.LogInformation("Получение исполнителя"); + var view = _logic.ReadElement(new ImplementerSearchModel + { + Id = _id.Value + }); + if (view != null) + { + textBoxImplementerFIO.Text = view.ImplementerFIO; + textBoxPassword.Text = view.Password; + numericUpDownQualification.Value = view.Qualification; + numericUpDownWorkExperience.Value = view.WorkExperience; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения исполнителя"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + /// + /// Кнопка "Сохранить" + /// + /// + /// + private void buttonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxPassword.Text)) + { + MessageBox.Show("Заполните пароль", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxImplementerFIO.Text)) + { + MessageBox.Show("Заполните ФИО", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Сохранение исполнителя"); + try + { + var model = new ImplementerBindingModel + { + Id = _id ?? 0, + ImplementerFIO = textBoxImplementerFIO.Text, + Password = textBoxPassword.Text, + Qualification = (int)numericUpDownQualification.Value, + WorkExperience = (int)numericUpDownWorkExperience.Value, + }; + + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения исполнителя"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + /// + /// Кнопка "Отмена" + /// + /// + /// + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/AircraftPlant/AircraftPlantView/FormImplementer.resx b/AircraftPlant/AircraftPlantView/FormImplementer.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormImplementer.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormImplementers.Designer.cs b/AircraftPlant/AircraftPlantView/FormImplementers.Designer.cs new file mode 100644 index 0000000..e1d80db --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormImplementers.Designer.cs @@ -0,0 +1,110 @@ +namespace AircraftPlantView +{ + partial class FormImplementers + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridViewImplementers = new DataGridView(); + buttonAdd = new Button(); + buttonUpdate = new Button(); + buttonDelete = new Button(); + buttonRefresh = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridViewImplementers).BeginInit(); + SuspendLayout(); + // + // dataGridViewImplementers + // + dataGridViewImplementers.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewImplementers.Location = new Point(2, 3); + dataGridViewImplementers.Name = "dataGridViewImplementers"; + dataGridViewImplementers.RowHeadersWidth = 51; + dataGridViewImplementers.RowTemplate.Height = 29; + dataGridViewImplementers.Size = new Size(631, 445); + dataGridViewImplementers.TabIndex = 0; + // + // buttonAdd + // + buttonAdd.Location = new Point(653, 21); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(94, 29); + buttonAdd.TabIndex = 1; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + // + // buttonUpdate + // + buttonUpdate.Location = new Point(653, 68); + buttonUpdate.Name = "buttonUpdate"; + buttonUpdate.Size = new Size(94, 29); + buttonUpdate.TabIndex = 2; + buttonUpdate.Text = "Изменить"; + buttonUpdate.UseVisualStyleBackColor = true; + // + // buttonDelete + // + buttonDelete.Location = new Point(653, 117); + buttonDelete.Name = "buttonDelete"; + buttonDelete.Size = new Size(94, 29); + buttonDelete.TabIndex = 3; + buttonDelete.Text = "Удалить"; + buttonDelete.UseVisualStyleBackColor = true; + // + // buttonRefresh + // + buttonRefresh.Location = new Point(653, 166); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(94, 29); + buttonRefresh.TabIndex = 4; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + // + // FormImplementers + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(buttonRefresh); + Controls.Add(buttonDelete); + Controls.Add(buttonUpdate); + Controls.Add(buttonAdd); + Controls.Add(dataGridViewImplementers); + Name = "FormImplementers"; + Text = "Исполнители"; + Load += FormImplementers_Load; + ((System.ComponentModel.ISupportInitialize)dataGridViewImplementers).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridViewImplementers; + private Button buttonAdd; + private Button buttonUpdate; + private Button buttonDelete; + private Button buttonRefresh; + } +} \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormImplementers.cs b/AircraftPlant/AircraftPlantView/FormImplementers.cs new file mode 100644 index 0000000..a176361 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormImplementers.cs @@ -0,0 +1,104 @@ +using AircraftPlantContracts.BindingModels; +using AircraftPlantContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AircraftPlantView +{ + public partial class FormImplementers : Form + { + private readonly ILogger _logger; + private readonly IImplementerLogic _logic; + public FormImplementers(ILogger logger, IImplementerLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + private void FormImplementers_Load(object sender, EventArgs e) + { + LoadData(); + } + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + if (service is FormImplementer form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + private void buttonUpdate_Click(object sender, EventArgs e) + { + if (dataGridViewImplementers.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + if (service is FormImplementer form) + { + form.Id = Convert.ToInt32(dataGridViewImplementers.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + private void buttonDelete_Click(object sender, EventArgs e) + { + if (dataGridViewImplementers.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridViewImplementers.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление исполнителя"); + try + { + if (!_logic.Delete(new ImplementerBindingModel { Id = id })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления исполнителя"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + private void buttonRefresh_Click(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridViewImplementers.DataSource = list; + dataGridViewImplementers.Columns["Id"].Visible = false; + dataGridViewImplementers.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка списка исполнителей"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка исполнителей"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/AircraftPlant/AircraftPlantView/FormImplementers.resx b/AircraftPlant/AircraftPlantView/FormImplementers.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AircraftPlant/AircraftPlantView/FormImplementers.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormMain.Designer.cs b/AircraftPlant/AircraftPlantView/FormMain.Designer.cs index a46a3ad..f7dec40 100644 --- a/AircraftPlant/AircraftPlantView/FormMain.Designer.cs +++ b/AircraftPlant/AircraftPlantView/FormMain.Designer.cs @@ -42,6 +42,8 @@ списокКомпонентовToolStripMenuItem = new ToolStripMenuItem(); компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); + клиентыToolStripMenuItem = new ToolStripMenuItem(); + исполнителиToolStripMenuItem = new ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); menuStrip1.SuspendLayout(); SuspendLayout(); @@ -135,7 +137,7 @@ // // справочникиToolStripMenuItem // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem }); + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem }); справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Text = "Справочники"; @@ -143,14 +145,14 @@ // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(182, 26); + компонентыToolStripMenuItem.Size = new Size(224, 26); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // изделияToolStripMenuItem // изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - изделияToolStripMenuItem.Size = new Size(182, 26); + изделияToolStripMenuItem.Size = new Size(224, 26); изделияToolStripMenuItem.Text = "Изделия"; изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // @@ -182,6 +184,18 @@ списокЗаказовToolStripMenuItem.Text = "Список заказов"; списокЗаказовToolStripMenuItem.Click += СписокЗаказовToolStripMenuItem_Click; // + // клиентыToolStripMenuItem + // + клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; + клиентыToolStripMenuItem.Size = new Size(224, 26); + клиентыToolStripMenuItem.Text = "Клиенты"; + // + // исполнителиToolStripMenuItem + // + исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; + исполнителиToolStripMenuItem.Size = new Size(224, 26); + исполнителиToolStripMenuItem.Text = "Исполнители"; + // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -222,5 +236,7 @@ private ToolStripMenuItem списокКомпонентовToolStripMenuItem; private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem; private ToolStripMenuItem списокЗаказовToolStripMenuItem; + private ToolStripMenuItem клиентыToolStripMenuItem; + private ToolStripMenuItem исполнителиToolStripMenuItem; } } \ No newline at end of file diff --git a/AircraftPlant/AircraftPlantView/FormMain.cs b/AircraftPlant/AircraftPlantView/FormMain.cs index eaa09f0..996a138 100644 --- a/AircraftPlant/AircraftPlantView/FormMain.cs +++ b/AircraftPlant/AircraftPlantView/FormMain.cs @@ -1,6 +1,7 @@ using AircraftPlantBusinessLogic.BusinessLogics; using AircraftPlantContracts.BindingModels; using AircraftPlantContracts.BusinessLogicsContracts; +using AircraftPlantContracts_.BusinessLogicsContracts; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -89,6 +90,14 @@ namespace AircraftPlantView form.ShowDialog(); } } + + private void ЗапускРаботToolStripMenuItem_Click(object sender, EventArgs e) + { + + _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic )) as IImplementerLogic)!, _orderLogic); + MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + /// /// Кнопка "Создать заказ" ///