Пофикшены конфликты

FishFactory/FishFactory/FormMain.Designer.cs

@@ -37,7 +37,10 @@
             this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.компонентыToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             this.консервыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.магазиныStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.ButtonAddInShop = new System.Windows.Forms.Button();
+            this.ButtonSell = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -64,7 +67,7 @@
             // 
             // ButtonTakeOrderInWork
             // 
-            this.ButtonTakeOrderInWork.Location = new System.Drawing.Point(786, 83);
+            this.ButtonTakeOrderInWork.Location = new System.Drawing.Point(786, 61);
             this.ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
             this.ButtonTakeOrderInWork.Size = new System.Drawing.Size(186, 23);
             this.ButtonTakeOrderInWork.TabIndex = 2;
@@ -74,7 +77,7 @@
             // 
             // ButtonOrderReady
             // 
-            this.ButtonOrderReady.Location = new System.Drawing.Point(786, 137);
+            this.ButtonOrderReady.Location = new System.Drawing.Point(786, 90);
             this.ButtonOrderReady.Name = "ButtonOrderReady";
             this.ButtonOrderReady.Size = new System.Drawing.Size(186, 23);
             this.ButtonOrderReady.TabIndex = 3;
@@ -84,7 +87,7 @@
             // 
             // ButtonIssuedOrder
             // 
-            this.ButtonIssuedOrder.Location = new System.Drawing.Point(786, 194);
+            this.ButtonIssuedOrder.Location = new System.Drawing.Point(786, 119);
             this.ButtonIssuedOrder.Name = "ButtonIssuedOrder";
             this.ButtonIssuedOrder.Size = new System.Drawing.Size(186, 23);
             this.ButtonIssuedOrder.TabIndex = 4;
@@ -94,7 +97,7 @@
             // 
             // ButtonRef
             // 
-            this.ButtonRef.Location = new System.Drawing.Point(786, 250);
+            this.ButtonRef.Location = new System.Drawing.Point(786, 148);
             this.ButtonRef.Name = "ButtonRef";
             this.ButtonRef.Size = new System.Drawing.Size(186, 23);
             this.ButtonRef.TabIndex = 5;
@@ -106,7 +109,8 @@
             // 
             this.изделияToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.компонентыToolStripMenuItem1,
-            this.консервыToolStripMenuItem});
+            this.консервыToolStripMenuItem,
+            this.магазиныStripMenuItem});
             this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
             this.изделияToolStripMenuItem.Size = new System.Drawing.Size(94, 20);
             this.изделияToolStripMenuItem.Text = "Справочники";
@@ -125,6 +129,13 @@
             this.консервыToolStripMenuItem.Text = "Консервы";
             this.консервыToolStripMenuItem.Click += new System.EventHandler(this.КонсервыToolStripMenuItem_Click);
             // 
+            // магазиныStripMenuItem
+            // 
+            this.магазиныStripMenuItem.Name = "магазиныStripMenuItem";
+            this.магазиныStripMenuItem.Size = new System.Drawing.Size(145, 22);
+            this.магазиныStripMenuItem.Text = "Магазины";
+            this.магазиныStripMenuItem.Click += new System.EventHandler(this.магазиныStripMenuItem_Click);
+            // 
             // menuStrip1
             // 
             this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
@@ -137,12 +148,35 @@
             this.menuStrip1.TabIndex = 6;
             this.menuStrip1.Text = "menuStrip1";
             // 
+            // ButtonAddInShop
+            // 
+            this.ButtonAddInShop.Location = new System.Drawing.Point(786, 178);
+            this.ButtonAddInShop.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.ButtonAddInShop.Name = "ButtonAddInShop";
+            this.ButtonAddInShop.Size = new System.Drawing.Size(186, 25);
+            this.ButtonAddInShop.TabIndex = 7;
+            this.ButtonAddInShop.Text = "Пополнение магазина";
+            this.ButtonAddInShop.UseVisualStyleBackColor = true;
+            this.ButtonAddInShop.Click += new System.EventHandler(this.ButtonAddInShop_Click);
+            // 
+            // ButtonSell
+            // 
+            this.ButtonSell.Location = new System.Drawing.Point(786, 210);
+            this.ButtonSell.Name = "ButtonSell";
+            this.ButtonSell.Size = new System.Drawing.Size(186, 23);
+            this.ButtonSell.TabIndex = 8;
+            this.ButtonSell.Text = "Продать";
+            this.ButtonSell.UseVisualStyleBackColor = true;
+            this.ButtonSell.Click += new System.EventHandler(this.ButtonSell_Click);
+            // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(978, 446);
+            this.Controls.Add(this.ButtonSell);
             this.Controls.Add(this.ButtonRef);
+            this.Controls.Add(this.ButtonAddInShop);
             this.Controls.Add(this.ButtonIssuedOrder);
             this.Controls.Add(this.ButtonOrderReady);
             this.Controls.Add(this.ButtonTakeOrderInWork);
@@ -171,5 +205,9 @@
         private ToolStripMenuItem компонентыToolStripMenuItem1;
         private ToolStripMenuItem консервыToolStripMenuItem;
         private MenuStrip menuStrip1;
+        private ToolStripMenuItem магазиныToolStripMenuItem;
+        private Button ButtonAddInShop;
+        private ToolStripMenuItem магазиныStripMenuItem;
+        private Button ButtonSell;
     }
 }

