merge branch lab-1-hard into lab-2

BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs

@@ -32,6 +32,8 @@
             GuidesToolStripMenuItem = new ToolStripMenuItem();
             ComponentsToolStripMenuItem = new ToolStripMenuItem();
             ManufacturesToolStripMenuItem = new ToolStripMenuItem();
+            ShopsToolStripMenuItem = new ToolStripMenuItem();
+            SupplyToolStripMenuItem = new ToolStripMenuItem();
             dataGridView = new DataGridView();
             buttonCreateOrder = new Button();
             buttonRefresh = new Button();
@@ -53,7 +55,7 @@
             // 
             // GuidesToolStripMenuItem
             // 
-            GuidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ManufacturesToolStripMenuItem });
+            GuidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ManufacturesToolStripMenuItem, ShopsToolStripMenuItem, SupplyToolStripMenuItem });
             GuidesToolStripMenuItem.Name = "GuidesToolStripMenuItem";
             GuidesToolStripMenuItem.Size = new Size(94, 20);
             GuidesToolStripMenuItem.Text = "Справочники";
@@ -61,17 +63,31 @@
             // ComponentsToolStripMenuItem
             // 
             ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem";
-            ComponentsToolStripMenuItem.Size = new Size(181, 22);
+            ComponentsToolStripMenuItem.Size = new Size(198, 22);
             ComponentsToolStripMenuItem.Text = "Компоненты";
             ComponentsToolStripMenuItem.Click += ComponentsStripMenuItem_Click;
             // 
             // ManufacturesToolStripMenuItem
             // 
             ManufacturesToolStripMenuItem.Name = "ManufacturesToolStripMenuItem";
-            ManufacturesToolStripMenuItem.Size = new Size(181, 22);
+            ManufacturesToolStripMenuItem.Size = new Size(198, 22);
             ManufacturesToolStripMenuItem.Text = "Кузнечные изделия";
             ManufacturesToolStripMenuItem.Click += ManufacturesStripMenuItem_Click;
             // 
+            // ShopsToolStripMenuItem
+            // 
+            ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem";
+            ShopsToolStripMenuItem.Size = new Size(198, 22);
+            ShopsToolStripMenuItem.Text = "Магазины";
+            ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
+            // 
+            // SupplyToolStripMenuItem
+            // 
+            SupplyToolStripMenuItem.Name = "SupplyToolStripMenuItem";
+            SupplyToolStripMenuItem.Size = new Size(198, 22);
+            SupplyToolStripMenuItem.Text = "Пополнение магазина";
+            SupplyToolStripMenuItem.Click += SupplyToolStripMenuItem_Click;
+            // 
             // dataGridView
             // 
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
@@ -167,5 +183,7 @@
         private Button buttonIssued;
         private Button buttonReady;
         private Button buttonTakeInWork;
+        private ToolStripMenuItem ShopsToolStripMenuItem;
+        private ToolStripMenuItem SupplyToolStripMenuItem;
     }
 }

BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs

@@ -163,5 +163,21 @@ namespace BlacksmithWorkshop
         {
             LoadData();
         }
+        private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            if (service is FormShops form)
+            {
+                form.ShowDialog();
+            }
+        }
+        private void SupplyToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormSupply));
+            if (service is FormSupply form)
+            {
+                form.ShowDialog();
+            }
+        }
     }
 }

BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs

