From 522dcb405d189a11ff72dcd44c45d433b99c8b09 Mon Sep 17 00:00:00 2001 From: K Date: Sat, 23 Mar 2024 11:04:42 +0300 Subject: [PATCH 1/3] lab2 --- PrecastConcretePlant/PrecastConcretePlant.sln | 10 +- .../DataFileSingleton.cs | 55 ++++++++++ .../Implements/ComponentStorage.cs | 84 +++++++++++++++ .../Implements/OrderStorage.cs | 94 ++++++++++++++++ .../Implements/ReinforcedStorage.cs | 94 ++++++++++++++++ .../Models/Component.cs | 60 +++++++++++ .../Models/Order.cs | 100 ++++++++++++++++++ .../Models/Reinforced.cs | 90 ++++++++++++++++ .../PrecastConcretePlantFileImplement.csproj | 14 +++ .../PrecastConcretePlantView.csproj | 1 + .../PrecastConcretePlantView/Program.cs | 2 +- 11 files changed, 601 insertions(+), 3 deletions(-) create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ComponentStorage.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ReinforcedStorage.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Component.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Order.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Reinforced.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/PrecastConcretePlantFileImplement.csproj diff --git a/PrecastConcretePlant/PrecastConcretePlant.sln b/PrecastConcretePlant/PrecastConcretePlant.sln index 513b733..eb34c37 100644 --- a/PrecastConcretePlant/PrecastConcretePlant.sln +++ b/PrecastConcretePlant/PrecastConcretePlant.sln @@ -9,9 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PrecastConcretePlantDataMod EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PrecastConcretePlantContracts", "PrecastConcretePlantContracts\PrecastConcretePlantContracts.csproj", "{7BBA6D17-DDEE-4971-A350-2C4677A28B3D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrecastConcretePlantBusinessLogic", "PrecastConcretePlantBusinessLogic\PrecastConcretePlantBusinessLogic.csproj", "{6C45F2BD-77AE-4324-B567-3B1FFAE52DA1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PrecastConcretePlantBusinessLogic", "PrecastConcretePlantBusinessLogic\PrecastConcretePlantBusinessLogic.csproj", "{6C45F2BD-77AE-4324-B567-3B1FFAE52DA1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrecastConcretePlantListImplement", "PrecastConcretePlantListImplement\PrecastConcretePlantListImplement.csproj", "{432CDD30-04CE-4505-999C-1FC85C2220B1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PrecastConcretePlantListImplement", "PrecastConcretePlantListImplement\PrecastConcretePlantListImplement.csproj", "{432CDD30-04CE-4505-999C-1FC85C2220B1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrecastConcretePlantFileImplement", "PrecastConcretePlantFileImplement\PrecastConcretePlantFileImplement.csproj", "{0260BB94-674A-490D-9B8F-0525FBD520A1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {432CDD30-04CE-4505-999C-1FC85C2220B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {432CDD30-04CE-4505-999C-1FC85C2220B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {432CDD30-04CE-4505-999C-1FC85C2220B1}.Release|Any CPU.Build.0 = Release|Any CPU + {0260BB94-674A-490D-9B8F-0525FBD520A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0260BB94-674A-490D-9B8F-0525FBD520A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0260BB94-674A-490D-9B8F-0525FBD520A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0260BB94-674A-490D-9B8F-0525FBD520A1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..587388c --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs @@ -0,0 +1,55 @@ +using PrecastConcretePlantFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace PrecastConcretePlantFileImplement +{ + public class DataFileSingleton + { + private static DataFileSingleton? instance; + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string ReinforcedFileName = "Reinforced.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Reinforceds { get; private set; } + public static DataFileSingleton GetInstance() + { + if (instance == null) + { + instance = new DataFileSingleton(); + } + return instance; + } + public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); + public void SaveReinforceds() => SaveData(Reinforceds, ReinforcedFileName, "Reinforceds", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Reinforceds = LoadData(ReinforcedFileName, "Reinforced", x => Reinforced.Create(x)!)!; + Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + } + private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) + { + if (File.Exists(filename)) + { + return + XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); + } + return new List(); + } + private static void SaveData(List data, string filename, string xmlNodeName, Func selectFunction) + { + if (data != null) + { + new XDocument(new XElement(xmlNodeName, + data.Select(selectFunction).ToArray())).Save(filename); + } + } + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ComponentStorage.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..2e8a3f9 --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,84 @@ +using PrecastConcretePlantContracts.BindingModels; +using PrecastConcretePlantContracts.SearchModels; +using PrecastConcretePlantContracts.StoragesContracts; +using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PrecastConcretePlantFileImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataFileSingleton source; + public ComponentStorage() + { + source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return source.Components + .Select(x => x.GetViewModel) + .ToList(); + } + public List GetFilteredList(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName)) + { + return new(); + } + return source.Components + .Where(x => x.ComponentName.Contains(model.ComponentName)) + .Select(x => x.GetViewModel) + .ToList(); + } + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } + return source.Components + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) + && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + public ComponentViewModel? Insert(ComponentBindingModel model) + { + model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1; + var newComponent = Component.Create(model); + if (newComponent == null) + { + return null; + } + source.Components.Add(newComponent); + source.SaveComponents(); + return newComponent.GetViewModel; + } + public ComponentViewModel? Update(ComponentBindingModel model) + { + var component = source.Components.FirstOrDefault(x => x.Id == model.Id); + if (component == null) + { + return null; + } + component.Update(model); + source.SaveComponents(); + return component.GetViewModel; + } + public ComponentViewModel? Delete(ComponentBindingModel model) + { + var element = source.Components.FirstOrDefault(x => x.Id == + model.Id); + if (element != null) + { + source.Components.Remove(element); + source.SaveComponents(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..e88ba0d --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,94 @@ +using PrecastConcretePlantContracts.BindingModels; +using PrecastConcretePlantContracts.SearchModels; +using PrecastConcretePlantContracts.StoragesContracts; +using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PrecastConcretePlantFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton source; + + public OrderStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public OrderViewModel? Delete(OrderBindingModel model) + { + var element = source.Orders.FirstOrDefault(x => x.Id == model.Id); + + if (element != null) + { + source.Orders.Remove(element); + source.SaveOrders(); + + return element.GetViewModel; + } + + return null; + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + + return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return new(); + } + + return source.Orders.Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Orders.Select(x => x.GetViewModel).ToList(); + } + + public OrderViewModel? Insert(OrderBindingModel model) + { + model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1; + var newOrder = Order.Create(model); + + if (newOrder == null) + { + return null; + } + + source.Orders.Add(newOrder); + source.SaveOrders(); + + return newOrder.GetViewModel; + } + + public OrderViewModel? Update(OrderBindingModel model) + { + var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + + if (order == null) + { + return null; + } + + order.Update(model); + source.SaveOrders(); + + return order.GetViewModel; + } + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ReinforcedStorage.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ReinforcedStorage.cs new file mode 100644 index 0000000..b68cfdb --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ReinforcedStorage.cs @@ -0,0 +1,94 @@ +using PrecastConcretePlantContracts.BindingModels; +using PrecastConcretePlantContracts.SearchModels; +using PrecastConcretePlantContracts.StoragesContracts; +using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PrecastConcretePlantFileImplement.Implements +{ + public class ReinforcedStorage : IReinforcedStorage + { + private readonly DataFileSingleton source; + + public ReinforcedStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public ReinforcedViewModel? Delete(ReinforcedBindingModel model) + { + var element = source.Reinforceds.FirstOrDefault(x => x.Id == model.Id); + + if (element != null) + { + source.Reinforceds.Remove(element); + source.SaveReinforceds(); + + return element.GetViewModel; + } + + return null; + } + + public ReinforcedViewModel? GetElement(ReinforcedSearchModel model) + { + if (string.IsNullOrEmpty(model.ReinforcedName) && !model.Id.HasValue) + { + return null; + } + + return source.Reinforceds.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ReinforcedName) && x.ReinforcedName == model.ReinforcedName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(ReinforcedSearchModel model) + { + if (string.IsNullOrEmpty(model.ReinforcedName)) + { + return new(); + } + + return source.Reinforceds.Where(x => x.ReinforcedName.Contains(model.ReinforcedName)).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Reinforceds.Select(x => x.GetViewModel).ToList(); + } + + public ReinforcedViewModel? Insert(ReinforcedBindingModel model) + { + model.Id = source.Reinforceds.Count > 0 ? source.Reinforceds.Max(x => x.Id) + 1 : 1; + var newReinforced = Reinforced.Create(model); + + if (newReinforced == null) + { + return null; + } + + source.Reinforceds.Add(newReinforced); + source.SaveReinforceds(); + + return newReinforced.GetViewModel; + } + + public ReinforcedViewModel? Update(ReinforcedBindingModel model) + { + var reinforced = source.Reinforceds.FirstOrDefault(x => x.Id == model.Id); + + if (reinforced == null) + { + return null; + } + + reinforced.Update(model); + source.SaveReinforceds(); + + return reinforced.GetViewModel; + } + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Component.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Component.cs new file mode 100644 index 0000000..4f95010 --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Component.cs @@ -0,0 +1,60 @@ +using PrecastConcretePlantContracts.BindingModels; +using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantDataModels.Models; +using System.Xml.Linq; + +namespace PrecastConcretePlantFileImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + public string ComponentName { get; private set; } = string.Empty; + public double Cost { get; set; } + public static Component? Create(ComponentBindingModel? model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + public static Component? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Component() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComponentName = element.Element("ComponentName")!.Value, + Cost = Convert.ToDouble(element.Element("Cost")!.Value) + }; + } + public void Update(ComponentBindingModel? model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + + public XElement GetXElement => new("Component", + new XAttribute("Id", Id), + new XElement("ComponentName", ComponentName), + new XElement("Cost", Cost.ToString())); + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Order.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Order.cs new file mode 100644 index 0000000..9fd823c --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Order.cs @@ -0,0 +1,100 @@ +using PrecastConcretePlantContracts.BindingModels; +using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantDataModels.Enums; +using PrecastConcretePlantDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace PrecastConcretePlantFileImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + + public int ReinforcedId { get; private set; } + + public string ReinforcedName { get; private set; } = string.Empty; + + public int Count { get; private set; } + + public double Sum { get; private set; } + + public OrderStatus Status { get; private set; } + + public DateTime DateCreate { get; private set; } + + public DateTime? DateImplement { get; private set; } + + public static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + ReinforcedId = model.ReinforcedId, + ReinforcedName = model.ReinforcedName, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement, + Id = model.Id, + }; + } + public static Order? Create(XElement element) + { + if (element == null) + { + return null; + } + string dateImplement = element.Element("DateImplement")!.Value; + return new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ReinforcedId = Convert.ToInt32(element.Element("ReinforcedId")!.Value), + ReinforcedName = element.Element("ReinforcedName")!.Value.ToString(), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + Status = (OrderStatus)(Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value)), + DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), + DateImplement = (dateImplement == "" || dateImplement is null) ? Convert.ToDateTime(null) : Convert.ToDateTime(dateImplement) + }; + } + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + DateImplement = model.DateImplement; + } + public OrderViewModel GetViewModel => new() + { + Id = Id, + ReinforcedId = ReinforcedId, + ReinforcedName = ReinforcedName, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("ReinforcedName", ReinforcedName), + new XElement("ReinforcedId", ReinforcedId.ToString()), + new XElement("Count", Count.ToString()), + new XElement("Sum", Sum.ToString()), + new XElement("Status", Status.ToString()), + new XElement("DateCreate", DateCreate.ToString()), + new XElement("DateImplement", DateImplement.ToString())); + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Reinforced.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Reinforced.cs new file mode 100644 index 0000000..e27f221 --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Reinforced.cs @@ -0,0 +1,90 @@ +using PrecastConcretePlantContracts.BindingModels; +using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantDataModels.Models; +using System.Xml.Linq; + +namespace PrecastConcretePlantFileImplement.Models +{ + public class Reinforced : IReinforcedModel + { + public int Id { get; private set; } + public string ReinforcedName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + + private Dictionary? _reinforcedComponents = null; + public Dictionary ReinforcedComponents + { + get + { + if (_reinforcedComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _reinforcedComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, + y.Value)); + } + return _reinforcedComponents; + } + } + public static Reinforced? Create(ReinforcedBindingModel model) + { + if (model == null) + { + return null; + } + return new Reinforced() + { + Id = model.Id, + ReinforcedName = model.ReinforcedName, + Price = model.Price, + Components = model.ReinforcedComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + public static Reinforced? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Reinforced() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ReinforcedName = element.Element("ReinforcedName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = + element.Element("ReinforcedComponents")!.Elements("ReinforcedComponent") + .ToDictionary(x => + Convert.ToInt32(x.Element("Key")?.Value), x => + Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(ReinforcedBindingModel model) + { + if (model == null) + { + return; + } + ReinforcedName = model.ReinforcedName; + Price = model.Price; + Components = model.ReinforcedComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _reinforcedComponents = null; + } + public ReinforcedViewModel GetViewModel => new() + { + Id = Id, + ReinforcedName = ReinforcedName, + Price = Price, + ReinforcedComponents = ReinforcedComponents + }; + public XElement GetXElement => new("Reinforced", + new XAttribute("Id", Id), + new XElement("ReinforcedName", ReinforcedName), + new XElement("Price", Price.ToString()), + new XElement("ReinforcedComponents", Components.Select(x => + new XElement("ReinforcedComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))) + .ToArray())); + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/PrecastConcretePlantFileImplement.csproj b/PrecastConcretePlant/PrecastConcretePlantFileImplement/PrecastConcretePlantFileImplement.csproj new file mode 100644 index 0000000..9e035ab --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/PrecastConcretePlantFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net8.0 + enable + enable + + + + + + + + diff --git a/PrecastConcretePlant/PrecastConcretePlantView/PrecastConcretePlantView.csproj b/PrecastConcretePlant/PrecastConcretePlantView/PrecastConcretePlantView.csproj index cb3c1f6..593d673 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/PrecastConcretePlantView.csproj +++ b/PrecastConcretePlant/PrecastConcretePlantView/PrecastConcretePlantView.csproj @@ -17,6 +17,7 @@ + diff --git a/PrecastConcretePlant/PrecastConcretePlantView/Program.cs b/PrecastConcretePlant/PrecastConcretePlantView/Program.cs index 5fbed1a..4de5eb5 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/Program.cs +++ b/PrecastConcretePlant/PrecastConcretePlantView/Program.cs @@ -4,7 +4,7 @@ using NLog.Extensions.Logging; using PrecastConcretePlantBusinessLogic.BusinessLogics; using PrecastConcretePlantContracts.BusinessLogicsContracts; using PrecastConcretePlantContracts.StoragesContracts; -using PrecastConcretePlantListImplement.Implements; +using PrecastConcretePlantFileImplement.Implements; using System; namespace PrecastConcretePlantView -- 2.25.1 From a023f3b24a9b6f96f25105a736050a747c94ee75 Mon Sep 17 00:00:00 2001 From: K Date: Thu, 16 May 2024 21:48:52 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogic/OrderLogic.cs | 145 +++++++++++------- .../BusinessLogic/ShopLogic.cs | 88 +++++++++-- .../BindingModels/ShopBindingModel.cs | 1 + .../BusinessLogicsContracts/IShopLogic.cs | 6 +- .../StoragesContracts/IShopStorage.cs | 3 + .../ViewModels/ShopViewModel.cs | 3 + .../Models/IShopModel.cs | 1 + .../DataFileSingleton.cs | 18 +-- .../Implements/ShopStorage.cs | 138 +++++++++++++++++ .../Models/Shop.cs | 113 ++++++++++++++ .../DataListSingleton.cs | 6 - .../Implements/ShopStorage.cs | 5 + .../Models/Shop.cs | 2 + .../PrecastConcretePlantView/FormMain.cs | 95 ++++++------ 14 files changed, 495 insertions(+), 129 deletions(-) create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ShopStorage.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Shop.cs diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs index 29765fb..fbed065 100644 --- a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/OrderLogic.cs @@ -16,24 +16,21 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogics public class OrderLogic : IOrderLogic { private readonly ILogger _logger; + private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + + private readonly IReinforcedStorage _reinforcedStorage; + + private readonly IShopLogic _shopLogic; + + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IReinforcedStorage reinforcedStorage, IShopLogic shopLogic) { _logger = logger; _orderStorage = orderStorage; + _reinforcedStorage = reinforcedStorage; + _shopLogic = shopLogic; } - public List? ReadList(OrderSearchModel? model) - { - _logger.LogInformation("ReadList. Id: {Id}", model?.Id); - var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); - if (list == null) - { - _logger.LogWarning("ReadList return null list"); - return null; - } - _logger.LogInformation("ReadList. Count: {Count}", list.Count); - return list; - } + public bool CreateOrder(OrderBindingModel model) { CheckModel(model); @@ -50,54 +47,35 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogics } return true; } + + public List? ReadList(OrderSearchModel? model) + { + _logger.LogInformation("ReadList. OrderId: {Id}.", model?.Id); + var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + public bool TakeOrderInWork(OrderBindingModel model) { - CheckModel(model, false); - if (_orderStorage.GetElement(new OrderSearchModel { Id = model.Id })?.Status != OrderStatus.Принят) - { - _logger.LogWarning("Invalid order status"); - return false; - } - model.Status = OrderStatus.Выполняется; - if (_orderStorage.Update(model) == null) - { - _logger.LogWarning("Update operation failed"); - } - return true; + return ChangeStatus(model, OrderStatus.Выполняется); } + public bool FinishOrder(OrderBindingModel model) { - CheckModel(model, false); - if (_orderStorage.GetElement(new OrderSearchModel { Id = model.Id })?.Status != OrderStatus.Выполняется) - { - _logger.LogWarning("Invalid order status"); - return false; - } - model.Status = OrderStatus.Готов; - model.DateImplement = DateTime.Now; - if (_orderStorage.Update(model) == null) - { - _logger.LogWarning("Update operation failed"); - } - return true; + return ChangeStatus(model, OrderStatus.Готов); } + public bool DeliveryOrder(OrderBindingModel model) { - CheckModel(model, false); - var order = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); - if (order?.Status != OrderStatus.Готов) - { - _logger.LogWarning("Invalid order status"); - return false; - } - model.Status = OrderStatus.Выдан; - model.DateImplement = order.DateImplement; - if (_orderStorage.Update(model) == null) - { - _logger.LogWarning("Update operation failed"); - } - return true; + return ChangeStatus(model, OrderStatus.Выдан); } + private void CheckModel(OrderBindingModel model, bool withParams = true) { if (model == null) @@ -108,16 +86,67 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogics { return; } + if (model.ReinforcedId <= 0) + { + throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.ReinforcedId)); + } + if (model.Count <= 0) + { + throw new ArgumentNullException("В заказе должно быть хотя бы одно изделие", nameof(model.Count)); + } if (model.Sum <= 0) { - throw new ArgumentNullException("Стоимость должна быть больше 0", nameof(model.Sum)); + throw new ArgumentNullException("Стоимость заказа должна быть больше 0", nameof(model.Sum)); } - _logger.LogInformation("Order. Id: {Id}. Sum: {Sum}. ReinforcedId: {ReinforcedId}", model.Id, model.Sum, model.ReinforcedId); - var element = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); - if (element != null && element.Id == model.Id) + _logger.LogInformation("Order. Id: {Id}. Sum: {Sum}. ReinforcedId: {ReinforcedId}. ReinforcedCount: {Count}", model.Id, model.Sum, + model.ReinforcedId, model.Count); + } + + private bool ChangeStatus(OrderBindingModel model, OrderStatus newStatus) + { + CheckModel(model, false); + var order = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); + if (order == null) { - throw new InvalidOperationException("Заказ с таким номером уже есть"); + _logger.LogWarning("Change status operation failed. Order not found"); + return false; } + if (order.Status + 1 != newStatus) + { + _logger.LogWarning("Change status operation failed. Incorrect new status: {newStatus}. Current status: {currStatus}", + newStatus, order.Status); + return false; + } + //наверное тут вопрос 3 тип если изделий нема то и выдать нечего + if (newStatus == OrderStatus.Выдан) + { + var reinforced = _reinforcedStorage.GetElement(new ReinforcedSearchModel() { Id = order.ReinforcedId }); + if (reinforced == null) + { + _logger.LogWarning("Change status operation failed. Reinforced not found"); + return false; + } + if (!_shopLogic.DeliverReinforceds(reinforced, order.Count)) + { + _logger.LogWarning("Change status operation failed. Reinforceds delivery operation failed"); + return false; + } + } + model.Status = newStatus; + if (model.Status == OrderStatus.Готов) + { + model.DateImplement = DateTime.Now; + } + else + { + model.DateImplement = order.DateImplement; + } + if (_orderStorage.Update(model) == null) + { + _logger.LogWarning("Change status operation failed"); + return false; + } + return true; } } -} \ No newline at end of file +} diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ShopLogic.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ShopLogic.cs index 1e2707b..f47fcf2 100644 --- a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ShopLogic.cs +++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ShopLogic.cs @@ -88,8 +88,8 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogics } return true; } - //логика пополнения магазина - public bool RefillShop(ShopSearchModel shopModel, IReinforcedModel reinforced, int count) + + public bool ReplenishShop(ShopSearchModel shopModel, IReinforcedModel reinforced, int count) { if (shopModel == null) { @@ -103,27 +103,30 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogics { throw new ArgumentException("В магазине должен быть хотя бы один товар", nameof(count)); } - _logger.LogInformation("RefillShop(GetElement). ShopName: {ShopName}. Id: {Id}", shopModel.ShopName, shopModel.Id); - + _logger.LogInformation("ReplenishShop(GetElement). ShopName: {ShopName}. Id: {Id}", shopModel.ShopName, shopModel.Id); var shop = _shopStorage.GetElement(shopModel); - if (shop == null) { - _logger.LogWarning("RefillShop(GetElement). Element not found"); + _logger.LogWarning("ReplenishShop(GetElement). Element not found"); return false; } - if (shop.ShopReinforceds.ContainsKey(reinforced.Id))//если есть товар то плюс + if (shop.ReinforcedsMax - shop.ShopReinforceds.Sum(x => x.Value.Item2) < count) + { + _logger.LogWarning("ReplenishShop error. No space for new reinforceds"); + return false; + } + if (shop.ShopReinforceds.ContainsKey(reinforced.Id)) { var shopR = shop.ShopReinforceds[reinforced.Id]; shopR.Item2 += count; shop.ShopReinforceds[reinforced.Id] = shopR; - _logger.LogInformation("RefillShop. Added {count} '{reinforced}' to '{ShopName}' shop", count, reinforced.ReinforcedName, + _logger.LogInformation("ReplenishShop. Added {count} '{reinforced}' to '{ShopName}' shop", count, reinforced.ReinforcedName, shop.ShopName); } - else//если нет то просто добавляем + else { shop.ShopReinforceds.Add(reinforced.Id, (reinforced, count)); - _logger.LogInformation("RefillShop. Added {count} new '{reinforced}' to '{ShopName}' shop", count, reinforced.ReinforcedName, + _logger.LogInformation("ReplenishShop. Added {count} new '{reinforced}' to '{ShopName}' shop", count, reinforced.ReinforcedName, shop.ShopName); } if (_shopStorage.Update(new ShopBindingModel() @@ -132,15 +135,78 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogics ShopName = shop.ShopName, Address = shop.Address, DateOpening = shop.DateOpening, + ReinforcedsMax = shop.ReinforcedsMax, ShopReinforceds = shop.ShopReinforceds, }) == null) { - _logger.LogWarning("RefillShop. Update operation failed"); + _logger.LogWarning("ReplenishShop. Update operation failed"); return false; } return true; } + public bool MakeSale(IReinforcedModel model, int count) + { + return _shopStorage.MakeSale(model, count); + } + + public bool DeliverReinforceds(IReinforcedModel reinforced, int count) + { + if (count <= 0) + { + _logger.LogWarning("Reinforceds delivery operation failed. Reinforced count <= 0"); + return false; + } + + var shopList = _shopStorage.GetFullList(); + int shopsCapacity = shopList.Sum(x => x.ReinforcedsMax); + int currentReinforceds = shopList.Select(x => x.ShopReinforceds.Sum(y => y.Value.Item2)).Sum(); + int freePlaces = shopsCapacity - currentReinforceds; + + if (freePlaces < count) + { + _logger.LogWarning("Reinforceds delivery operation failed. No space for new кeinforceds"); + return false; + } + + foreach (var shop in shopList) + { + freePlaces = shop.ReinforcedsMax - shop.ShopReinforceds.Sum(x => x.Value.Item2); + if (freePlaces == 0) + { + continue; + } + if (freePlaces >= count) + { + if (ReplenishShop(new() { Id = shop.Id }, reinforced, count)) + { + count = 0; + } + else + { + _logger.LogWarning("Reinforceds delivery operation failed"); + return false; + } + } + else + { + if (ReplenishShop(new() { Id = shop.Id }, reinforced, freePlaces)) + { + count -= freePlaces; + } + else + { + _logger.LogWarning("Reinforceds delivery operation failed"); + return false; + } + } + if (count == 0) + { + return true; + } + } + return false; + } private void CheckModel(ShopBindingModel model, bool withParams = true) { if (model == null) diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/ShopBindingModel.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/ShopBindingModel.cs index b7d7bd5..1c1108d 100644 --- a/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/ShopBindingModel.cs +++ b/PrecastConcretePlant/PrecastConcretePlantContracts/BindingModels/ShopBindingModel.cs @@ -22,5 +22,6 @@ namespace PrecastConcretePlantContracts.BindingModels get; set; } = new(); + public int ReinforcedsMax { get; set; } } } diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IShopLogic.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IShopLogic.cs index 156fa96..07aee37 100644 --- a/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IShopLogic.cs +++ b/PrecastConcretePlant/PrecastConcretePlantContracts/BusinessLogicsContracts/IShopLogic.cs @@ -22,6 +22,10 @@ namespace PrecastConcretePlantContracts.BusinessLogicsContracts bool Delete(ShopBindingModel model); - bool RefillShop(ShopSearchModel shopModel, IReinforcedModel reinforced, int count); + bool ReplenishShop(ShopSearchModel shopModel, IReinforcedModel reinforced, int count); + + bool MakeSale(IReinforcedModel model, int count); + + bool DeliverReinforceds(IReinforcedModel model, int count); } } diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/StoragesContracts/IShopStorage.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/StoragesContracts/IShopStorage.cs index e6da5e5..f793af8 100644 --- a/PrecastConcretePlant/PrecastConcretePlantContracts/StoragesContracts/IShopStorage.cs +++ b/PrecastConcretePlant/PrecastConcretePlantContracts/StoragesContracts/IShopStorage.cs @@ -1,6 +1,7 @@ using PrecastConcretePlantContracts.BindingModels; using PrecastConcretePlantContracts.SearchModels; using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantDataModels.Models; using System; using System.Collections.Generic; using System.Linq; @@ -22,5 +23,7 @@ namespace PrecastConcretePlantContracts.StoragesContracts ShopViewModel? Update(ShopBindingModel model); ShopViewModel? Delete(ShopBindingModel model); + + bool MakeSale(IReinforcedModel model, int count); } } diff --git a/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/ShopViewModel.cs b/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/ShopViewModel.cs index 7d3bc7f..1f4b9c3 100644 --- a/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/ShopViewModel.cs +++ b/PrecastConcretePlant/PrecastConcretePlantContracts/ViewModels/ShopViewModel.cs @@ -26,5 +26,8 @@ namespace PrecastConcretePlantContracts.ViewModels get; set; } = new(); + + [DisplayName("Максимальное количество изделий")] + public int ReinforcedsMax { get; set; } } } diff --git a/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IShopModel.cs b/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IShopModel.cs index d315a48..591bf5c 100644 --- a/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IShopModel.cs +++ b/PrecastConcretePlant/PrecastConcretePlantDataModels/Models/IShopModel.cs @@ -15,5 +15,6 @@ namespace PrecastConcretePlantDataModels.Models DateTime DateOpening { get; } Dictionary ShopReinforceds { get; } + int ReinforcedsMax { get; } } } diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs index 587388c..577dc01 100644 --- a/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/DataFileSingleton.cs @@ -1,22 +1,19 @@ -using PrecastConcretePlantFileImplement.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; +using System.Xml.Linq; +using PrecastConcretePlantFileImplement.Models; namespace PrecastConcretePlantFileImplement { - public class DataFileSingleton + internal class DataFileSingleton { private static DataFileSingleton? instance; private readonly string ComponentFileName = "Component.xml"; private readonly string OrderFileName = "Order.xml"; private readonly string ReinforcedFileName = "Reinforced.xml"; + private readonly string ShopFileName = "Shop.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Reinforceds { get; private set; } + public List Shops { get; private set; } public static DataFileSingleton GetInstance() { if (instance == null) @@ -28,18 +25,19 @@ namespace PrecastConcretePlantFileImplement public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); public void SaveReinforceds() => SaveData(Reinforceds, ReinforcedFileName, "Reinforceds", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement); private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Reinforceds = LoadData(ReinforcedFileName, "Reinforced", x => Reinforced.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { if (File.Exists(filename)) { - return - XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); + return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); } return new List(); } diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ShopStorage.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..2bf21ca --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ShopStorage.cs @@ -0,0 +1,138 @@ +using PrecastConcretePlantContracts.BindingModels; +using PrecastConcretePlantContracts.SearchModels; +using PrecastConcretePlantContracts.StoragesContracts; +using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantDataModels.Models; +using PrecastConcretePlantFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PrecastConcretePlantFileImplement.Implements +{ + public class ShopStorage : IShopStorage + { + private readonly DataFileSingleton source; + + public ShopStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Shops + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName)) + { + return new(); + } + return source.Shops + .Where(x => x.ShopName.Contains(model.ShopName)) + .Select(x => x.GetViewModel) + .ToList(); + } + + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + return source.Shops + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1; + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + source.Shops.Add(newShop); + source.SaveShops(); + return newShop.GetViewModel; + } + + public ShopViewModel? Update(ShopBindingModel model) + { + var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (shop == null) + { + return null; + } + shop.Update(model); + source.SaveShops(); + return shop.GetViewModel; + } + + public ShopViewModel? Delete(ShopBindingModel model) + { + var element = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Shops.Remove(element); + source.SaveShops(); + return element.GetViewModel; + } + return null; + } + + //логика продажи изделий с магазинов + public bool MakeSale(IReinforcedModel model, int count) + { + var reinforced = source.Reinforceds.FirstOrDefault(x => x.Id == model.Id); + int countInShops = source.Shops.SelectMany(x => x.ShopReinforceds).Sum(y => y.Key == model.Id ? y.Value.Item2 : 0); + + if (reinforced == null || countInShops < count) + { + return false; + } + + foreach (var shop in source.Shops) + { + var shopReinforceds = shop.ShopReinforceds.Where(x => x.Key == model.Id); + if (shopReinforceds.Any()) + { + var shopReinforced = shopReinforceds.First(); + int min = Math.Min(shopReinforced.Value.Item2, count); + if (min == shopReinforced.Value.Item2) + { + shop.ShopReinforceds.Remove(shopReinforced.Key); + } + else + { + shop.ShopReinforceds[shopReinforced.Key] = (shopReinforced.Value.Item1, shopReinforced.Value.Item2 - min); + } + shop.Update(new ShopBindingModel + { + Id = shop.Id, + ShopName = shop.ShopName, + Address = shop.Address, + DateOpening = shop.DateOpening, + ShopReinforceds = shop.ShopReinforceds, + ReinforcedsMax = shop.ReinforcedsMax + }); + count -= min; + if (count <= 0) + { + break; + } + } + } + source.SaveShops(); + return true; + } + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Shop.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Shop.cs new file mode 100644 index 0000000..4766e15 --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/Models/Shop.cs @@ -0,0 +1,113 @@ +using PrecastConcretePlantContracts.BindingModels; +using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace PrecastConcretePlantFileImplement.Models +{ + public class Shop : IShopModel + { + public int Id { get; private set; } + + public string ShopName { get; private set; } = string.Empty; + + public string Address { get; private set; } = string.Empty; + + public DateTime DateOpening { get; private set; } + + public Dictionary Reinforceds { get; private set; } = new(); + + private Dictionary? _shopReinforceds = null; + + public Dictionary ShopReinforceds + { + get + { + if (_shopReinforceds == null) + { + var source = DataFileSingleton.GetInstance(); + _shopReinforceds = Reinforceds.ToDictionary(x => x.Key, + y => ((source.Reinforceds.FirstOrDefault(z => z.Id == y.Key) as IReinforcedModel)!, y.Value)); + } + return _shopReinforceds; + } + } + + public int ReinforcedsMax { get; private set; } + + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + Address = model.Address, + DateOpening = model.DateOpening, + Reinforceds = model.ShopReinforceds.ToDictionary(x => x.Key, x => x.Value.Item2), + ReinforcedsMax = model.ReinforcedsMax + }; + } + + public static Shop? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Shop() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ShopName = element.Element("ShopName")!.Value, + Address = element.Element("Address")!.Value, + DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value), + ReinforcedsMax = Convert.ToInt32(element.Element("ReinforcedsMax")!.Value), + Reinforceds = element.Element("ShopReinforceds")!.Elements("ShopReinforced") + .ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + Address = model.Address; + DateOpening = model.DateOpening; + ReinforcedsMax = model.ReinforcedsMax; + Reinforceds = model.ShopReinforceds.ToDictionary(x => x.Key, x => x.Value.Item2); + _shopReinforceds = null; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpening = DateOpening, + ShopReinforceds = ShopReinforceds, + ReinforcedsMax = ReinforcedsMax + }; + + public XElement GetXElement => new("Shop", + new XAttribute("Id", Id), + new XElement("ShopName", ShopName), + new XElement("Address", Address), + new XElement("DateOpening", DateOpening.ToString()), + new XElement("ReinforcedsMax", ReinforcedsMax.ToString()), + new XElement("ShopReinforceds", + Reinforceds.Select(x => new XElement("ShopReinforced", + new XElement("Key", x.Key), + new XElement("Value", x.Value))).ToArray())); + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/DataListSingleton.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/DataListSingleton.cs index a8879b8..0f98719 100644 --- a/PrecastConcretePlant/PrecastConcretePlantListImplement/DataListSingleton.cs +++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/DataListSingleton.cs @@ -1,9 +1,4 @@ using PrecastConcretePlantListImplement.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace PrecastConcretePlantListImplement { @@ -29,6 +24,5 @@ namespace PrecastConcretePlantListImplement } return _instance; } - } } diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/ShopStorage.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/ShopStorage.cs index 9c4e7a5..28a77ee 100644 --- a/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/ShopStorage.cs +++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/Implements/ShopStorage.cs @@ -2,6 +2,7 @@ using PrecastConcretePlantContracts.SearchModels; using PrecastConcretePlantContracts.StoragesContracts; using PrecastConcretePlantContracts.ViewModels; +using PrecastConcretePlantDataModels.Models; using PrecastConcretePlantListImplement.Models; using System; using System.Collections.Generic; @@ -110,5 +111,9 @@ namespace PrecastConcretePlantListImplement.Implements } return null; } + public bool MakeSale(IReinforcedModel model, int count) + { + throw new NotImplementedException(); + } } } diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Shop.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Shop.cs index ad0ea97..d07d16a 100644 --- a/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Shop.cs +++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/Models/Shop.cs @@ -19,6 +19,8 @@ namespace PrecastConcretePlantListImplement.Models public DateTime DateOpening { get; private set; } + public int ReinforcedsMax { get; set; } + public Dictionary ShopReinforceds { get; diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.cs index 9486b04..ff7d4d3 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.cs +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using PrecastConcretePlantContracts.BindingModels; using PrecastConcretePlantContracts.BusinessLogicsContracts; using System; @@ -36,26 +36,27 @@ namespace PrecastConcretePlantView { dataGridView.DataSource = list; dataGridView.Columns["ReinforcedId"].Visible = false; - dataGridView.Columns["ReinforcedName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["reinforcedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } - _logger.LogInformation(" "); + _logger.LogInformation("青沭箸赅 玎赅珙"); } catch (Exception ex) { - _logger.LogError(ex, " "); - MessageBox.Show(ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError(ex, "硒栳赅 玎沭箸觇 玎赅珙"); + MessageBox.Show(ex.Message, "硒栳赅", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - private void ToolStripMenuItem_Click(object sender, EventArgs e) + private void 暑祜铐屙螓ToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponentS)); + var service = + Program.ServiceProvider?.GetService(typeof(FormComponentS)); if (service is FormComponentS form) { form.ShowDialog(); } } - private void ToolStripMenuItem_Click(object sender, EventArgs e) + private void 如溴腓ToolStripMenuItem_Click(object sender, EventArgs e) + { var service = Program.ServiceProvider?.GetService(typeof(FormReinforcedS)); if (service is FormReinforcedS form) @@ -63,7 +64,7 @@ namespace PrecastConcretePlantView form.ShowDialog(); } } - private void ToolStripMenuItem_Click(object sender, EventArgs e) + private void 锑汔玷睇ToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormShops)); if (service is FormShops form) @@ -71,17 +72,26 @@ namespace PrecastConcretePlantView form.ShowDialog(); } } - private void ToolStripMenuItem_Click(object sender, EventArgs e) + private void 项镱腠屙桢锑汔玷磬ToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormShopRefill)); - if (service is FormShopRefill form) + var service = Program.ServiceProvider?.GetService(typeof(FormShopReplenishment)); + if (service is FormShopReplenishment form) + { + form.ShowDialog(); + } + } + private void 橡钿噫嗳玟咫栝ToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReinforcedSale)); + if (service is FormReinforcedSale form) { form.ShowDialog(); } } private void ButtonCreateOrder_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + var service = + Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); if (service is FormCreateOrder form) { form.ShowDialog(); @@ -92,24 +102,23 @@ namespace PrecastConcretePlantView { if (dataGridView.SelectedRows.Count == 1) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation(" No{id}. ' '", id); + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("青赅 箋id}. 体<>弪 耱囹篑 磬 '<27> 疣犷蝈'", id); try { - var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel - { - Id = id - }); + var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id }); if (!operationResult) { - throw new Exception(" . ."); + throw new Exception("硒栳赅 镳<> 耦躔囗屙梃.念镱腠栩咫 桧纛痨圉 <20> 腩汔."); } LoadData(); } catch (Exception ex) { - _logger.LogError(ex, " "); - MessageBox.Show(ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError(ex, "硒栳赅 镥疱溧麒 玎赅玎 <20> 疣犷蝮"); + MessageBox.Show(ex.Message, "硒栳赅", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } } @@ -117,24 +126,25 @@ namespace PrecastConcretePlantView { if (dataGridView.SelectedRows.Count == 1) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation(" No{id}. ''", id); + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("青赅 箋id}. 体<>弪 耱囹篑 磬 '妙蝾'", + id); try { - var operationResult = _orderLogic.FinishOrder(new OrderBindingModel - { - Id = id - }); + var operationResult = _orderLogic.FinishOrder(new + OrderBindingModel + { Id = id }); if (!operationResult) { - throw new Exception(" . ."); + throw new Exception("硒栳赅 镳<> 耦躔囗屙梃. 念镱腠栩咫 桧纛痨圉 <20> 腩汔."); } LoadData(); } catch (Exception ex) { - _logger.LogError(ex, " "); - MessageBox.Show(ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError(ex, "硒栳赅 铗戾蜿 <20> 泐蝾忭铖蜩 玎赅玎"); + MessageBox.Show(ex.Message, "硒栳赅", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } @@ -142,29 +152,28 @@ namespace PrecastConcretePlantView { if (dataGridView.SelectedRows.Count == 1) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation(" No{id}. ''", id); + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("青赅 箋id}. 体<>弪 耱囹篑 磬 '蔓溧'", id); try { - var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel - { - Id = id - }); + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); if (!operationResult) { - throw new Exception(" . ."); + throw new Exception("硒栳赅"); } - _logger.LogInformation(" No{id} ", id); + _logger.LogInformation("青赅 箋id} 恹溧", id); LoadData(); } catch (Exception ex) { - _logger.LogError(ex, " "); - MessageBox.Show(ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError(ex, "硒栳赅 铗戾蜿 <20> 恹溧麒 玎赅玎"); + MessageBox.Show(ex.Message, "硒栳赅", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } } - private void ButtonRef_Click(object sender, EventArgs e) + private void ButtonUpd_Click(object sender, EventArgs e) { LoadData(); } -- 2.25.1 From e83c6ee11f82d71d051c0b332e66ce316bc99bf5 Mon Sep 17 00:00:00 2001 From: K Date: Thu, 16 May 2024 21:59:54 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=20=D1=85=D0=B0?= =?UTF-8?q?=D1=80=D0=B4=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BB=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormMain.Designer.cs | 45 +++--- .../PrecastConcretePlantView/FormMain.cs | 43 +++--- .../FormReinforcedSale.Designer.cs | 128 ++++++++++++++++ .../FormReinforcedSale.cs | 87 +++++++++++ .../FormReinforcedSale.resx | 120 +++++++++++++++ .../FormShop.Designer.cs | 84 ++++++---- .../PrecastConcretePlantView/FormShop.cs | 8 +- .../FormShopRefill.cs | 2 +- .../FormShopReplenishment.Designer.cs | 145 ++++++++++++++++++ .../FormShopReplenishment.cs | 126 +++++++++++++++ .../FormShopReplenishment.resx | 120 +++++++++++++++ .../PrecastConcretePlantView/FormShopS.cs | 1 - .../PrecastConcretePlantView/Program.cs | 14 +- 13 files changed, 842 insertions(+), 81 deletions(-) create mode 100644 PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.Designer.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.resx create mode 100644 PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.Designer.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.cs create mode 100644 PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.resx diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.Designer.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.Designer.cs index 4f2a32a..2299c79 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.Designer.cs +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.Designer.cs @@ -32,14 +32,15 @@ справочникToolStripMenuItem = new ToolStripMenuItem(); компонентыToolStripMenuItem = new ToolStripMenuItem(); изделияToolStripMenuItem = new ToolStripMenuItem(); + магазиныToolStripMenuItem = new ToolStripMenuItem(); + пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem(); + продажаИзделийToolStripMenuItem = new ToolStripMenuItem(); buttonRef = new Button(); buttonIssuedOrder = new Button(); buttonOrderReady = new Button(); buttonTakeOrderInWork = new Button(); buttonCreateOrder = new Button(); dataGridView = new DataGridView(); - магазиныToolStripMenuItem = new ToolStripMenuItem(); - пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -47,7 +48,7 @@ // menuStrip1 // menuStrip1.ImageScalingSize = new Size(20, 20); - menuStrip1.Items.AddRange(new ToolStripItem[] { справочникToolStripMenuItem, пополнениеМагазинаToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникToolStripMenuItem, пополнениеМагазинаToolStripMenuItem, продажаИзделийToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Padding = new Padding(6, 3, 0, 3); @@ -76,6 +77,27 @@ изделияToolStripMenuItem.Text = "Изделия"; изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // + // магазиныToolStripMenuItem + // + магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + магазиныToolStripMenuItem.Size = new Size(224, 26); + магазиныToolStripMenuItem.Text = "Магазины"; + магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; + // + // пополнениеМагазинаToolStripMenuItem + // + пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem"; + пополнениеМагазинаToolStripMenuItem.Size = new Size(182, 24); + пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина"; + пополнениеМагазинаToolStripMenuItem.Click += ПополнениеМагазинаToolStripMenuItem_Click; + // + // продажаИзделийToolStripMenuItem + // + продажаИзделийToolStripMenuItem.Name = "продажаИзделийToolStripMenuItem"; + продажаИзделийToolStripMenuItem.Size = new Size(149, 24); + продажаИзделийToolStripMenuItem.Text = "Продажа изделий"; + продажаИзделийToolStripMenuItem.Click += ПродажаИзделийToolStripMenuItem_Click; + // // buttonRef // buttonRef.Location = new Point(931, 273); @@ -84,7 +106,7 @@ buttonRef.TabIndex = 23; buttonRef.Text = "Обновить список"; buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += ButtonRef_Click; + buttonRef.Click += ButtonUpd_Click; // // buttonIssuedOrder // @@ -136,20 +158,6 @@ dataGridView.Size = new Size(925, 374); dataGridView.TabIndex = 18; // - // магазиныToolStripMenuItem - // - магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - магазиныToolStripMenuItem.Size = new Size(224, 26); - магазиныToolStripMenuItem.Text = "Магазины"; - магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; - // - // пополнениеМагазинаToolStripMenuItem - // - пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem"; - пополнениеМагазинаToolStripMenuItem.Size = new Size(182, 24); - пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина"; - пополнениеМагазинаToolStripMenuItem.Click += ПополнениеМагазинаToolStripMenuItem_Click; - // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -187,5 +195,6 @@ private DataGridView dataGridView; private ToolStripMenuItem магазиныToolStripMenuItem; private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; + private ToolStripMenuItem продажаИзделийToolStripMenuItem; } } \ No newline at end of file diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.cs index ff7d4d3..79aed03 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/FormMain.cs +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormMain.cs @@ -38,15 +38,15 @@ namespace PrecastConcretePlantView dataGridView.Columns["ReinforcedId"].Visible = false; dataGridView.Columns["reinforcedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } - _logger.LogInformation("青沭箸赅 玎赅珙"); + _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) { - _logger.LogError(ex, "硒栳赅 玎沭箸觇 玎赅珙"); - MessageBox.Show(ex.Message, "硒栳赅", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - private void 暑祜铐屙螓ToolStripMenuItem_Click(object sender, EventArgs e) + private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormComponentS)); @@ -55,8 +55,7 @@ namespace PrecastConcretePlantView form.ShowDialog(); } } - private void 如溴腓ToolStripMenuItem_Click(object sender, EventArgs e) - + private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormReinforcedS)); if (service is FormReinforcedS form) @@ -64,7 +63,7 @@ namespace PrecastConcretePlantView form.ShowDialog(); } } - private void 锑汔玷睇ToolStripMenuItem_Click(object sender, EventArgs e) + private void МагазиныToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormShops)); if (service is FormShops form) @@ -72,7 +71,7 @@ namespace PrecastConcretePlantView form.ShowDialog(); } } - private void 项镱腠屙桢锑汔玷磬ToolStripMenuItem_Click(object sender, EventArgs e) + private void ПополнениеМагазинаToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormShopReplenishment)); if (service is FormShopReplenishment form) @@ -80,7 +79,7 @@ namespace PrecastConcretePlantView form.ShowDialog(); } } - private void 橡钿噫嗳玟咫栝ToolStripMenuItem_Click(object sender, EventArgs e) + private void ПродажаИзделийToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormReinforcedSale)); if (service is FormReinforcedSale form) @@ -104,20 +103,20 @@ namespace PrecastConcretePlantView { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("青赅 箋id}. 体<>弪 耱囹篑 磬 '<27> 疣犷蝈'", id); + _logger.LogInformation("Заказ {id}. Меняется статус на 'В работе'", id); try { var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id }); if (!operationResult) { - throw new Exception("硒栳赅 镳<> 耦躔囗屙梃.念镱腠栩咫 桧纛痨圉 <20> 腩汔."); + throw new Exception("Ошибка при сохранении.Дополнительная информация в логах."); } LoadData(); } catch (Exception ex) { - _logger.LogError(ex, "硒栳赅 镥疱溧麒 玎赅玎 <20> 疣犷蝮"); - MessageBox.Show(ex.Message, "硒栳赅", MessageBoxButtons.OK, + _logger.LogError(ex, "Ошибка передачи заказа в работу"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -128,7 +127,7 @@ namespace PrecastConcretePlantView { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("青赅 箋id}. 体<>弪 耱囹篑 磬 '妙蝾'", + _logger.LogInformation("Заказ {id}. Меняется статус на 'Готов'", id); try { @@ -137,14 +136,14 @@ namespace PrecastConcretePlantView { Id = id }); if (!operationResult) { - throw new Exception("硒栳赅 镳<> 耦躔囗屙梃. 念镱腠栩咫 桧纛痨圉 <20> 腩汔."); + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); } LoadData(); } catch (Exception ex) { - _logger.LogError(ex, "硒栳赅 铗戾蜿 <20> 泐蝾忭铖蜩 玎赅玎"); - MessageBox.Show(ex.Message, "硒栳赅", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError(ex, "Ошибка отметки о готовности заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } @@ -154,21 +153,21 @@ namespace PrecastConcretePlantView { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("青赅 箋id}. 体<>弪 耱囹篑 磬 '蔓溧'", id); + _logger.LogInformation("Заказ {id}. Меняется статус на 'Выдан'", id); try { var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); if (!operationResult) { - throw new Exception("硒栳赅"); + throw new Exception("Ошибка"); } - _logger.LogInformation("青赅 箋id} 恹溧", id); + _logger.LogInformation("Заказ {id} выдан", id); LoadData(); } catch (Exception ex) { - _logger.LogError(ex, "硒栳赅 铗戾蜿 <20> 恹溧麒 玎赅玎"); - MessageBox.Show(ex.Message, "硒栳赅", MessageBoxButtons.OK, + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.Designer.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.Designer.cs new file mode 100644 index 0000000..c36794e --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.Designer.cs @@ -0,0 +1,128 @@ +namespace PrecastConcretePlantView +{ + partial class FormReinforcedSale + { + /// + /// 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() + { + buttonCancel = new Button(); + buttonSale = new Button(); + textBoxCount = new TextBox(); + labelCount = new Label(); + comboBoxReinforced = new ComboBox(); + labelReinforced = new Label(); + SuspendLayout(); + // + // buttonCancel + // + buttonCancel.Location = new Point(289, 111); + buttonCancel.Margin = new Padding(5, 4, 5, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(101, 36); + buttonCancel.TabIndex = 17; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // buttonSale + // + buttonSale.Location = new Point(182, 111); + buttonSale.Margin = new Padding(5, 4, 5, 4); + buttonSale.Name = "buttonSale"; + buttonSale.Size = new Size(101, 36); + buttonSale.TabIndex = 16; + buttonSale.Text = "Продать"; + buttonSale.UseVisualStyleBackColor = true; + buttonSale.Click += ButtonSale_Click; + // + // textBoxCount + // + textBoxCount.Location = new Point(115, 68); + textBoxCount.Margin = new Padding(5, 4, 5, 4); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(287, 27); + textBoxCount.TabIndex = 15; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(15, 72); + labelCount.Margin = new Padding(5, 0, 5, 0); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(93, 20); + labelCount.TabIndex = 14; + labelCount.Text = "Количество:"; + // + // comboBoxReinforced + // + comboBoxReinforced.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxReinforced.FormattingEnabled = true; + comboBoxReinforced.Location = new Point(115, 20); + comboBoxReinforced.Margin = new Padding(5, 4, 5, 4); + comboBoxReinforced.Name = "comboBoxReinforced"; + comboBoxReinforced.Size = new Size(287, 28); + comboBoxReinforced.TabIndex = 13; + // + // labelReinforced + // + labelReinforced.AutoSize = true; + labelReinforced.Location = new Point(15, 25); + labelReinforced.Margin = new Padding(5, 0, 5, 0); + labelReinforced.Name = "labelReinforced"; + labelReinforced.Size = new Size(71, 20); + labelReinforced.TabIndex = 12; + labelReinforced.Text = "Изделие:"; + // + // FormReinforcedSale + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(426, 164); + Controls.Add(buttonCancel); + Controls.Add(buttonSale); + Controls.Add(textBoxCount); + Controls.Add(labelCount); + Controls.Add(comboBoxReinforced); + Controls.Add(labelReinforced); + Margin = new Padding(3, 4, 3, 4); + Name = "FormReinforcedSale"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Продажа изделий"; + Load += FormReinforcedSale_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button buttonCancel; + private Button buttonSale; + private TextBox textBoxCount; + private Label labelCount; + private ComboBox comboBoxReinforced; + private Label labelReinforced; + } +} \ No newline at end of file diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.cs new file mode 100644 index 0000000..238f726 --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.cs @@ -0,0 +1,87 @@ +using PrecastConcretePlantContracts.BusinessLogicsContracts; +using PrecastConcretePlantContracts.BindingModels; +using Microsoft.Extensions.Logging; + +namespace PrecastConcretePlantView +{ + public partial class FormReinforcedSale : Form + { + private readonly ILogger _logger; + + private readonly IReinforcedLogic _logicReinforced; + + private readonly IShopLogic _logicShop; + + public FormReinforcedSale(ILogger logger, IReinforcedLogic logicReinforced, IShopLogic logicShop) + { + InitializeComponent(); + _logger = logger; + _logicReinforced = logicReinforced; + _logicShop = logicShop; + } + + private void FormReinforcedSale_Load(object sender, EventArgs e) + { + _logger.LogInformation("Reinforceds loading"); + try + { + var list = _logicReinforced.ReadList(null); + if (list != null) + { + comboBoxReinforced.DisplayMember = "ReinforcedName"; + comboBoxReinforced.ValueMember = "Id"; + comboBoxReinforced.DataSource = list; + comboBoxReinforced.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Reinforceds loading error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonSale_Click(object sender, EventArgs e) + { + if (comboBoxReinforced.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Reinforced sale"); + try + { + var operationResult = _logicShop.MakeSale( + new ReinforcedBindingModel + { + Id = Convert.ToInt32(comboBoxReinforced.SelectedValue) + }, + Convert.ToInt32(textBoxCount.Text) + ); + if (!operationResult) + { + throw new Exception("Ошибка при продаже."); + } + MessageBox.Show("Продажа прошла успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Reinforced sale error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.resx b/PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormReinforcedSale.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/PrecastConcretePlant/PrecastConcretePlantView/FormShop.Designer.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormShop.Designer.cs index 78f5a73..1e9c361 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/FormShop.Designer.cs +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormShop.Designer.cs @@ -36,11 +36,13 @@ labelOpeningDate = new Label(); groupBoxReinforceds = new GroupBox(); dataGridView = new DataGridView(); - buttonSave = new Button(); - buttonCancel = new Button(); ColumnId = new DataGridViewTextBoxColumn(); ColumnName = new DataGridViewTextBoxColumn(); ColumnCount = new DataGridViewTextBoxColumn(); + buttonSave = new Button(); + buttonCancel = new Button(); + textBoxMax = new Label(); + textBoxMaximum = new TextBox(); groupBoxReinforceds.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -60,7 +62,7 @@ textBoxName.Location = new Point(105, 9); textBoxName.Margin = new Padding(5, 4, 5, 4); textBoxName.Name = "textBoxName"; - textBoxName.Size = new Size(287, 27); + textBoxName.Size = new Size(302, 27); textBoxName.TabIndex = 2; // // labelAddress @@ -78,7 +80,7 @@ textBoxAddress.Location = new Point(105, 49); textBoxAddress.Margin = new Padding(5, 4, 5, 4); textBoxAddress.Name = "textBoxAddress"; - textBoxAddress.Size = new Size(287, 27); + textBoxAddress.Size = new Size(302, 27); textBoxAddress.TabIndex = 4; // // dateTimePicker @@ -86,7 +88,7 @@ dateTimePicker.Location = new Point(144, 88); dateTimePicker.Margin = new Padding(3, 4, 3, 4); dateTimePicker.Name = "dateTimePicker"; - dateTimePicker.Size = new Size(249, 27); + dateTimePicker.Size = new Size(263, 27); dateTimePicker.TabIndex = 5; // // labelOpeningDate @@ -102,11 +104,11 @@ // groupBoxReinforceds // groupBoxReinforceds.Controls.Add(dataGridView); - groupBoxReinforceds.Location = new Point(5, 133); + groupBoxReinforceds.Location = new Point(5, 183); groupBoxReinforceds.Margin = new Padding(5, 4, 5, 4); groupBoxReinforceds.Name = "groupBoxReinforceds"; groupBoxReinforceds.Padding = new Padding(5, 4, 5, 4); - groupBoxReinforceds.Size = new Size(536, 384); + groupBoxReinforceds.Size = new Size(536, 395); groupBoxReinforceds.TabIndex = 7; groupBoxReinforceds.TabStop = false; groupBoxReinforceds.Text = "Изделие"; @@ -127,31 +129,9 @@ dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersWidth = 51; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(522, 356); + dataGridView.Size = new Size(522, 367); dataGridView.TabIndex = 0; // - // buttonSave - // - buttonSave.Location = new Point(291, 525); - buttonSave.Margin = new Padding(5, 4, 5, 4); - buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(101, 36); - buttonSave.TabIndex = 8; - buttonSave.Text = "Сохранить"; - buttonSave.UseVisualStyleBackColor = true; - buttonSave.Click += ButtonSave_Click; - // - // buttonCancel - // - buttonCancel.Location = new Point(410, 525); - buttonCancel.Margin = new Padding(5, 4, 5, 4); - buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(101, 36); - buttonCancel.TabIndex = 9; - buttonCancel.Text = "Отмена"; - buttonCancel.UseVisualStyleBackColor = true; - buttonCancel.Click += ButtonCancel_Click; - // // ColumnId // ColumnId.HeaderText = "Id"; @@ -177,11 +157,51 @@ ColumnCount.ReadOnly = true; ColumnCount.Width = 125; // + // buttonSave + // + buttonSave.Location = new Point(306, 586); + buttonSave.Margin = new Padding(5, 4, 5, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(101, 36); + buttonSave.TabIndex = 8; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += ButtonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(417, 586); + buttonCancel.Margin = new Padding(5, 4, 5, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(101, 36); + buttonCancel.TabIndex = 9; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // textBoxMax + // + textBoxMax.AutoSize = true; + textBoxMax.Location = new Point(16, 141); + textBoxMax.Name = "textBoxMax"; + textBoxMax.Size = new Size(270, 20); + textBoxMax.TabIndex = 10; + textBoxMax.Text = "Максимальное колличество изделий:"; + // + // textBoxMaximum + // + textBoxMaximum.Location = new Point(306, 138); + textBoxMaximum.Name = "textBoxMaximum"; + textBoxMaximum.Size = new Size(101, 27); + textBoxMaximum.TabIndex = 11; + // // FormShop // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(546, 576); + ClientSize = new Size(546, 635); + Controls.Add(textBoxMaximum); + Controls.Add(textBoxMax); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(groupBoxReinforceds); @@ -217,5 +237,7 @@ private DataGridViewTextBoxColumn ColumnId; private DataGridViewTextBoxColumn ColumnName; private DataGridViewTextBoxColumn ColumnCount; + private Label textBoxMax; + private TextBox textBoxMaximum; } } \ No newline at end of file diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormShop.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormShop.cs index 8c3ed32..f02ac17 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/FormShop.cs +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormShop.cs @@ -4,7 +4,6 @@ using PrecastConcretePlantContracts.SearchModels; using PrecastConcretePlantDataModels.Models; using Microsoft.Extensions.Logging; using PrecastConcretePlantListImplement.Models; -using System.Windows.Forms; namespace PrecastConcretePlantView { @@ -41,6 +40,7 @@ namespace PrecastConcretePlantView textBoxName.Text = view.ShopName; textBoxAddress.Text = view.Address; dateTimePicker.Value = view.DateOpening; + textBoxMaximum.Text = view.ReinforcedsMax.ToString(); _shopReinforceds = view.ShopReinforceds ?? new Dictionary(); LoadData(); } @@ -91,6 +91,11 @@ namespace PrecastConcretePlantView MessageBox.Show("Заполните дату", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } + if (string.IsNullOrEmpty(textBoxMaximum.Text)) + { + MessageBox.Show("Заполните максимальное количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } _logger.LogInformation("Shop saving"); try { @@ -100,6 +105,7 @@ namespace PrecastConcretePlantView ShopName = textBoxName.Text, Address = textBoxAddress.Text, DateOpening = dateTimePicker.Value, + ReinforcedsMax = Convert.ToInt32(textBoxMaximum.Text), ShopReinforceds = _shopReinforceds }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormShopRefill.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormShopRefill.cs index c272b61..fd340ab 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/FormShopRefill.cs +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormShopRefill.cs @@ -95,7 +95,7 @@ namespace PrecastConcretePlantView { throw new Exception("Изделие не найдено."); } - var operationResult = _logicShop.RefillShop(new ShopSearchModel + var operationResult = _logicShop.ReplenishShop(new ShopSearchModel { Id = Convert.ToInt32(comboBoxShop.SelectedValue) }, diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.Designer.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.Designer.cs new file mode 100644 index 0000000..1114748 --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.Designer.cs @@ -0,0 +1,145 @@ +namespace PrecastConcretePlantView +{ + partial class FormShopReplenishment + { + /// + /// 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() + { + labelShop = new Label(); + labelReinforced = new Label(); + labelCount = new Label(); + comboBoxShop = new ComboBox(); + comboBoxReinforced = new ComboBox(); + textBoxCount = new TextBox(); + buttonCancel = new Button(); + buttonSave = new Button(); + SuspendLayout(); + // + // labelShop + // + labelShop.AutoSize = true; + labelShop.Location = new Point(27, 29); + labelShop.Name = "labelShop"; + labelShop.Size = new Size(72, 20); + labelShop.TabIndex = 0; + labelShop.Text = "Магазин:"; + // + // labelReinforced + // + labelReinforced.AutoSize = true; + labelReinforced.Location = new Point(27, 73); + labelReinforced.Name = "labelReinforced"; + labelReinforced.Size = new Size(71, 20); + labelReinforced.TabIndex = 1; + labelReinforced.Text = "Изделие:"; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(27, 118); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(93, 20); + labelCount.TabIndex = 2; + labelCount.Text = "Количество:"; + // + // comboBoxShop + // + comboBoxShop.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxShop.FormattingEnabled = true; + comboBoxShop.Location = new Point(136, 29); + comboBoxShop.Name = "comboBoxShop"; + comboBoxShop.Size = new Size(239, 28); + comboBoxShop.TabIndex = 3; + // + // comboBoxReinforced + // + comboBoxReinforced.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxReinforced.FormattingEnabled = true; + comboBoxReinforced.Location = new Point(136, 73); + comboBoxReinforced.Name = "comboBoxReinforced"; + comboBoxReinforced.Size = new Size(239, 28); + comboBoxReinforced.TabIndex = 4; + // + // textBoxCount + // + textBoxCount.Location = new Point(136, 118); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(239, 27); + textBoxCount.TabIndex = 5; + // + // buttonCancel + // + buttonCancel.Location = new Point(282, 162); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(93, 29); + buttonCancel.TabIndex = 6; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // buttonSave + // + buttonSave.Location = new Point(182, 162); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(94, 29); + buttonSave.TabIndex = 7; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += ButtonSave_Click; + // + // FormShopReplenishment + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(422, 203); + Controls.Add(buttonSave); + Controls.Add(buttonCancel); + Controls.Add(textBoxCount); + Controls.Add(comboBoxReinforced); + Controls.Add(comboBoxShop); + Controls.Add(labelCount); + Controls.Add(labelReinforced); + Controls.Add(labelShop); + Name = "FormShopReplenishment"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Пополнение магазина"; + Load += FormShopReplenishment_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelShop; + private Label labelReinforced; + private Label labelCount; + private ComboBox comboBoxShop; + private ComboBox comboBoxReinforced; + private TextBox textBoxCount; + private Button buttonCancel; + private Button buttonSave; + } +} \ No newline at end of file diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.cs new file mode 100644 index 0000000..8a7ea68 --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.cs @@ -0,0 +1,126 @@ +using Microsoft.Extensions.Logging; + +using PrecastConcretePlantContracts.BusinessLogicsContracts; +using PrecastConcretePlantContracts.SearchModels; +using PrecastConcretePlantListImplement.Models; +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 PrecastConcretePlantView +{ + public partial class FormShopReplenishment : Form + { + private readonly ILogger _logger; + + private readonly IReinforcedLogic _logicReinforced; + + private readonly IShopLogic _logicShop; + + public FormShopReplenishment(ILogger logger, IReinforcedLogic logicReinforced, IShopLogic logicShop) + { + InitializeComponent(); + _logger = logger; + _logicReinforced = logicReinforced; + _logicShop = logicShop; + } + + private void FormShopReplenishment_Load(object sender, EventArgs e) + { + _logger.LogInformation("Reinforceds loading"); + try + { + var list = _logicReinforced.ReadList(null); + if (list != null) + { + comboBoxReinforced.DisplayMember = "ReinforcedName"; + comboBoxReinforced.ValueMember = "Id"; + comboBoxReinforced.DataSource = list; + comboBoxReinforced.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Reinforceds loading error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + _logger.LogInformation("Shops loading"); + try + { + var list = _logicShop.ReadList(null); + if (list != null) + { + comboBoxShop.DisplayMember = "ShopName"; + comboBoxShop.ValueMember = "Id"; + comboBoxShop.DataSource = list; + comboBoxShop.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Shops loading error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (comboBoxShop.SelectedValue == null) + { + MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxReinforced.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Shop replenishment"); + try + { + var reinforced = _logicReinforced.ReadElement(new ReinforcedSearchModel + { Id = Convert.ToInt32(comboBoxReinforced.SelectedValue) }); + if (reinforced == null) + { + throw new Exception("Изделие не найдено."); + } + var operationResult = _logicShop.ReplenishShop(new ShopSearchModel + { + Id = Convert.ToInt32(comboBoxShop.SelectedValue) + }, + reinforced, Convert.ToInt32(textBoxCount.Text)); + if (!operationResult) + { + throw new Exception("Ошибка при проведении поставки."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Shop replenishment error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + DialogResult = DialogResult.OK; + Close(); + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.resx b/PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormShopReplenishment.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/PrecastConcretePlant/PrecastConcretePlantView/FormShopS.cs b/PrecastConcretePlant/PrecastConcretePlantView/FormShopS.cs index 2ecf768..ac07dd0 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/FormShopS.cs +++ b/PrecastConcretePlant/PrecastConcretePlantView/FormShopS.cs @@ -1,7 +1,6 @@ using PrecastConcretePlantContracts.BindingModels; using PrecastConcretePlantContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; -using System.Windows.Forms; namespace PrecastConcretePlantView { diff --git a/PrecastConcretePlant/PrecastConcretePlantView/Program.cs b/PrecastConcretePlant/PrecastConcretePlantView/Program.cs index 81aca21..9cdcd31 100644 --- a/PrecastConcretePlant/PrecastConcretePlantView/Program.cs +++ b/PrecastConcretePlant/PrecastConcretePlantView/Program.cs @@ -1,11 +1,11 @@ +using PrecastConcretePlantContracts.BusinessLogicsContracts; +using PrecastConcretePlantBusinessLogic.BusinessLogics; +using PrecastConcretePlantContracts.StoragesContracts; +using PrecastConcretePlantFileImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; -using PrecastConcretePlantBusinessLogic.BusinessLogics; -using PrecastConcretePlantContracts.BusinessLogicsContracts; -using PrecastConcretePlantContracts.StoragesContracts; -using PrecastConcretePlantFileImplement.Implements; -using System; + namespace PrecastConcretePlantView { @@ -34,7 +34,6 @@ namespace PrecastConcretePlantView option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -54,7 +53,8 @@ namespace PrecastConcretePlantView services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file -- 2.25.1