FishFactory/FishFactory/FormMain.cs

@@ -176,5 +176,33 @@ namespace FishFactoryView
         {
             LoadData();
         }
+
+        private void ButtonAddInShop_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShopCanned));
+            if (service is FormShopCanned form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void магазиныStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            if (service is FormShops form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void ButtonSell_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormSellCanneds));
+            if (service is FormSellCanneds form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
+        }
     }
 }

FishFactory/FishFactory/FormSellCanneds.Designer.cs

@@ -0,0 +1,126 @@
+namespace FishFactoryView
+{
+    partial class FormSellCanneds
+    {
+        /// <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()
+        {
+            this.labelCanneds = new System.Windows.Forms.Label();
+            this.labelCount = new System.Windows.Forms.Label();
+            this.comboBoxCanneds = new System.Windows.Forms.ComboBox();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
+            this.buttonSave = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // labelCanneds
+            // 
+            this.labelCanneds.AutoSize = true;
+            this.labelCanneds.Location = new System.Drawing.Point(11, 19);
+            this.labelCanneds.Name = "labelCanneds";
+            this.labelCanneds.Size = new System.Drawing.Size(62, 15);
+            this.labelCanneds.TabIndex = 0;
+            this.labelCanneds.Text = "Консервы";
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(12, 56);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(72, 15);
+            this.labelCount.TabIndex = 1;
+            this.labelCount.Text = "Количество";
+            // 
+            // comboBoxCanneds
+            // 
+            this.comboBoxCanneds.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxCanneds.FormattingEnabled = true;
+            this.comboBoxCanneds.Location = new System.Drawing.Point(100, 11);
+            this.comboBoxCanneds.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.comboBoxCanneds.Name = "comboBoxCanneds";
+            this.comboBoxCanneds.Size = new System.Drawing.Size(230, 23);
+            this.comboBoxCanneds.TabIndex = 3;
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(100, 48);
+            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(230, 23);
+            this.textBoxCount.TabIndex = 4;
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Location = new System.Drawing.Point(160, 78);
+            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(82, 22);
+            this.buttonSave.TabIndex = 6;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(248, 78);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(82, 22);
+            this.buttonCancel.TabIndex = 7;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // FormSellCanneds
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(335, 106);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.comboBoxCanneds);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.labelCanneds);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Name = "FormSellCanneds";
+            this.Text = "Продажа консерв";
+            this.Load += new System.EventHandler(this.FormSellCanneds_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Label labelCanneds;
+        private Label labelCount;
+        private ComboBox comboBoxCanneds;
+        private TextBox textBoxCount;
+        private Button buttonSave;
+        private Button buttonCancel;
+    }
+}

FishFactory/FishFactory/FormSellCanneds.cs