@@ -0,0 +1,186 @@
+namespace BlacksmithWorkshop
+{
+	partial class FormShop
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			dataGridView = new DataGridView();
+			ColumnId = new DataGridViewTextBoxColumn();
+			ColumnName = new DataGridViewTextBoxColumn();
+			ColumnPrice = new DataGridViewTextBoxColumn();
+			ColumnCount = new DataGridViewTextBoxColumn();
+			dateTimePicker = new DateTimePicker();
+			labelName = new Label();
+			labelAddress = new Label();
+			labelDate = new Label();
+			textBoxName = new TextBox();
+			textBoxAddress = new TextBox();
+			buttonSave = new Button();
+			buttonCancel = new Button();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// dataGridView
+			// 
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnPrice, ColumnCount });
+			dataGridView.Location = new Point(12, 101);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowTemplate.Height = 25;
+			dataGridView.Size = new Size(553, 281);
+			dataGridView.TabIndex = 0;
+			// 
+			// ColumnId
+			// 
+			ColumnId.HeaderText = "";
+			ColumnId.Name = "ColumnId";
+			ColumnId.Visible = false;
+			// 
+			// ColumnName
+			// 
+			ColumnName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+			ColumnName.HeaderText = "Изделие";
+			ColumnName.Name = "ColumnName";
+			// 
+			// ColumnPrice
+			// 
+			ColumnPrice.HeaderText = "Цена";
+			ColumnPrice.Name = "ColumnPrice";
+			// 
+			// ColumnCount
+			// 
+			ColumnCount.HeaderText = "Количество";
+			ColumnCount.Name = "ColumnCount";
+			// 
+			// dateTimePicker
+			// 
+			dateTimePicker.Location = new Point(150, 63);
+			dateTimePicker.Name = "dateTimePicker";
+			dateTimePicker.Size = new Size(166, 23);
+			dateTimePicker.TabIndex = 1;
+			// 
+			// labelName
+			// 
+			labelName.AutoSize = true;
+			labelName.Location = new Point(12, 9);
+			labelName.Name = "labelName";
+			labelName.Size = new Size(62, 15);
+			labelName.TabIndex = 2;
+			labelName.Text = "Название:";
+			// 
+			// labelAddress
+			// 
+			labelAddress.AutoSize = true;
+			labelAddress.Location = new Point(12, 38);
+			labelAddress.Name = "labelAddress";
+			labelAddress.Size = new Size(43, 15);
+			labelAddress.TabIndex = 3;
+			labelAddress.Text = "Адрес:";
+			// 
+			// labelDate
+			// 
+			labelDate.AutoSize = true;
+			labelDate.Location = new Point(12, 69);
+			labelDate.Name = "labelDate";
+			labelDate.Size = new Size(90, 15);
+			labelDate.TabIndex = 4;
+			labelDate.Text = "Дата открытия:";
+			// 
+			// textBoxName
+			// 
+			textBoxName.Location = new Point(150, 6);
+			textBoxName.Name = "textBoxName";
+			textBoxName.Size = new Size(166, 23);
+			textBoxName.TabIndex = 5;
+			// 
+			// textBoxAddress
+			// 
+			textBoxAddress.Location = new Point(150, 35);
+			textBoxAddress.Name = "textBoxAddress";
+			textBoxAddress.Size = new Size(166, 23);
+			textBoxAddress.TabIndex = 6;
+			// 
+			// buttonSave
+			// 
+			buttonSave.Location = new Point(12, 401);
+			buttonSave.Name = "buttonSave";
+			buttonSave.Size = new Size(123, 25);
+			buttonSave.TabIndex = 7;
+			buttonSave.Text = "Сохранить";
+			buttonSave.UseVisualStyleBackColor = true;
+			buttonSave.Click += SaveButton_Click;
+			// 
+			// buttonCancel
+			// 
+			buttonCancel.Location = new Point(150, 401);
+			buttonCancel.Name = "buttonCancel";
+			buttonCancel.Size = new Size(123, 25);
+			buttonCancel.TabIndex = 8;
+			buttonCancel.Text = "Отмена";
+			buttonCancel.UseVisualStyleBackColor = true;
+			buttonCancel.Click += CancelButton_Click;
+			// 
+			// FormShop
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(585, 450);
+			Controls.Add(buttonCancel);
+			Controls.Add(buttonSave);
+			Controls.Add(textBoxAddress);
+			Controls.Add(textBoxName);
+			Controls.Add(labelDate);
+			Controls.Add(labelAddress);
+			Controls.Add(labelName);
+			Controls.Add(dateTimePicker);
+			Controls.Add(dataGridView);
+			Name = "FormShop";
+			StartPosition = FormStartPosition.CenterParent;
+			Text = "Магазин";
+			Load += FormShop_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+			PerformLayout();
+		}
+
+		#endregion
+
+		private DataGridView dataGridView;
+		private DateTimePicker dateTimePicker;
+		private Label labelName;
+		private Label labelAddress;
+		private Label labelDate;
+		private TextBox textBoxName;
+		private TextBox textBoxAddress;
+		private DataGridViewTextBoxColumn ColumnId;
+		private DataGridViewTextBoxColumn ColumnName;
+		private DataGridViewTextBoxColumn ColumnPrice;
+		private DataGridViewTextBoxColumn ColumnCount;
+		private Button buttonSave;
+		private Button buttonCancel;
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs

@@ -0,0 +1,122 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopDataModels.Models;
+using Microsoft.Extensions.Logging;
+using Microsoft.VisualBasic.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 BlacksmithWorkshop
+{
+	public partial class FormShop : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IShopLogic _logic;
+		public int? _id;
+		private Dictionary<int, (IManufactureModel, int)> _manufactures;
+		public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logic = logic;
+			_manufactures = new();
+		}
+		private void FormShop_Load(object sender, EventArgs e)
+		{
+			if (_id.HasValue)
+			{
+				_logger.LogInformation("Загрузка магазина");
+				try
+				{
+					var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
+					if (shop != null)
+					{
+						textBoxName.Text = shop.ShopName;
+						textBoxAddress.Text = shop.Address;
+						dateTimePicker.Text = shop.OpeningDate.ToString();
+						_manufactures = shop.ShopManufactures;
+					}
+					LoadData();
+				}
+				catch (Exception ex)
+				{
+					_logger.LogError(ex, "Ошибка загрузки магазина");
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+					MessageBoxIcon.Error);
+				}
+			}
+		}
+		private void LoadData()
+		{
+			_logger.LogInformation("Загрузка товаров магазина");
+			try
+			{
+				if (_manufactures != null)
+				{
+					foreach (var manufactures in _manufactures)
+					{
+						dataGridView.Rows.Add(new object[] { manufactures.Key, manufactures.Value.Item1.ManufactureName,
+						manufactures.Value.Item1.Price, manufactures.Value.Item2 });
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки изделий магазина");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+				MessageBoxIcon.Error);
+			}
+		}
+		private void CancelButton_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+		private void SaveButton_Click(object sender, EventArgs e)
+		{
+			if (string.IsNullOrEmpty(textBoxName.Text))
+			{
+				MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			if (string.IsNullOrEmpty(textBoxAddress.Text))
+			{
+				MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			_logger.LogInformation("Сохранение магазина");
+			try
+			{
+				var model = new ShopBindingModel
+				{
+					Id = _id ?? 0,
+					ShopName = textBoxName.Text,
+					Address = textBoxAddress.Text,
+					OpeningDate = dateTimePicker.Value.Date,
+					ShopManufactures = _manufactures
+				};
+				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);
+			}
+		}
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormShop.resx

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="ColumnId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumnPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs

@@ -0,0 +1,114 @@
+namespace BlacksmithWorkshop
+{
+	partial class FormShops
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			dataGridView = new DataGridView();
+			buttonAdd = new Button();
+			buttonUpdate = new Button();
+			buttonDelete = new Button();
+			buttonRefresh = new Button();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// dataGridView
+			// 
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Location = new Point(0, 0);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowTemplate.Height = 25;
+			dataGridView.Size = new Size(567, 450);
+			dataGridView.TabIndex = 0;
+			// 
+			// buttonAdd
+			// 
+			buttonAdd.Location = new Point(617, 22);
+			buttonAdd.Name = "buttonAdd";
+			buttonAdd.Size = new Size(152, 33);
+			buttonAdd.TabIndex = 1;
+			buttonAdd.Text = "Создать";
+			buttonAdd.UseVisualStyleBackColor = true;
+			buttonAdd.Click += AddButton_Click;
+			// 
+			// buttonUpdate
+			// 
+			buttonUpdate.Location = new Point(617, 61);
+			buttonUpdate.Name = "buttonUpdate";
+			buttonUpdate.Size = new Size(152, 33);
+			buttonUpdate.TabIndex = 2;
+			buttonUpdate.Text = "Изменить";
+			buttonUpdate.UseVisualStyleBackColor = true;
+			buttonUpdate.Click += UpdateButton_Click;
+			// 
+			// buttonDelete
+			// 
+			buttonDelete.Location = new Point(617, 100);
+			buttonDelete.Name = "buttonDelete";
+			buttonDelete.Size = new Size(152, 33);
+			buttonDelete.TabIndex = 3;
+			buttonDelete.Text = "Удалить";
+			buttonDelete.UseVisualStyleBackColor = true;
+			buttonDelete.Click += DeleteButton_Click;
+			// 
+			// buttonRefresh
+			// 
+			buttonRefresh.Location = new Point(617, 139);
+			buttonRefresh.Name = "buttonRefresh";
+			buttonRefresh.Size = new Size(152, 33);
+			buttonRefresh.TabIndex = 4;
+			buttonRefresh.Text = "Обновить";
+			buttonRefresh.UseVisualStyleBackColor = true;
+			buttonRefresh.Click += RefreshButton_Click;
+			// 
+			// FormShops
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(800, 450);
+			Controls.Add(buttonRefresh);
+			Controls.Add(buttonDelete);
+			Controls.Add(buttonUpdate);
+			Controls.Add(buttonAdd);
+			Controls.Add(dataGridView);
+			Name = "FormShops";
+			StartPosition = FormStartPosition.CenterParent;
+			Text = "Магазины";
+			Load += FormShops_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+		}
+
+		#endregion
+
+		private DataGridView dataGridView;
+		private Button buttonAdd;
+		private Button buttonUpdate;
+		private Button buttonDelete;
+		private Button buttonRefresh;
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs

@@ -0,0 +1,110 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.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 BlacksmithWorkshop
+{
+	public partial class FormShops : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IShopLogic _logic;
+		public FormShops(ILogger<FormShops> logger, IShopLogic logic)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logic = logic;
+		}
+		private void LoadData()
+		{
+			try
+			{
+				var list = _logic.ReadList(null);
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["Id"].Visible = false;
+					dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["OpeningDate"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["ShopManufactures"].Visible = false;
+				}
+				_logger.LogInformation("Загрузка магазинов");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки магазинов");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+		private void FormShops_Load(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+		private void AddButton_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+			if (service is FormShop form)
+			{
+				if (form.ShowDialog() == DialogResult.OK)
+				{
+					LoadData();
+				}
+			}
+		}
+		private void UpdateButton_Click(object sender, EventArgs e)
+		{
+			if (dataGridView.SelectedRows.Count == 1)
+			{
+				var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+				if (service is FormShop form)
+				{
+					form._id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+					if (form.ShowDialog() == DialogResult.OK)
+					{
+						LoadData();
+					}
+				}
+			}
+		}
+		private void RefreshButton_Click(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+		private void DeleteButton_Click(object sender, EventArgs e)
+		{
+			if (dataGridView.SelectedRows.Count == 1)
+			{
+				if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+				{
+					int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+					_logger.LogInformation("Удаление магазина");
+					try
+					{
+						if (!_logic.Delete(new ShopBindingModel
+						{
+							Id = id
+						}))
+						{
+							throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+						}
+						LoadData();
+					}
+					catch (Exception ex)
+					{
+						_logger.LogError(ex, "Ошибка удаления магазина");
+						MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+					}
+				}
+			}
+		}
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormShops.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.Designer.cs

@@ -0,0 +1,108 @@
+namespace BlacksmithWorkshop
+{
+    partial class FormSupply
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            ShopComboBox = new ComboBox();
+            ManufactureComboBox = new ComboBox();
+            CountTextBox = new TextBox();
+            buttonSave = new Button();
+            buttonCansel = new Button();
+            SuspendLayout();
+            // 
+            // ShopComboBox
+            // 
+            ShopComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
+            ShopComboBox.FormattingEnabled = true;
+            ShopComboBox.Location = new Point(12, 12);
+            ShopComboBox.Name = "ShopComboBox";
+            ShopComboBox.Size = new Size(224, 23);
+            ShopComboBox.TabIndex = 0;
+            // 
+            // ManufactureComboBox
+            // 
+            ManufactureComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
+            ManufactureComboBox.FormattingEnabled = true;
+            ManufactureComboBox.Location = new Point(242, 12);
+            ManufactureComboBox.Name = "ManufactureComboBox";
+            ManufactureComboBox.Size = new Size(224, 23);
+            ManufactureComboBox.TabIndex = 1;
+            // 
+            // CountTextBox
+            // 
+            CountTextBox.Location = new Point(472, 12);
+            CountTextBox.Name = "CountTextBox";
+            CountTextBox.Size = new Size(224, 23);
+            CountTextBox.TabIndex = 2;
+            // 
+            // buttonSave
+            // 
+            buttonSave.Location = new Point(162, 47);
+            buttonSave.Name = "buttonSave";
+            buttonSave.Size = new Size(157, 28);
+            buttonSave.TabIndex = 3;
+            buttonSave.Text = "Сохранить";
+            buttonSave.UseVisualStyleBackColor = true;
+            buttonSave.Click += SaveButton_Click;
+            // 
+            // buttonCansel
+            // 
+            buttonCansel.Location = new Point(394, 47);
+            buttonCansel.Name = "buttonCansel";
+            buttonCansel.Size = new Size(157, 28);
+            buttonCansel.TabIndex = 4;
+            buttonCansel.Text = "Отмена";
+            buttonCansel.UseVisualStyleBackColor = true;
+            buttonCansel.Click += CancelButton_Click;
+            // 
+            // FormSupply
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(707, 87);
+            Controls.Add(buttonCansel);
+            Controls.Add(buttonSave);
+            Controls.Add(CountTextBox);
+            Controls.Add(ManufactureComboBox);
+            Controls.Add(ShopComboBox);
+            Name = "FormSupply";
+            StartPosition = FormStartPosition.CenterParent;
+            Text = "Пополнение магазина";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private ComboBox ShopComboBox;
+        private ComboBox ManufactureComboBox;
+        private TextBox CountTextBox;
+        private Button buttonSave;
+        private Button buttonCansel;
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.cs

@@ -0,0 +1,139 @@
+using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopDataModels.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 BlacksmithWorkshop
+{
+    public partial class FormSupply : Form
+    {
+        private readonly List<ManufactureViewModel>? _manufactureList;
+        private readonly List<ShopViewModel>? _shopsList;
+        IShopLogic _shopLogic;
+        IManufactureLogic _manufactureLogic;
+        public int ShopId
+        {
+            get
+            {
+                return Convert.ToInt32(ShopComboBox.SelectedValue);
+            }
+            set
+            {
+                ShopComboBox.SelectedValue = value;
+            }
+        }
+        public int ManufactureId
+        {
+            get
+            {
+                return Convert.ToInt32(ManufactureComboBox.SelectedValue);
+            }
+            set
+            {
+                ManufactureComboBox.SelectedValue = value;
+            }
+        }
+        public IManufactureModel? ManufactureModel
+        {
+            get
+            {
+                if (_manufactureList == null)
+                {
+                    return null;
+                }
+                foreach (var elem in _manufactureList)
+                {
+                    if (elem.Id == ManufactureId)
+                    {
+                        return elem;
+                    }
+                }
+                return null;
+            }
+        }
+        public int Count
+        {
+            get { return Convert.ToInt32(CountTextBox.Text); }
+            set { CountTextBox.Text = value.ToString(); }
+        }
+        public FormSupply(IManufactureLogic ManufactureLogic, IShopLogic shopLogic)
+        {
+            InitializeComponent();
+            _shopLogic = shopLogic;
+            _manufactureLogic = ManufactureLogic;
+            _manufactureList = ManufactureLogic.ReadList(null);
+            _shopsList = shopLogic.ReadList(null);
+            if (_manufactureList != null)
+            {
+                ManufactureComboBox.DisplayMember = "ManufactureName";
+                ManufactureComboBox.ValueMember = "Id";
+                ManufactureComboBox.DataSource = _manufactureList;
+                ManufactureComboBox.SelectedItem = null;
+            }
+            if (_shopsList != null)
+            {
+                ShopComboBox.DisplayMember = "ShopName";
+                ShopComboBox.ValueMember = "Id";
+                ShopComboBox.DataSource = _shopsList;
+                ShopComboBox.SelectedItem = null;
+            }
+        }
+        private void SaveButton_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(CountTextBox.Text))
+            {
+                MessageBox.Show("Заполните поле Количество", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (ManufactureComboBox.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите кузнечное изделие", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (ShopComboBox.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите магазин", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            try
+            {
+                int count = Convert.ToInt32(CountTextBox.Text);
+                bool res = _shopLogic.ReplenishManufactures(
+                    new ShopSearchModel() { Id = Convert.ToInt32(ShopComboBox.SelectedValue) },
+                    _manufactureLogic.ReadElement(new() { Id = Convert.ToInt32(ManufactureComboBox.SelectedValue) }),
+                    count
+                );
+                if (!res)
+                {
+                    throw new Exception("Ошибка при пополнении. Дополнительная информация в логах");
+                }
+                MessageBox.Show("Пополнение прошло успешно");
+                DialogResult = DialogResult.OK;
+                Close();
+
+            }
+            catch (Exception)
+            {
+                MessageBox.Show("Ошибка пополнения");
+                return;
+            }
+        }
+        private void CancelButton_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

BlacksmithWorkshop/BlacksmithWorkshop/Program.cs

@@ -40,13 +40,18 @@ namespace BlacksmithWorkshop
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IManufactureLogic, ManufactureLogic>();
-            services.AddTransient<FormMain>();
+			services.AddTransient<IShopStorage, ShopStorage>();
+			services.AddTransient<IShopLogic, ShopLogic>();
+			services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
             services.AddTransient<FormCreateOrder>();
             services.AddTransient<FormManufacture>();
             services.AddTransient<FormManufactures>();
             services.AddTransient<FormManufactureComponent>();
-        }
+			services.AddTransient<FormShop>();
+			services.AddTransient<FormShops>();
+			services.AddTransient<FormSupply>();
+		}
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -0,0 +1,161 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
+{
+	public class ShopLogic : IShopLogic
+	{
+		private readonly ILogger _logger;
+		private readonly IShopStorage _shopStorage;
+		public ShopLogic(ILogger<ShopLogic> logger, IShopStorage ShopStorage)
+		{
+			_logger = logger;
+			_shopStorage = ShopStorage;
+		}
+		public List<ShopViewModel>? ReadList(ShopSearchModel? model)
+		{
+			_logger.LogInformation("ReadList. ShopName:{ShopName}. Id:{ Id}", model?.ShopName, model?.Id);
+			var list = model == null ? _shopStorage.GetFullList() :
+			_shopStorage.GetFilteredList(model);
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			return list;
+		}
+		public ShopViewModel? ReadElement(ShopSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			_logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
+			var element = _shopStorage.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(ShopBindingModel model)
+		{
+			CheckModel(model);
+			if (_shopStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
+				return false;
+			}
+			return true;
+		}
+		public bool Update(ShopBindingModel model)
+		{
+			CheckModel(model);
+			if (_shopStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
+				return false;
+			}
+			return true;
+		}
+		public bool Delete(ShopBindingModel model)
+		{
+			CheckModel(model, false);
+			_logger.LogInformation("Delete. Id:{Id}", model.Id);
+			if (_shopStorage.Delete(model) == null)
+			{
+				_logger.LogWarning("Delete operation failed");
+				return false;
+			}
+			return true;
+		}
+		public bool ReplenishManufactures(ShopSearchModel model, IManufactureModel manufacture, int count)
+		{
+			_logger.LogInformation("Try to replenish manufactures. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id);
+			if (model == null)
+            {
+                _logger.LogWarning("Read operation failed");
+                throw new ArgumentNullException(nameof(model));
+			}
+			ShopViewModel? curModel = ReadElement(model);
+			if (curModel == null)
+			{
+				_logger.LogWarning("Read operation failed");
+				throw new ArgumentNullException(nameof(curModel));
+			}
+			if (manufacture == null)
+            {
+                _logger.LogWarning("Read operation failed");
+                throw new ArgumentNullException(nameof(manufacture));
+			}
+            if (count <= 0)
+            {
+                _logger.LogWarning("Read operation failed");
+                throw new ArgumentException("Количество должно быть положительным числом");
+			}
+			if (curModel.ShopManufactures.TryGetValue(manufacture.Id, out var pair))
+			{
+				curModel.ShopManufactures[manufacture.Id] = (pair.Item1, pair.Item2 + count);
+			}
+			else
+			{
+				curModel.ShopManufactures.Add(manufacture.Id, (manufacture, count));
+			}
+			Update(new()
+			{
+				Id = curModel.Id,
+				ShopName = curModel.ShopName,
+				OpeningDate = curModel.OpeningDate,
+				Address = curModel.Address,
+				ShopManufactures = curModel.ShopManufactures,
+			});
+			_logger.LogInformation("Success. ManufactureName:{ManufactureName}. Id:{Id}. Replenish:{count}",
+			manufacture.ManufactureName, manufacture.Id, count);
+			return true;
+		}
+		private void CheckModel(ShopBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			if (!withParams)
+			{
+				return;
+			}
+			if (string.IsNullOrEmpty(model.ShopName))
+			{
+				throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName));
+			}
+			if (string.IsNullOrEmpty(model.Address))
+			{
+				throw new ArgumentNullException("Нет адреса магазина", nameof(model.Address));
+			}
+			_logger.LogInformation("Shop. ShopName:{ShopName}.Address:{Address}. DateOpen:{DateOpen}. Id: { Id}", 
+			model.ShopName, model.Address, model.OpeningDate, model.Id);
+			var element = _shopStorage.GetElement(new ShopSearchModel
+			{
+				ShopName = model.ShopName
+			});
+			if (element != null && element.Id != model.Id)
+			{
+				throw new InvalidOperationException("Магазин с таким названием уже есть");
+			}
+		}
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BlacksmithWorkshopDataModels.Models;
+
+namespace BlacksmithWorkshopContracts.BindingModels
+{
+    public class ShopBindingModel : IShopModel
+    {
+        public int Id { get; set; }
+        public string ShopName { get; set; } = string.Empty;
+        public string Address { get; set; } = string.Empty;
+        public DateTime OpeningDate { get; set; }
+        public Dictionary<int, (IManufactureModel, int)> ShopManufactures { get; set; } = new();
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,22 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
+{
+    public interface IShopLogic
+    {
+        List<ShopViewModel>? ReadList(ShopSearchModel? model);
+        ShopViewModel? ReadElement(ShopSearchModel model);
+        bool Create(ShopBindingModel model);
+        bool Update(ShopBindingModel model);
+        bool Delete(ShopBindingModel model);
+        bool ReplenishManufactures(ShopSearchModel shop, IManufactureModel manufacture, int count);
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.SearchModels
+{
+    public class ShopSearchModel
+    {
+        public int? Id {  get; set; }
+        public string? ShopName { get; set; }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,21 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.StoragesContracts
+{
+    public interface IShopStorage
+    {
+        List<ShopViewModel> GetFullList();
+        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
+        ShopViewModel? GetElement(ShopSearchModel model);
+        ShopViewModel? Insert(ShopBindingModel model);
+        ShopViewModel? Update(ShopBindingModel model); 
+        ShopViewModel? Delete(ShopBindingModel model);
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,22 @@
+using BlacksmithWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.ViewModels
+{
+    public class ShopViewModel : IShopModel
+    {
+        public int Id { get; set; }
+        [DisplayName("Название магазина")]
+        public string ShopName { get; set; } = string.Empty;
+        [DisplayName("Адрес магазина")]
+        public string Address { get; set; } = string.Empty;
+        [DisplayName("Дата открытия")]
+        public DateTime OpeningDate { get; set; }
+        public Dictionary<int, (IManufactureModel, int)> ShopManufactures { get; set; } = new();
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IShopModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopDataModels.Models
+{
+    public interface IShopModel : IId
+    {
+        string ShopName { get; }
+        string Address { get; }
+        DateTime OpeningDate { get; }
+        Dictionary<int, (IManufactureModel, int)> ShopManufactures { get; }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopListImplement/DataListSingleton.cs

@@ -13,11 +13,13 @@ namespace BlacksmithWorkshopListImplement
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Manufacture> Manufactures { get; set; }
+        public List<Shop> Shops { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Manufactures = new List<Manufacture>();
+            Shops = new List<Shop>();
         }
         public static DataListSingleton GetInstance()
         {

BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/ShopStorage.cs

@@ -0,0 +1,107 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopListImplement.Implements
+{
+    public class ShopStorage : IShopStorage
+    {
+        private readonly DataListSingleton _source;
+        public ShopStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+        public List<ShopViewModel> GetFullList()
+        {
+            List<ShopViewModel> result = new List<ShopViewModel>();
+            foreach(var Shop in _source.Shops)
+            {
+                result.Add(Shop.GetViewModel);
+            }
+            return result;
+        }
+        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+        {
+            List<ShopViewModel> result = new();
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                return result;
+            }
+            foreach(var Shop in _source.Shops)
+            {
+                if (Shop.ShopName.Contains(model.ShopName))
+                {
+                    result.Add(Shop.GetViewModel);
+                }
+            }
+            return result;
+        }
+        public ShopViewModel? GetElement(ShopSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            foreach(var Shop in _source.Shops)
+            {
+				if ((!string.IsNullOrEmpty(model.ShopName) &&
+			    Shop.ShopName == model.ShopName) ||
+				(model.Id.HasValue && Shop.Id == model.Id))
+				{
+					return Shop.GetViewModel;
+				}
+			}
+            return null;
+        }
+        public ShopViewModel? Insert(ShopBindingModel model)
+        {
+            model.Id = 1;
+            foreach(var Shop in _source.Shops)
+            {
+                if (Shop.Id >= model.Id)
+                {
+                    model.Id = Shop.Id + 1;
+                }
+            }
+            var newShop = Shop.Create(model);
+            if (newShop == null)
+            {
+                return null;
+            }
+            _source.Shops.Add(newShop);
+            return newShop.GetViewModel;
+        }
+        public ShopViewModel? Update(ShopBindingModel model)
+        {
+			foreach (var Shop in _source.Shops)
+			{
+				if (Shop.Id == model.Id)
+				{
+					Shop.Update(model);
+					return Shop.GetViewModel;
+				}
+			}
+			return null;
+		}
+        public ShopViewModel? Delete(ShopBindingModel model)
+        {
+			for (int i = 0; i < _source.Shops.Count; ++i)
+			{
+				if (_source.Shops[i].Id == model.Id)
+				{
+					var element = _source.Shops[i];
+					_source.Shops.RemoveAt(i);
+					return element.GetViewModel;
+				}
+			}
+			return null;
+		}
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Shop.cs

@@ -0,0 +1,54 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopListImplement.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 OpeningDate { get; private set; }
+        public Dictionary<int, (IManufactureModel, int)> ShopManufactures { get; private set; } = new();
+        public static Shop? Create(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Address = model.Address,
+                OpeningDate = model.OpeningDate,
+                ShopManufactures = model.ShopManufactures
+            };
+        }
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ShopName = model.ShopName;
+            Address = model.Address;
+            OpeningDate = model.OpeningDate;
+            ShopManufactures = model.ShopManufactures;
+        }
+        public ShopViewModel GetViewModel => new ShopViewModel()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            OpeningDate = OpeningDate,
+            ShopManufactures = ShopManufactures
+        };
+    }
+}