@@ -0,0 +1,90 @@
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.SearchModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace FishFactoryView
+{
+    public partial class FormSellCanneds : Form
+    {
+        private readonly ILogger _logger;
+        private readonly ICannedLogic _logicCanned;
+        private readonly IShopLogic _logicShop;
+        public FormSellCanneds(ILogger<FormSellCanneds> logger, ICannedLogic logicCanned, IShopLogic logicShop)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicCanned = logicCanned;
+            _logicShop = logicShop;
+        }
+
+        private void buttonSave_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCount.Text))
+            {
+                MessageBox.Show("Заполните поле 'Количество'", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxCanneds.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите консерву", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Продажа консерв");
+            try
+            {
+                var operationResult = _logicShop.SellCanneds(_logicCanned.ReadElement(new CannedSearchModel()
+                {
+                    Id = Convert.ToInt32(comboBoxCanneds.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, "Ошибка продажи консерв");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+        private void FormSellCanneds_Load(object sender, EventArgs e)
+        {
+            _logger.LogInformation("Загрузка списка консерв для продажи");
+            try
+            {
+                var list = _logicCanned.ReadList(null);
+                if (list != null)
+                {
+                    comboBoxCanneds.DisplayMember = "CannedName";
+                    comboBoxCanneds.ValueMember = "Id";
+                    comboBoxCanneds.DataSource = list;
+                    comboBoxCanneds.SelectedItem = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка консерв");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+}

FishFactory/FishFactory/FormSellCanneds.resx

@@ -0,0 +1,60 @@
+<root>
+  <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>

FishFactory/FishFactory/FormShop.Designer.cs

@@ -0,0 +1,205 @@
+namespace FishFactoryView
+{
+    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);
+        }
+
+        private void InitializeComponent()
+        {
+            this.buttonSave = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.textBoxAddress = new System.Windows.Forms.TextBox();
+            this.labelTime = new System.Windows.Forms.Label();
+            this.labelAddress = new System.Windows.Forms.Label();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCannedName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.labelShop = new System.Windows.Forms.Label();
+            this.textBoxShop = new System.Windows.Forms.TextBox();
+            this.dateTimePicker = new System.Windows.Forms.DateTimePicker();
+            this.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
+            this.label1 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonSave.Location = new System.Drawing.Point(364, 303);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(120, 22);
+            this.buttonSave.TabIndex = 17;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonCancel.Location = new System.Drawing.Point(490, 302);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(103, 23);
+            this.buttonCancel.TabIndex = 16;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // textBoxAddress
+            // 
+            this.textBoxAddress.Location = new System.Drawing.Point(159, 27);
+            this.textBoxAddress.Name = "textBoxAddress";
+            this.textBoxAddress.Size = new System.Drawing.Size(157, 23);
+            this.textBoxAddress.TabIndex = 14;
+            // 
+            // labelTime
+            // 
+            this.labelTime.AutoSize = true;
+            this.labelTime.Location = new System.Drawing.Point(322, 9);
+            this.labelTime.Name = "labelTime";
+            this.labelTime.Size = new System.Drawing.Size(87, 15);
+            this.labelTime.TabIndex = 13;
+            this.labelTime.Text = "Дата открытия";
+            // 
+            // labelAddress
+            // 
+            this.labelAddress.AutoSize = true;
+            this.labelAddress.Location = new System.Drawing.Point(159, 9);
+            this.labelAddress.Name = "labelAddress";
+            this.labelAddress.Size = new System.Drawing.Size(40, 15);
+            this.labelAddress.TabIndex = 12;
+            this.labelAddress.Text = "Адрес";
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ColumnID,
+            this.ColumnCannedName,
+            this.ColumnCount});
+            this.dataGridView.Location = new System.Drawing.Point(12, 56);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowTemplate.Height = 25;
+            this.dataGridView.Size = new System.Drawing.Size(581, 240);
+            this.dataGridView.TabIndex = 11;
+            // 
+            // ColumnID
+            // 
+            this.ColumnID.HeaderText = "ID";
+            this.ColumnID.Name = "ColumnID";
+            this.ColumnID.Visible = false;
+            // 
+            // ColumnCannedName
+            // 
+            this.ColumnCannedName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumnCannedName.HeaderText = "Консервы";
+            this.ColumnCannedName.Name = "ColumnCannedName";
+            // 
+            // ColumnCount
+            // 
+            this.ColumnCount.HeaderText = "Количество";
+            this.ColumnCount.Name = "ColumnCount";
+            // 
+            // labelShop
+            // 
+            this.labelShop.AutoSize = true;
+            this.labelShop.Location = new System.Drawing.Point(12, 9);
+            this.labelShop.Name = "labelShop";
+            this.labelShop.Size = new System.Drawing.Size(54, 15);
+            this.labelShop.TabIndex = 9;
+            this.labelShop.Text = "Магазин";
+            // 
+            // textBoxShop
+            // 
+            this.textBoxShop.Location = new System.Drawing.Point(12, 27);
+            this.textBoxShop.Name = "textBoxShop";
+            this.textBoxShop.Size = new System.Drawing.Size(141, 23);
+            this.textBoxShop.TabIndex = 18;
+            // 
+            // dateTimePicker
+            // 
+            this.dateTimePicker.Location = new System.Drawing.Point(322, 27);
+            this.dateTimePicker.Name = "dateTimePicker";
+            this.dateTimePicker.Size = new System.Drawing.Size(162, 23);
+            this.dateTimePicker.TabIndex = 19;
+            // 
+            // numericUpDownCount
+            // 
+            this.numericUpDownCount.Location = new System.Drawing.Point(490, 27);
+            this.numericUpDownCount.Name = "numericUpDownCount";
+            this.numericUpDownCount.Size = new System.Drawing.Size(103, 23);
+            this.numericUpDownCount.TabIndex = 20;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(490, 9);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(75, 15);
+            this.label1.TabIndex = 21;
+            this.label1.Text = "Вместимось";
+            // 
+            // FormShop
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(605, 337);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.numericUpDownCount);
+            this.Controls.Add(this.dateTimePicker);
+            this.Controls.Add(this.textBoxShop);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.textBoxAddress);
+            this.Controls.Add(this.labelTime);
+            this.Controls.Add(this.labelAddress);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.labelShop);
+            this.Name = "FormShop";
+            this.Text = "Магазин";
+            this.Load += new System.EventHandler(this.FormShop_Load);
+            this.Click += new System.EventHandler(this.FormShop_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+
+        private Button buttonSave;
+        private Button buttonCancel;
+        private TextBox textBoxAddress;
+        private Label labelTime;
+        private Label labelAddress;
+        private DataGridView dataGridView;
+        private Label labelShop;
+        private TextBox textBoxShop;
+        private DateTimePicker dateTimePicker;
+        private DataGridViewTextBoxColumn ColumnID;
+        private DataGridViewTextBoxColumn ColumnCannedName;
+        private DataGridViewTextBoxColumn ColumnCount;
+        private NumericUpDown numericUpDownCount;
+        private Label label1;
+    }
+}

FishFactory/FishFactory/FormShop.cs

@@ -0,0 +1,130 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.SearchModels;
+using FishFactoryDataModels.Models;
+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 FishFactoryView
+{
+    public partial class FormShop : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IShopLogic _logic;
+        private int? _id;
+        private Dictionary<int, (ICannedModel, int)> _shopListCanneds;
+        public int Id { set { _id = value; } }
+        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            _shopListCanneds = new();
+        }
+
+        private void FormShop_Load(object sender, EventArgs e)
+        {
+
+            if (_id.HasValue)
+            {
+                _logger.LogInformation("Загрузка магазина");
+                try
+                {
+                    var view = _logic.ReadElement(new ShopSearchModel
+                    {
+                        Id = _id.Value
+                    });
+                    if (view != null)
+                    {
+                        textBoxShop.Text = view.ShopName;
+                        textBoxAddress.Text = view.Address;
+                        dateTimePicker.Text = view.DateOpening.ToString();
+                        numericUpDownCount.Value = view.MaxCountCanneds;
+                        _shopListCanneds = view.ListCanneds ?? new Dictionary<int, (ICannedModel, int)>();
+                        LoadData();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка загрузки магазина");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadData()
+        {
+            _logger.LogInformation("Загрузка магазина");
+            try
+            {
+                if (_shopListCanneds != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var elem in _shopListCanneds)
+                    {
+                        dataGridView.Rows.Add(new object[] { elem.Key, elem.Value.Item1.CannedName, elem.Value.Item2 });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки магазина");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxShop.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 = textBoxShop.Text,
+                    Address = textBoxAddress.Text,
+                    DateOpening = dateTimePicker.Value.Date,
+                    ListCanneds = _shopListCanneds,
+                    MaxCountCanneds = (int)numericUpDownCount.Value
+                };
+                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
+                if (!operationResult)
+                {
+                    throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+                }
+                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка сохранения магазина");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

FishFactory/FishFactory/FormShop.resx

@@ -0,0 +1,60 @@
+<root>
+  <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>

FishFactory/FishFactory/FormShopCanned.Designer.cs

@@ -0,0 +1,156 @@
+namespace FishFactoryView
+{
+    partial class FormShopCanned
+    {
+        /// <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()
+        {
+            this.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
+            this.comboBoxCanned = new System.Windows.Forms.ComboBox();
+            this.labelCount = new System.Windows.Forms.Label();
+            this.labelCanned = new System.Windows.Forms.Label();
+            this.comboBoxShop = new System.Windows.Forms.ComboBox();
+            this.labelShop = new System.Windows.Forms.Label();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonSave = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // numericUpDownCount
+            // 
+            this.numericUpDownCount.Location = new System.Drawing.Point(106, 85);
+            this.numericUpDownCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.numericUpDownCount.Maximum = new decimal(new int[] {
+            1410065408,
+            2,
+            0,
+            0});
+            this.numericUpDownCount.Name = "numericUpDownCount";
+            this.numericUpDownCount.Size = new System.Drawing.Size(393, 27);
+            this.numericUpDownCount.TabIndex = 13;
+            // 
+            // comboBoxCanned
+            // 
+            this.comboBoxCanned.FormattingEnabled = true;
+            this.comboBoxCanned.Location = new System.Drawing.Point(105, 49);
+            this.comboBoxCanned.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.comboBoxCanned.Name = "comboBoxCanned";
+            this.comboBoxCanned.Size = new System.Drawing.Size(394, 28);
+            this.comboBoxCanned.TabIndex = 12;
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(10, 85);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(90, 20);
+            this.labelCount.TabIndex = 11;
+            this.labelCount.Text = "Количество";
+            // 
+            // labelCanned
+            // 
+            this.labelCanned.AutoSize = true;
+            this.labelCanned.Location = new System.Drawing.Point(12, 49);
+            this.labelCanned.Name = "labelCanned";
+            this.labelCanned.Size = new System.Drawing.Size(79, 20);
+            this.labelCanned.TabIndex = 10;
+            this.labelCanned.Text = "Консервы";
+            // 
+            // comboBoxShop
+            // 
+            this.comboBoxShop.FormattingEnabled = true;
+            this.comboBoxShop.Location = new System.Drawing.Point(105, 13);
+            this.comboBoxShop.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.comboBoxShop.Name = "comboBoxShop";
+            this.comboBoxShop.Size = new System.Drawing.Size(394, 28);
+            this.comboBoxShop.TabIndex = 9;
+            // 
+            // labelShop
+            // 
+            this.labelShop.AutoSize = true;
+            this.labelShop.Location = new System.Drawing.Point(12, 16);
+            this.labelShop.Name = "labelShop";
+            this.labelShop.Size = new System.Drawing.Size(69, 20);
+            this.labelShop.TabIndex = 8;
+            this.labelShop.Text = "Магазин";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonCancel.Location = new System.Drawing.Point(318, 128);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(86, 31);
+            this.buttonCancel.TabIndex = 15;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonSave.Location = new System.Drawing.Point(217, 128);
+            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(94, 31);
+            this.buttonSave.TabIndex = 14;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
+            // 
+            // FormShopCanned
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(510, 172);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.numericUpDownCount);
+            this.Controls.Add(this.comboBoxCanned);
+            this.Controls.Add(this.labelCount);
+            this.Controls.Add(this.labelCanned);
+            this.Controls.Add(this.comboBoxShop);
+            this.Controls.Add(this.labelShop);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "FormShopCanned";
+            this.Text = "Поступление консервы";
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private NumericUpDown numericUpDownCount;
+        private ComboBox comboBoxCanned;
+        private Label labelCount;
+        private Label labelCanned;
+        private ComboBox comboBoxShop;
+        private Label labelShop;
+        private Button buttonCancel;
+        private Button buttonSave;
+    }
+}

FishFactory/FishFactory/FormShopCanned.cs

@@ -0,0 +1,99 @@
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.ViewModels;
+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 FishFactoryView
+{
+    public partial class FormShopCanned : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IShopLogic _shopLogic;
+        private readonly ICannedLogic _cannedLogic;
+        private readonly List<ShopViewModel>? _listShops;
+        private readonly List<CannedViewModel>? _listCanneds;
+
+        public FormShopCanned(ILogger<FormShopCanned> logger, IShopLogic shopLogic, ICannedLogic cannedLogic)
+        {
+            InitializeComponent();
+            _shopLogic = shopLogic;
+            _cannedLogic = cannedLogic;
+            _logger = logger;
+            _listShops = shopLogic.ReadList(null);
+            if (_listShops != null)
+            {
+                comboBoxShop.DisplayMember = "ShopName";
+                comboBoxShop.ValueMember = "Id";
+                comboBoxShop.DataSource = _listShops;
+                comboBoxShop.SelectedItem = null;
+            }
+
+            _listCanneds = cannedLogic.ReadList(null);
+            if (_listCanneds != null)
+            {
+                comboBoxCanned.DisplayMember = "CannedName";
+                comboBoxCanned.ValueMember = "Id";
+                comboBoxCanned.DataSource = _listCanneds;
+                comboBoxCanned.SelectedItem = null;
+            }
+        }
+
+        private void ButtonSave_Click(object sender, EventArgs e)
+        {
+            if (comboBoxShop.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxCanned.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите консерву", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Добавление консервы в магазин");
+            try
+            {
+                var canned = _cannedLogic.ReadElement(new()
+                {
+                    Id = (int)comboBoxCanned.SelectedValue
+                });
+                if (canned == null)
+                {
+                    throw new Exception("Не найдено консервы. Дополнительная информация в логах.");
+                }
+                var resultOperation = _shopLogic.AddCannedInShop(
+                     model: new() { Id = (int)comboBoxShop.SelectedValue },
+                     canned: canned,
+                     count: (int)numericUpDownCount.Value
+                );
+                if (!resultOperation)
+                {
+                    throw new Exception("Ошибка при добавлении. Дополнительная информация в логах.");
+                }
+                MessageBox.Show("Сохранение прошло успешно", "Сообщение",
+                MessageBoxButtons.OK, MessageBoxIcon.Information);
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка сохранения консерв");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

FishFactory/FishFactory/FormShopCanned.resx

@@ -0,0 +1,60 @@
+<root>
+  <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>

FishFactory/FishFactory/FormShops.Designer.cs

@@ -0,0 +1,116 @@
+namespace FishFactoryView
+{
+    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()
+        {
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.buttonUpdate = new System.Windows.Forms.Button();
+            this.buttonDelete = new System.Windows.Forms.Button();
+            this.buttonEdit = new System.Windows.Forms.Button();
+            this.buttonAdd = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left;
+            this.dataGridView.GridColor = System.Drawing.Color.White;
+            this.dataGridView.Location = new System.Drawing.Point(0, 0);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(487, 444);
+            this.dataGridView.TabIndex = 10;
+            // 
+            // buttonUpdate
+            // 
+            this.buttonUpdate.Location = new System.Drawing.Point(493, 116);
+            this.buttonUpdate.Name = "buttonUpdate";
+            this.buttonUpdate.Size = new System.Drawing.Size(149, 29);
+            this.buttonUpdate.TabIndex = 14;
+            this.buttonUpdate.Text = "Обновить";
+            this.buttonUpdate.UseVisualStyleBackColor = true;
+            this.buttonUpdate.Click += new System.EventHandler(this.ButtonRef_Click);
+            // 
+            // buttonDelete
+            // 
+            this.buttonDelete.Location = new System.Drawing.Point(493, 82);
+            this.buttonDelete.Name = "buttonDelete";
+            this.buttonDelete.Size = new System.Drawing.Size(149, 29);
+            this.buttonDelete.TabIndex = 13;
+            this.buttonDelete.Text = "Удалить";
+            this.buttonDelete.UseVisualStyleBackColor = true;
+            this.buttonDelete.Click += new System.EventHandler(this.ButtonDel_Click);
+            // 
+            // buttonEdit
+            // 
+            this.buttonEdit.Location = new System.Drawing.Point(493, 47);
+            this.buttonEdit.Name = "buttonEdit";
+            this.buttonEdit.Size = new System.Drawing.Size(149, 29);
+            this.buttonEdit.TabIndex = 12;
+            this.buttonEdit.Text = "Изменить";
+            this.buttonEdit.UseVisualStyleBackColor = true;
+            this.buttonEdit.Click += new System.EventHandler(this.ButtonUpd_Click);
+            // 
+            // buttonAdd
+            // 
+            this.buttonAdd.Location = new System.Drawing.Point(493, 12);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(149, 29);
+            this.buttonAdd.TabIndex = 11;
+            this.buttonAdd.Text = "Добавить";
+            this.buttonAdd.UseVisualStyleBackColor = true;
+            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
+            // 
+            // FormShops
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(647, 444);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.buttonUpdate);
+            this.Controls.Add(this.buttonDelete);
+            this.Controls.Add(this.buttonEdit);
+            this.Controls.Add(this.buttonAdd);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "FormShops";
+            this.Text = "Магазины";
+            this.Load += new System.EventHandler(this.FormShops_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+        }
+
+        #endregion
+        private DataGridView dataGridView;
+        private Button buttonUpdate;
+        private Button buttonDelete;
+        private Button buttonEdit;
+        private Button buttonAdd;
+    }
+}

FishFactory/FishFactory/FormShops.cs

@@ -0,0 +1,112 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using ProjectFishFactory;
+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 FishFactoryView
+{
+    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 FormShops_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+        private void LoadData()
+        {
+            try
+            {
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ListCanneds"].Visible = false;
+                    dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Загрузка магазинов");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки магазинов");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                    MessageBoxIcon.Error);
+            }
+        }
+        private void ButtonAdd_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 ButtonUpd_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 ButtonDel_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);
+                    }
+                }
+            }
+        }
+        private void ButtonRef_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+    }
+}

FishFactory/FishFactory/FormShops.resx

@@ -0,0 +1,60 @@
+<root>
+  <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>

FishFactory/FishFactory/Program.cs

@@ -7,6 +7,7 @@ using System;
 using FishFactoryDatabaseImplement.Implements;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
+using FishFactoryBusinessLogic;
 
 namespace ProjectFishFactory
 {
@@ -41,6 +42,8 @@ namespace ProjectFishFactory
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ICannedLogic, CannedLogic>();
+            services.AddTransient<IShopLogic, ShopLogic>();
+            services.AddTransient<IShopStorage, ShopStorage>();
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -48,6 +51,10 @@ namespace ProjectFishFactory
             services.AddTransient<FormCanned>();
             services.AddTransient<FormCannedComponent>();
             services.AddTransient<FormCanneds>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormShopCanned>();
+            services.AddTransient<FormSellCanneds>();
         }
     }
 }

FishFactory/FishFactoryBusinessLogic/OrderLogic.cs

@@ -17,10 +17,14 @@ namespace FishFactoryBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
+        private readonly IShopLogic _shopLogic;
+        private readonly ICannedStorage _cannedStorage;
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, ICannedStorage cannedStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
+            _shopLogic = shopLogic;
+            _cannedStorage = cannedStorage;
         }
         public bool CreateOrder(OrderBindingModel model)
         {
@@ -41,35 +45,42 @@ namespace FishFactoryBusinessLogic.BusinessLogics
         }
         public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus)
         {
-            CheckModel(model, false);
-            var element = _orderStorage.GetElement(new OrderSearchModel()
+            var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
+            if (viewModel == null)
             {
-                Id = model.Id
-            });
-            if (element == null)
-            {
-                throw new ArgumentNullException(nameof(element));
+                throw new ArgumentNullException(nameof(model));
             }
-            model.DateCreate = element.DateCreate;
-            model.CannedId = element.CannedId;
-            model.DateImplement = element.DateImplement;
-            model.Status = element.Status;
-            model.Count = element.Count;
-            model.Sum = element.Sum;
-            if (newStatus - model.Status == 1)
+            if (viewModel.Status + 1 != newStatus)
             {
-                model.Status = newStatus;
-                if (model.Status == OrderStatus.Выдан)
-                    model.DateImplement = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
-                if (_orderStorage.Update(model) == null)
+                _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect.");
+                return false;
+            }
+            model.Status = newStatus;
+            if (model.Status == OrderStatus.Готов)
+            {
+                model.DateImplement = DateTime.Now;
+                var canned = _cannedStorage.GetElement(new() { Id = viewModel.CannedId });
+                if (canned == null)
                 {
-                    _logger.LogWarning("Update operation failed");
-                    return false;
+                    throw new ArgumentNullException(nameof(canned));
+                }
+                if (!_shopLogic.AddCanneds(canned, viewModel.Count))
+                {
+                    throw new Exception($"AddCanneds operation failed. Shop is full.");
                 }
-                return true;
             }
-            _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, newStatus);
-            throw new ArgumentException($"Невозможно приствоить статус {newStatus} заказу с текущим статусом {model.Status}");
+            else
+            {
+                model.DateImplement = viewModel.DateImplement;
+            }
+            CheckModel(model, false);
+            if (_orderStorage.Update(model) == null)
+            {
+                model.Status--;
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
         }
         public bool DeliveryOrder(OrderBindingModel model)
         {
@@ -87,8 +98,7 @@ namespace FishFactoryBusinessLogic.BusinessLogics
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
             _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id);
-            var list = model == null ? _orderStorage.GetFullList() :
-                                   _orderStorage.GetFilteredList(model);
+            var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
             if (list == null)
             {
                 _logger.LogWarning("ReadList return null list");

FishFactory/FishFactoryBusinessLogic/ShopLogic.cs

@@ -0,0 +1,216 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryBusinessLogic
+{
+    public class ShopLogic : IShopLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IShopStorage _shopStorage;
+        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
+        {
+            _logger = logger;
+            _shopStorage = shopStorage;
+        }
+        public bool AddCannedInShop(ShopSearchModel model, ICannedModel canned, int count)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (count <= 0)
+            {
+                throw new ArgumentException("Количество консерв должно быть больше 0", nameof(count));
+            }
+            _logger.LogInformation("AddCannedInShop. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
+            var element = _shopStorage.GetElement(model);
+            if (element == null)
+            {                       
+                _logger.LogWarning("AddCannedInShop element not found");
+                return false;
+            }
+            if (element.MaxCountCanneds - element.ListCanneds.Select(x => x.Value.Item2).Sum() < count)
+            {
+                throw new ArgumentNullException("Магазин переполнен", nameof(count));
+            }
+            _logger.LogInformation("AddCannedInShop find. Id:{Id}", element.Id);
+
+            if (element.ListCanneds.TryGetValue(canned.Id, out var pair))
+            {
+                element.ListCanneds[canned.Id] = (canned, count + pair.Item2);
+                _logger.LogInformation("AddCannedInShop. Added {count} {canned} to '{ShopName}' shop", count, canned.CannedName, element.ShopName);
+            }
+            else
+            {
+                element.ListCanneds[canned.Id] = (canned, count);
+                _logger.LogInformation("AddCannedInShop. Added {count} new canned {canned} to '{ShopName}' shop", count, canned.CannedName, element.ShopName);
+            }
+            _shopStorage.Update(new()
+            {
+                Id = element.Id,
+                Address = element.Address,
+                ShopName = element.ShopName,
+                DateOpening = element.DateOpening,
+                ListCanneds = element.ListCanneds,
+                MaxCountCanneds = element.MaxCountCanneds,
+            });
+            return true;
+        }
+
+        public bool Create(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert 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 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 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 bool Update(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            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 (model.MaxCountCanneds < 0)
+            {
+                throw new ArgumentException("Максимальное количество консерв в магазине не может быть меньше нуля", nameof(model.MaxCountCanneds));
+            }
+            _logger.LogInformation("Shop. ShopName:{0}.Address:{1}. Id: {2}", model.ShopName, model.Address, model.Id);
+            var element = _shopStorage.GetElement(new ShopSearchModel
+            {
+                ShopName = model.ShopName
+            });
+            if (element != null && element.Id != model.Id && element.ShopName == model.ShopName)
+            {
+                throw new InvalidOperationException("Магазин с таким названием уже есть");
+            }
+        }
+
+        public bool SellCanneds(ICannedModel model, int count)
+        {
+            return _shopStorage.SellCanneds(model, count);
+        }
+
+        public bool AddCanneds(ICannedModel model, int count)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (count <= 0)
+            {
+                throw new ArgumentException("Количество консерв должно быть больше 0", nameof(count));
+            }
+            var freeCount = _shopStorage.GetFullList()
+                .Select(x => x.MaxCountCanneds - x.ListCanneds
+                .Select(p => p.Value.Item2).Sum()).Sum() - count;
+            if (freeCount < 0)
+            {
+                _logger.LogInformation("AddCanned. Не удалось добавить изделия в магазины, они переполнены.");
+                return false;
+            }
+            foreach (var shop in _shopStorage.GetFullList())
+            {
+                int countFree = shop.MaxCountCanneds - shop.ListCanneds.Select(x => x.Value.Item2).Sum();
+                if (countFree < count)
+                {
+                    if (!AddCannedInShop(new() { Id = shop.Id }, model, countFree))
+                    {
+                        _logger.LogWarning("AddCannedInShop operation failed.");
+                        return false;
+                    }
+                    count -= countFree;
+                }
+                else
+                {
+                    if (!AddCannedInShop(new() { Id = shop.Id }, model, count))
+                    {
+                        _logger.LogWarning("AddCannedInShop operation failed.");
+                        return false;
+                    }
+                    count = 0;
+                }
+                if (count == 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

FishFactory/FishFactoryContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,27 @@
+using FishFactoryDataModels;
+using FishFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.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 DateOpening { get; set; } = DateTime.Now;
+
+        public Dictionary<int, (ICannedModel, int)> ListCanneds
+        {
+            get;
+            set;
+        } = new();
+        public int MaxCountCanneds { get; set; }
+    }
+}

FishFactory/FishFactoryContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,24 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.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 AddCannedInShop(ShopSearchModel model, ICannedModel canned, int count);
+        bool AddCanneds(ICannedModel canned, int count);
+        bool SellCanneds(ICannedModel canned, int count);
+    }
+}

FishFactory/FishFactoryContracts/SearchModels/ShopSearchModel.cs

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

FishFactory/FishFactoryContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,23 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.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);
+        bool SellCanneds(ICannedModel model, int count);
+    }
+}

FishFactory/FishFactoryContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,33 @@
+using FishFactoryDataModels;
+using FishFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryContracts.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 DateOpening { get; set; } = DateTime.Now;
+
+        [DisplayName("Максимальное количество консерв")]
+        public int MaxCountCanneds { get; set; }
+
+        public Dictionary<int, (ICannedModel, int)> ListCanneds
+        {
+            get;
+            set;
+        } = new();
+    }
+}

FishFactory/FishFactoryDataModels/IShopModel.cs

@@ -0,0 +1,18 @@
+using FishFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryDataModels
+{
+    public interface IShopModel : IId
+    {
+        string ShopName { get; }
+        string Address { get; }
+        DateTime DateOpening { get; }
+        Dictionary<int, (ICannedModel, int)> ListCanneds { get; }
+        int MaxCountCanneds { get; }
+    }
+}

FishFactory/FishFactoryFileImplement/DataFileSingleton.cs

@@ -14,9 +14,11 @@ namespace FishFactoryFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string CannedFileName = "Canned.xml";
+        private readonly string ShopFileName = "Shop.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Canned> Canneds { get; private set; }
+        public List<Shop> Shops { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -28,11 +30,13 @@ namespace FishFactoryFileImplement
         public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
         public void SaveCanneds() => SaveData(Canneds, CannedFileName, "Canneds", 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)!)!;
             Canneds = LoadData(CannedFileName, "Canned", x => Canned.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
+            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

FishFactory/FishFactoryFileImplement/Implements/ShopStorage.cs

@@ -0,0 +1,106 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Models;
+using FishFactoryFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryFileImplement.Implements
+{
+    public class ShopStorage : IShopStorage
+    {
+        private readonly DataFileSingleton source;
+        public ShopStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+        public List<ShopViewModel> GetFullList()
+        {
+            return source.Shops.Select(x => x.GetViewModel).ToList();
+        }
+        public List<ShopViewModel> 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 SellCanneds(ICannedModel model, int count)
+        {
+            if (source.Shops.Select(x => x.ListCanneds.FirstOrDefault(y => y.Key == model.Id).Value.Item2).Sum() < count)
+            {
+                return false;
+            }
+            foreach (var shop in source.Shops.Where(x => x.ListCanneds.ContainsKey(model.Id)))
+            {
+                int countInCurrentShop = shop.ListCanneds[model.Id].Item2;
+                if (countInCurrentShop <= count)
+                {
+                    shop.ListCanneds.Remove(model.Id);
+                    count -= countInCurrentShop;
+                }
+                else
+                {
+                    shop.ListCanneds[model.Id] = (shop.ListCanneds[model.Id].Item1, countInCurrentShop - count);
+                    count = 0;
+                }
+                if (count == 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

FishFactory/FishFactoryFileImplement/Models/Order.cs

@@ -67,11 +67,7 @@ namespace FishFactoryFileImplement.Models
             {
                 return;
             }
-            CannedId = model.CannedId;
-            Count = model.Count;
-            Sum = model.Sum;
             Status = model.Status;
-            DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
         }
         public OrderViewModel GetViewModel => new()

FishFactory/FishFactoryFileImplement/Models/Shop.cs

@@ -0,0 +1,104 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels;
+using FishFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace FishFactoryFileImplement.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 int MaxCountCanneds { get; private set; }
+
+        private Dictionary<int, (ICannedModel, int)>? _shopCanned = null;
+        public Dictionary<int, int> CountCanned { get; private set; } = new();
+
+        public Dictionary<int, (ICannedModel, int)> ListCanneds {
+            get
+            {
+                if (_shopCanned == null)
+                {
+                    var source = DataFileSingleton.GetInstance();
+                    _shopCanned = CountCanned.ToDictionary(x => x.Key, y => ((source.Canneds.FirstOrDefault(z => z.Id == y.Key) as ICannedModel)!, y.Value));
+                }
+                return _shopCanned;
+            }
+        }
+        public static Shop? Create(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Address = model.Address,
+                MaxCountCanneds = model.MaxCountCanneds,
+                DateOpening = model.DateOpening,
+                CountCanned = model.ListCanneds.ToDictionary(x => x.Key, x => x.Value.Item2),
+            };
+        }
+        public static Shop? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ShopName = element.Element("ShopName")!.Value,
+                Address = element.Element("Address")!.Value,
+                DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value),
+                MaxCountCanneds = Convert.ToInt32(element.Element("MaxCountCanneds")!.Value),
+                CountCanned = element.Element("Canneds")!.Elements("Canned").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;
+            MaxCountCanneds = model.MaxCountCanneds;
+            CountCanned = model.ListCanneds.ToDictionary(x => x.Key, x => x.Value.Item2);
+            _shopCanned = null;
+        }
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            ListCanneds = ListCanneds,
+            DateOpening = DateOpening,
+            MaxCountCanneds = MaxCountCanneds,
+        };
+        public XElement GetXElement => new("Shop",
+             new XAttribute("Id", Id),
+             new XElement("ShopName", ShopName),
+             new XElement("Address", Address),
+             new XElement("DateOpening", DateOpening),
+             new XElement("MaxCountCanneds", MaxCountCanneds),
+             new XElement("Canneds", CountCanned
+                 .Select(x => new XElement("Canned",
+                     new XElement("Key", x.Key),
+                     new XElement("Value", x.Value))
+                 ).ToArray()));
+    }
+}

FishFactory/FishFactoryListImplement/DataListSingleton.cs

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

FishFactory/FishFactoryListImplement/Implements/ShopStorage.cs

@@ -0,0 +1,113 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels.Models;
+using FishFactoryListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryListImplement.Implements
+{
+    public class ShopStorage : IShopStorage
+    {
+        private readonly DataListSingleton _source;
+        public ShopStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+        public List<ShopViewModel> GetFullList()
+        {
+            var result = new List<ShopViewModel>();
+            foreach (var shop in _source.Shops)
+            {
+                result.Add(shop.GetViewModel);
+            }
+            return result;
+        }
+        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
+        {
+            var result = new List<ShopViewModel>();
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                return result;
+            }
+            foreach (var shop in _source.Shops)
+            {
+                if (shop.ShopName.Contains(model.ShopName ?? string.Empty))
+                {
+                    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 (model.Id <= shop.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;
+        }
+
+        public bool SellCanneds(ICannedModel model, int count)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

FishFactory/FishFactoryListImplement/Models/Shop.cs

@@ -0,0 +1,61 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModels;
+using FishFactoryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FishFactoryListImplement.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<int, (ICannedModel, int)> ListCanneds
+        {
+            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,
+                DateOpening = model.DateOpening,
+                ListCanneds = new()
+            };
+        }
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ShopName = model.ShopName;
+            Address = model.Address;
+            DateOpening = model.DateOpening;
+            ListCanneds = model.ListCanneds;
+        }
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Address = Address,
+            ListCanneds = ListCanneds,
+            DateOpening = DateOpening,
+        };
+
+        public int MaxCountCanneds => throw new NotImplementedException();
+    }
+}