связь магазина с консервами не работает, Карл!

This reverts commit 5a9a99b1b6.

FishFactory/FishFactory.csproj

@@ -9,42 +9,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.16">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
-    <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.19" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\FishFactoryBusinessLogic\FishFactoryBusinessLogic.csproj" />
     <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
-    <ProjectReference Include="..\FishFactoryDatabaseImplement\FishFactoryDatabaseImplement.csproj" />
     <ProjectReference Include="..\FishFactoryFileImplement\FishFactoryFileImplement.csproj" />
     <ProjectReference Include="..\FishFactoryListImplement\FishFactoryListImplement.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="ReportOrders.rdlc">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

FishFactory/FishFactory.sln

@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryListImplement",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryFileImplement", "..\FishFactoryFileImplement\FishFactoryFileImplement.csproj", "{4EB943AB-67A8-4386-8874-FA0E3E98159C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryDatabaseImplement", "..\FishFactoryDatabaseImplement\FishFactoryDatabaseImplement.csproj", "{5744376D-B7D8-4FFD-B6D9-F53C169B056C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,14 +71,6 @@ Global
 		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|x86.ActiveCfg = Release|Any CPU
 		{4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|x86.Build.0 = Release|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Debug|x86.Build.0 = Debug|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Release|x86.ActiveCfg = Release|Any CPU
-		{5744376D-B7D8-4FFD-B6D9-F53C169B056C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

FishFactory/FormCanned.cs

@@ -1,5 +1,14 @@
 using FishFactoryDataModel.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;
 using FishFactoryContracts.BusinessLogicsContracts;
 using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.BindingModels;
@@ -11,14 +20,14 @@ namespace FishFactory.Forms
         private readonly ILogger _logger;
         private readonly ICannedLogic _logic;
         private int? _id;
-        private Dictionary<int, (IComponentModel, int)> _CannedComponents;
+        private Dictionary<int, (IComponentModel, int)> _productComponents;
         public int Id { set { _id = value; } }
         public FormCanned(ILogger<FormCanned> logger, ICannedLogic logic)
         {
             InitializeComponent();
             _logger = logger;
             _logic = logic;
-            _CannedComponents = new Dictionary<int, (IComponentModel, int)>();
+            _productComponents = new Dictionary<int, (IComponentModel, int)>();
         }
         private void FormCanned_Load(object sender, EventArgs e)
         {
@@ -35,7 +44,7 @@ namespace FishFactory.Forms
                     {
                         textBoxName.Text = view.CannedName;
                         textBoxPrice.Text = view.Price.ToString();
-                        _CannedComponents = view.CannedComponents ?? new Dictionary<int, (IComponentModel, int)>();
+                        _productComponents = view.CannedComponents ?? new Dictionary<int, (IComponentModel, int)>();
                         LoadData();
                     }
                 }
@@ -50,10 +59,10 @@ namespace FishFactory.Forms
             _logger.LogInformation("Загрузка компонент изделия");
             try
             {
-                if (_CannedComponents != null)
+                if (_productComponents != null)
                 {
                     dataGridView.Rows.Clear();
-                    foreach (var pc in _CannedComponents)
+                    foreach (var pc in _productComponents)
                     {
                         dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 });
                     }
@@ -77,13 +86,13 @@ namespace FishFactory.Forms
                         return;
                     }
                     _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count);
-                    if (_CannedComponents.ContainsKey(form.Id))
+                    if (_productComponents.ContainsKey(form.Id))
                     {
-                        _CannedComponents[form.Id] = (form.ComponentModel, form.Count);
+                        _productComponents[form.Id] = (form.ComponentModel, form.Count);
                     }
                     else
                     {
-                        _CannedComponents.Add(form.Id, (form.ComponentModel, form.Count));
+                        _productComponents.Add(form.Id, (form.ComponentModel, form.Count));
                     }
                     LoadData();
                 }
@@ -98,7 +107,7 @@ namespace FishFactory.Forms
                 {
                     int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
                     form.Id = id;
-                    form.Count = _CannedComponents[id].Item2;
+                    form.Count = _productComponents[id].Item2;
                     if (form.ShowDialog() == DialogResult.OK)
                     {
                         if (form.ComponentModel == null)
@@ -106,7 +115,7 @@ namespace FishFactory.Forms
                             return;
                         }
                         _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
-                        _CannedComponents[form.Id] = (form.ComponentModel, form.Count);
+                        _productComponents[form.Id] = (form.ComponentModel, form.Count);
                         LoadData();
                     }
                 }
@@ -121,7 +130,7 @@ namespace FishFactory.Forms
                     try
                     {
                         _logger.LogInformation("Удаление компонента: { ComponentName} - { Count}", dataGridView.SelectedRows[0].Cells[1].Value);
-                        _CannedComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value));
+                        _productComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value));
                     }
                     catch (Exception ex)
                     {
@@ -147,7 +156,7 @@ namespace FishFactory.Forms
                 MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
-            if (_CannedComponents == null || _CannedComponents.Count == 0)
+            if (_productComponents == null || _productComponents.Count == 0)
             {
                 MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
@@ -160,7 +169,7 @@ namespace FishFactory.Forms
                     Id = _id ?? 0,
                     CannedName = textBoxName.Text,
                     Price = Convert.ToDouble(textBoxPrice.Text),
-                    CannedComponents = _CannedComponents
+                    CannedComponents = _productComponents
                 };
                 var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
                 if (!operationResult)
@@ -186,7 +195,7 @@ namespace FishFactory.Forms
         private double CalcPrice()
         {
             double price = 0;
-            foreach (var elem in _CannedComponents)
+            foreach (var elem in _productComponents)
             {
                 price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2);
             }

FishFactory/FormCanneds.Designer.cs

@@ -89,6 +89,7 @@
             dataGridView.ReadOnly = true;
             dataGridView.RowHeadersWidth = 51;
             dataGridView.RowTemplate.Height = 24;
+            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
             dataGridView.Size = new Size(709, 568);
             dataGridView.TabIndex = 5;
             // 

FishFactory/FormCanneds.cs

@@ -1,14 +1,4 @@
-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;
-using FishFactory;
-using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
 

FishFactory/FormComponent.Designer.cs

@@ -106,6 +106,7 @@
             Margin = new Padding(3, 4, 3, 4);
             Name = "FormComponent";
             Text = "Компонент";
+            Load += FormComponent_Load;
             ResumeLayout(false);
             PerformLayout();
         }

FishFactory/FormComponent.cs

@@ -1,15 +1,5 @@
-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;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using FishFactoryContracts.BusinessLogicsContracts;
-using Microsoft.VisualBasic.Logging;
 using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.BindingModels;
 

FishFactory/FormComponents.cs

@@ -1,15 +1,6 @@
 using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace FishFactory.Forms
 {

FishFactory/FormMain.Designer.cs

@@ -33,10 +33,9 @@
             toolStripDropDownButton1 = new ToolStripDropDownButton();
             компонентыToolStripMenuItem = new ToolStripMenuItem();
             консервыToolStripMenuItem = new ToolStripMenuItem();
-            toolStripDropDownButton2 = new ToolStripDropDownButton();
-            списокКомпонентовToolStripMenuItem = new ToolStripMenuItem();
-            компонентыПоКонсервамToolStripMenuItem = new ToolStripMenuItem();
-            списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
+            магазиныToolStripMenuItem = new ToolStripMenuItem();
+            toolStripLabelReplenish2 = new ToolStripLabel();
+            toolStripLabelSale = new ToolStripLabel();
             buttonCreateOrder = new Button();
             buttonTakeOrderInWork = new Button();
             buttonOrderReady = new Button();
@@ -50,74 +49,66 @@
             // toolStrip1
             // 
             toolStrip1.ImageScalingSize = new Size(20, 20);
-            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, toolStripDropDownButton2 });
+            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, toolStripLabelReplenish2, toolStripLabelSale });
             toolStrip1.Location = new Point(0, 0);
             toolStrip1.Name = "toolStrip1";
-            toolStrip1.Size = new Size(969, 25);
+            toolStrip1.Size = new Size(1206, 27);
             toolStrip1.TabIndex = 0;
             toolStrip1.Text = "toolStrip1";
             // 
             // toolStripDropDownButton1
             // 
             toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, консервыToolStripMenuItem });
+            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, консервыToolStripMenuItem, магазиныToolStripMenuItem });
             toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image");
             toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
             toolStripDropDownButton1.Name = "toolStripDropDownButton1";
-            toolStripDropDownButton1.Size = new Size(88, 22);
+            toolStripDropDownButton1.Size = new Size(108, 24);
             toolStripDropDownButton1.Text = "Справочник";
             // 
             // компонентыToolStripMenuItem
             // 
             компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-            компонентыToolStripMenuItem.Size = new Size(145, 22);
+            компонентыToolStripMenuItem.Size = new Size(182, 26);
             компонентыToolStripMenuItem.Text = "Компоненты";
             компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click;
             // 
             // консервыToolStripMenuItem
             // 
             консервыToolStripMenuItem.Name = "консервыToolStripMenuItem";
-            консервыToolStripMenuItem.Size = new Size(145, 22);
+            консервыToolStripMenuItem.Size = new Size(182, 26);
             консервыToolStripMenuItem.Text = "Консервы";
             консервыToolStripMenuItem.Click += консервыToolStripMenuItem_Click;
             // 
-            // toolStripDropDownButton2
+            // магазиныToolStripMenuItem
             // 
-            toolStripDropDownButton2.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton2.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоКонсервамToolStripMenuItem, списокЗаказовToolStripMenuItem });
-            toolStripDropDownButton2.Image = (Image)resources.GetObject("toolStripDropDownButton2.Image");
-            toolStripDropDownButton2.ImageTransparentColor = Color.Magenta;
-            toolStripDropDownButton2.Name = "toolStripDropDownButton2";
-            toolStripDropDownButton2.Size = new Size(61, 22);
-            toolStripDropDownButton2.Text = "Отчёты";
+            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            магазиныToolStripMenuItem.Size = new Size(182, 26);
+            магазиныToolStripMenuItem.Text = "Магазины";
+            магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click;
             // 
-            // списокКомпонентовToolStripMenuItem
+            // toolStripLabelReplenish2
             // 
-            списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem";
-            списокКомпонентовToolStripMenuItem.Size = new Size(225, 22);
-            списокКомпонентовToolStripMenuItem.Text = "Список консерв";
-            списокКомпонентовToolStripMenuItem.Click += списокКомпонентовToolStripMenuItem_Click;
+            toolStripLabelReplenish2.DisplayStyle = ToolStripItemDisplayStyle.Text;
+            toolStripLabelReplenish2.Name = "toolStripLabelReplenish2";
+            toolStripLabelReplenish2.Size = new Size(98, 24);
+            toolStripLabelReplenish2.Text = "Пополнение";
+            toolStripLabelReplenish2.Click += toolStripLabelReplenish_Click;
             // 
-            // компонентыПоКонсервамToolStripMenuItem
+            // toolStripLabelSale
             // 
-            компонентыПоКонсервамToolStripMenuItem.Name = "компонентыПоКонсервамToolStripMenuItem";
-            компонентыПоКонсервамToolStripMenuItem.Size = new Size(225, 22);
-            компонентыПоКонсервамToolStripMenuItem.Text = "Компоненты по консервам";
-            компонентыПоКонсервамToolStripMenuItem.Click += компонентыПоИзделиямToolStripMenuItem_Click;
-            // 
-            // списокЗаказовToolStripMenuItem
-            // 
-            списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
-            списокЗаказовToolStripMenuItem.Size = new Size(225, 22);
-            списокЗаказовToolStripMenuItem.Text = "Список заказов";
-            списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click;
+            toolStripLabelSale.Name = "toolStripLabelSale";
+            toolStripLabelSale.Size = new Size(145, 24);
+            toolStripLabelSale.Text = "Продажа консервы";
+            toolStripLabelSale.Click += toolStripLabelSale_Click;
             // 
             // buttonCreateOrder
             // 
             buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonCreateOrder.Location = new Point(800, 56);
+            buttonCreateOrder.Location = new Point(998, 75);
+            buttonCreateOrder.Margin = new Padding(3, 4, 3, 4);
             buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonCreateOrder.Size = new Size(141, 24);
+            buttonCreateOrder.Size = new Size(161, 32);
             buttonCreateOrder.TabIndex = 1;
             buttonCreateOrder.Text = "Создать заказ";
             buttonCreateOrder.UseVisualStyleBackColor = true;
@@ -126,9 +117,10 @@
             // buttonTakeOrderInWork
             // 
             buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonTakeOrderInWork.Location = new Point(800, 100);
+            buttonTakeOrderInWork.Location = new Point(998, 133);
+            buttonTakeOrderInWork.Margin = new Padding(3, 4, 3, 4);
             buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            buttonTakeOrderInWork.Size = new Size(141, 24);
+            buttonTakeOrderInWork.Size = new Size(161, 32);
             buttonTakeOrderInWork.TabIndex = 2;
             buttonTakeOrderInWork.Text = "Отдать на выполнение";
             buttonTakeOrderInWork.UseVisualStyleBackColor = true;
@@ -137,9 +129,10 @@
             // buttonOrderReady
             // 
             buttonOrderReady.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonOrderReady.Location = new Point(800, 142);
+            buttonOrderReady.Location = new Point(998, 190);
+            buttonOrderReady.Margin = new Padding(3, 4, 3, 4);
             buttonOrderReady.Name = "buttonOrderReady";
-            buttonOrderReady.Size = new Size(141, 24);
+            buttonOrderReady.Size = new Size(161, 32);
             buttonOrderReady.TabIndex = 3;
             buttonOrderReady.Text = "Заказ готов";
             buttonOrderReady.UseVisualStyleBackColor = true;
@@ -148,9 +141,10 @@
             // buttonIssuedOrder
             // 
             buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonIssuedOrder.Location = new Point(800, 181);
+            buttonIssuedOrder.Location = new Point(998, 241);
+            buttonIssuedOrder.Margin = new Padding(3, 4, 3, 4);
             buttonIssuedOrder.Name = "buttonIssuedOrder";
-            buttonIssuedOrder.Size = new Size(141, 24);
+            buttonIssuedOrder.Size = new Size(161, 32);
             buttonIssuedOrder.TabIndex = 4;
             buttonIssuedOrder.Text = "Заказ выдан";
             buttonIssuedOrder.UseVisualStyleBackColor = true;
@@ -159,9 +153,10 @@
             // buttonRef
             // 
             buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonRef.Location = new Point(800, 222);
+            buttonRef.Location = new Point(998, 296);
+            buttonRef.Margin = new Padding(3, 4, 3, 4);
             buttonRef.Name = "buttonRef";
-            buttonRef.Size = new Size(141, 24);
+            buttonRef.Size = new Size(161, 32);
             buttonRef.TabIndex = 5;
             buttonRef.Text = "Обновить список";
             buttonRef.UseVisualStyleBackColor = true;
@@ -170,20 +165,21 @@
             // dataGridView
             // 
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(0, 20);
+            dataGridView.Location = new Point(0, 35);
+            dataGridView.Margin = new Padding(3, 4, 3, 4);
             dataGridView.Name = "dataGridView";
             dataGridView.ReadOnly = true;
             dataGridView.RowHeadersWidth = 51;
             dataGridView.RowTemplate.Height = 24;
             dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(763, 441);
+            dataGridView.Size = new Size(952, 580);
             dataGridView.TabIndex = 6;
             // 
             // FormMain
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(969, 461);
+            ClientSize = new Size(1206, 615);
             Controls.Add(dataGridView);
             Controls.Add(buttonRef);
             Controls.Add(buttonIssuedOrder);
@@ -191,6 +187,7 @@
             Controls.Add(buttonTakeOrderInWork);
             Controls.Add(buttonCreateOrder);
             Controls.Add(toolStrip1);
+            Margin = new Padding(3, 4, 3, 4);
             Name = "FormMain";
             Text = "Рыбный завод";
             Load += FormMain_Load;
@@ -213,9 +210,8 @@
         private ToolStripDropDownButton toolStripDropDownButton1;
         private ToolStripMenuItem компонентыToolStripMenuItem;
         private ToolStripMenuItem консервыToolStripMenuItem;
-        private ToolStripDropDownButton toolStripDropDownButton2;
-        private ToolStripMenuItem списокКомпонентовToolStripMenuItem;
-        private ToolStripMenuItem компонентыПоКонсервамToolStripMenuItem;
-        private ToolStripMenuItem списокЗаказовToolStripMenuItem;
+        private ToolStripMenuItem магазиныToolStripMenuItem;
+        private ToolStripLabel toolStripLabelReplenish2;
+        private ToolStripLabel toolStripLabelSale;
     }
 }

FishFactory/FormMain.cs

@@ -1,5 +1,4 @@
-using FishFactoryBusinessLogic.BusinessLogic;
-using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
 
@@ -9,13 +8,11 @@ namespace FishFactory.Forms
     {
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
-        private readonly IReportLogic _reportLogic;
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
-            _reportLogic = reportLogic;
         }
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -31,6 +28,7 @@ namespace FishFactory.Forms
                 if (list != null)
                 {
                     dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Width = 80;
                     dataGridView.Columns["CannedId"].Visible = false;
                     dataGridView.Columns["CannedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
                 }
@@ -59,6 +57,35 @@ namespace FishFactory.Forms
                 form.ShowDialog();
             }
         }
+
+        private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+
+            if (service is FormShops form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void toolStripLabelReplenish_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShopReplenish));
+            if (service is FormShopReplenish form)
+            {
+                form.ShowDialog();
+            }
+        }
+        
+        private void toolStripLabelSale_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShopSale));
+            if (service is FormShopSale form)
+            {
+                form.ShowDialog();
+            }
+        }
+
         private void buttonCreateOrder_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
@@ -145,38 +172,5 @@ namespace FishFactory.Forms
         {
             LoadData();
         }
-
-        private void списокКомпонентовToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                _reportLogic.SaveCannedsToWordFile(new ReportBindingModel
-                {
-                    FileName = dialog.FileName
-                });
-                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-
-        }
-
-        private void компонентыПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportCannedComponents));
-            if (service is FormReportCannedComponents form)
-            {
-                form.ShowDialog();
-            }
-
-        }
-
-        private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
-            if (service is FormReportOrders form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

FishFactory/FormMain.resx

@@ -124,7 +124,7 @@
   <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
@@ -134,17 +134,6 @@
         mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
         kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="toolStripDropDownButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw
-        6CYmNoMYJJ0NBiFFIoIytOuf0+TeXP3yde+iyS+3OcP53Z4y3/dJJ4HAsiwyTVMp6BQCBIZhKAWdEcHV
-        vSlBmeB82NFy1KLluEWOPRC5MoHdMWhazwi4RJlALgf4EuT6BI+5kCsTrGddUY658E+QvyXYHq9UnRyC
-        U87f4aUApcXhnrI9Jzg/laQKFntXlHM+lSQK5psL5fvbp/JvJLGCQqmSWM5JkiCT84igXGtSrruKLQ0T
-        luAdmZxHBG37FFuWBC/j5XKOmX8WAH7rcI6ZMffPgjQwN2bXJgDo/COBTpjneQ2dML0PY3cISreGe8HM
-        qgAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

FishFactory/FormShop.Designer.cs

@@ -0,0 +1,201 @@
+namespace FishFactory.Forms
+{
+    partial class FormShop
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            label1 = new Label();
+            label2 = new Label();
+            textBoxShopName = new TextBox();
+            textBoxAdress = new TextBox();
+            buttonSave = new Button();
+            buttonCancel = new Button();
+            dataGridView = new DataGridView();
+            CannedName = new DataGridViewTextBoxColumn();
+            Count = new DataGridViewTextBoxColumn();
+            label3 = new Label();
+            openingDatePicker = new DateTimePicker();
+            textBoxCapacity = new TextBox();
+            label4 = new Label();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(12, 23);
+            label1.Name = "label1";
+            label1.Size = new Size(80, 20);
+            label1.TabIndex = 0;
+            label1.Text = "Название:";
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(12, 60);
+            label2.Name = "label2";
+            label2.Size = new Size(54, 20);
+            label2.TabIndex = 1;
+            label2.Text = "Адрес:";
+            // 
+            // textBoxShopName
+            // 
+            textBoxShopName.Location = new Point(103, 20);
+            textBoxShopName.Name = "textBoxShopName";
+            textBoxShopName.Size = new Size(304, 27);
+            textBoxShopName.TabIndex = 2;
+            // 
+            // textBoxAdress
+            // 
+            textBoxAdress.Location = new Point(103, 60);
+            textBoxAdress.Name = "textBoxAdress";
+            textBoxAdress.Size = new Size(304, 27);
+            textBoxAdress.TabIndex = 3;
+            // 
+            // buttonSave
+            // 
+            buttonSave.Location = new Point(513, 509);
+            buttonSave.Name = "buttonSave";
+            buttonSave.Size = new Size(123, 33);
+            buttonSave.TabIndex = 4;
+            buttonSave.Text = "Сохранить";
+            buttonSave.UseVisualStyleBackColor = true;
+            buttonSave.Click += buttonSave_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(663, 509);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(123, 33);
+            buttonCancel.TabIndex = 5;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            buttonCancel.Click += buttonCancel_Click;
+            // 
+            // dataGridView
+            // 
+            dataGridView.AllowUserToAddRows = false;
+            dataGridView.AllowUserToDeleteRows = false;
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Columns.AddRange(new DataGridViewColumn[] { CannedName, Count });
+            dataGridView.Location = new Point(0, 108);
+            dataGridView.Name = "dataGridView";
+            dataGridView.ReadOnly = true;
+            dataGridView.RowHeadersWidth = 51;
+            dataGridView.RowTemplate.Height = 29;
+            dataGridView.Size = new Size(851, 376);
+            dataGridView.TabIndex = 6;
+            // 
+            // CannedName
+            // 
+            CannedName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+            CannedName.HeaderText = "Консерва";
+            CannedName.MinimumWidth = 6;
+            CannedName.Name = "CannedName";
+            CannedName.ReadOnly = true;
+            // 
+            // Count
+            // 
+            Count.HeaderText = "Количество";
+            Count.MinimumWidth = 125;
+            Count.Name = "Count";
+            Count.ReadOnly = true;
+            Count.Width = 170;
+            // 
+            // label3
+            // 
+            label3.AutoSize = true;
+            label3.Location = new Point(438, 63);
+            label3.Name = "label3";
+            label3.Size = new Size(113, 20);
+            label3.TabIndex = 7;
+            label3.Text = "Дата открытия:";
+            // 
+            // openingDatePicker
+            // 
+            openingDatePicker.Location = new Point(557, 60);
+            openingDatePicker.Name = "openingDatePicker";
+            openingDatePicker.Size = new Size(294, 27);
+            openingDatePicker.TabIndex = 8;
+            // 
+            // textBoxCapacity
+            // 
+            textBoxCapacity.Location = new Point(557, 20);
+            textBoxCapacity.Name = "textBoxCapacity";
+            textBoxCapacity.Size = new Size(294, 27);
+            textBoxCapacity.TabIndex = 9;
+            // 
+            // label4
+            // 
+            label4.AutoSize = true;
+            label4.Location = new Point(438, 23);
+            label4.Name = "label4";
+            label4.Size = new Size(103, 20);
+            label4.TabIndex = 10;
+            label4.Text = "Вместимость:";
+            // 
+            // FormShop
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(863, 568);
+            Controls.Add(label4);
+            Controls.Add(textBoxCapacity);
+            Controls.Add(openingDatePicker);
+            Controls.Add(label3);
+            Controls.Add(dataGridView);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonSave);
+            Controls.Add(textBoxAdress);
+            Controls.Add(textBoxShopName);
+            Controls.Add(label2);
+            Controls.Add(label1);
+            Name = "FormShop";
+            Text = "Магазин";
+            Load += FormShop_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Label label1;
+        private Label label2;
+        private TextBox textBoxShopName;
+        private TextBox textBoxAdress;
+        private Button buttonSave;
+        private Button buttonCancel;
+        private DataGridView dataGridView;
+        private DataGridViewTextBoxColumn CannedName;
+        private DataGridViewTextBoxColumn Count;
+        private Label label3;
+        private DateTimePicker openingDatePicker;
+        private TextBox textBoxCapacity;
+        private Label label4;
+    }
+}

FishFactory/FormShop.cs

@@ -0,0 +1,125 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.SearchModels;
+using FishFactoryDataModel.Models;
+using Microsoft.Extensions.Logging;
+
+namespace FishFactory.Forms
+{
+    public partial class FormShop : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IShopLogic _logic;
+        private int? _id;
+        public int Id { set { _id = value; } }
+        private Dictionary<int, (ICannedModel, int)> _shopCanneds;
+
+        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            _shopCanneds = new Dictionary<int, (ICannedModel, int)>();
+        }
+
+        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)
+                    {
+                        textBoxShopName.Text = view.ShopName;
+                        textBoxAdress.Text = view.Adress;
+                        textBoxCapacity.Text = view.CapacityCanned.ToString();
+                        openingDatePicker.Value = view.OpeningDate;
+                        _shopCanneds = view.ShopCanneds ?? 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 (_shopCanneds != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var sr in _shopCanneds)
+                    {
+                        dataGridView.Rows.Add(new object[] { sr.Value.Item1.CannedName, sr.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(textBoxShopName.Text))
+            {
+                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(textBoxAdress.Text))
+            {
+                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (string.IsNullOrEmpty(textBoxCapacity.Text))
+            {
+                MessageBox.Show("Заполните вместимость магазина", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Сохранение магазина");
+            try
+            {
+                var model = new ShopBindingModel
+                {
+                    Id = _id ?? 0,
+                    ShopName = textBoxShopName.Text,
+                    Adress = textBoxAdress.Text,
+                    CapacityCanned = Convert.ToInt32(textBoxCapacity.Text),
+                    OpeningDate = openingDatePicker.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/FormShop.resx

@@ -117,10 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Component.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Canned.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="CannedName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

FishFactory/FormShopReplenish.Designer.cs

@@ -0,0 +1,142 @@
+namespace FishFactory.Forms
+{
+    partial class FormShopReplenish
+    {
+        /// <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()
+        {
+            label1 = new Label();
+            label2 = new Label();
+            label3 = new Label();
+            comboBoxShopCanneds = new ComboBox();
+            comboBoxCanned = new ComboBox();
+            textBoxCount = new TextBox();
+            buttonSave = new Button();
+            buttonCancel = new Button();
+            SuspendLayout();
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(23, 33);
+            label1.Name = "label1";
+            label1.Size = new Size(72, 20);
+            label1.TabIndex = 0;
+            label1.Text = "Магазин:";
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(23, 78);
+            label2.Name = "label2";
+            label2.Size = new Size(79, 20);
+            label2.TabIndex = 1;
+            label2.Text = "Консерва:";
+            // 
+            // label3
+            // 
+            label3.AutoSize = true;
+            label3.Location = new Point(23, 126);
+            label3.Name = "label3";
+            label3.Size = new Size(93, 20);
+            label3.TabIndex = 2;
+            label3.Text = "Количество:";
+            // 
+            // comboBoxShopCanneds
+            // 
+            comboBoxShopCanneds.FormattingEnabled = true;
+            comboBoxShopCanneds.Location = new Point(140, 33);
+            comboBoxShopCanneds.Name = "comboBoxShopCanneds";
+            comboBoxShopCanneds.Size = new Size(383, 28);
+            comboBoxShopCanneds.TabIndex = 3;
+            // 
+            // comboBoxCanned
+            // 
+            comboBoxCanned.FormattingEnabled = true;
+            comboBoxCanned.Location = new Point(140, 78);
+            comboBoxCanned.Name = "comboBoxCanned";
+            comboBoxCanned.Size = new Size(383, 28);
+            comboBoxCanned.TabIndex = 4;
+            // 
+            // textBoxCount
+            // 
+            textBoxCount.Location = new Point(140, 123);
+            textBoxCount.Name = "textBoxCount";
+            textBoxCount.Size = new Size(199, 27);
+            textBoxCount.TabIndex = 5;
+            // 
+            // buttonSave
+            // 
+            buttonSave.Location = new Point(281, 175);
+            buttonSave.Name = "buttonSave";
+            buttonSave.Size = new Size(107, 34);
+            buttonSave.TabIndex = 6;
+            buttonSave.Text = "Сохранить";
+            buttonSave.UseVisualStyleBackColor = true;
+            buttonSave.Click += buttonSave_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(407, 175);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(107, 34);
+            buttonCancel.TabIndex = 7;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            buttonCancel.Click += buttonCancel_Click;
+            // 
+            // FormShopReplenish
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(538, 221);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonSave);
+            Controls.Add(textBoxCount);
+            Controls.Add(comboBoxCanned);
+            Controls.Add(comboBoxShopCanneds);
+            Controls.Add(label3);
+            Controls.Add(label2);
+            Controls.Add(label1);
+            Name = "FormShopReplenish";
+            Text = "Пополнение магазина";
+            Load += FormShopReplenish_Load;
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Label label1;
+        private Label label2;
+        private Label label3;
+        private ComboBox comboBoxShopCanneds;
+        private ComboBox comboBoxCanned;
+        private TextBox textBoxCount;
+        private Button buttonSave;
+        private Button buttonCancel;
+    }
+}

FishFactory/FormShopReplenish.cs

@@ -0,0 +1,88 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+
+namespace FishFactory.Forms
+{
+    public partial class FormShopReplenish : Form
+    {
+        private readonly ILogger _logger;
+        private readonly ICannedLogic _logicP;
+        private readonly IShopLogic _logicS;
+        private List<ShopViewModel> _shopList = new List<ShopViewModel>();
+        private List<CannedViewModel> _cannedList = new List<CannedViewModel>();
+
+        public FormShopReplenish(ILogger<FormShopReplenish> logger, ICannedLogic logicP, IShopLogic logicS)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicP = logicP;
+            _logicS = logicS;
+        }
+
+        private void FormShopReplenish_Load(object sender, EventArgs e)
+        {
+            _shopList = _logicS.ReadList(null);
+            _cannedList = _logicP.ReadList(null);
+            if (_shopList != null)
+            {
+                comboBoxShopCanneds.DisplayMember = "ShopName";
+                comboBoxShopCanneds.ValueMember = "Id";
+                comboBoxShopCanneds.DataSource = _shopList;
+                comboBoxShopCanneds.SelectedItem = null;
+                _logger.LogInformation("Загрузка магазинов для поставок");
+            }
+            if (_cannedList != null)
+            {
+                comboBoxCanned.DisplayMember = "CannedName";
+                comboBoxCanned.ValueMember = "Id";
+                comboBoxCanned.DataSource = _cannedList;
+                comboBoxCanned.SelectedItem = null;
+                _logger.LogInformation("Загрузка консерв для поставок");
+            }
+        }
+
+        private void buttonSave_Click(object sender, EventArgs e)
+        {
+            if (comboBoxShopCanneds.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxCanned.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите консерву", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Создание поставки");
+            try
+            {
+                var operationResult = _logicS.Replenish(new ReplenishBindingModel
+                {
+                    ShopId = Convert.ToInt32(comboBoxShopCanneds.SelectedValue),
+                    CannedId = Convert.ToInt32(comboBoxCanned.SelectedValue),
+                    Count = 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();
+        }
+    }
+}

FishFactory/FormShopSale.Designer.cs

@@ -0,0 +1,119 @@
+namespace FishFactory.Forms
+{
+    partial class FormShopSale
+    {
+        /// <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()
+        {
+            buttonSell = new Button();
+            buttonCancel = new Button();
+            label1 = new Label();
+            label2 = new Label();
+            comboBoxCanned = new ComboBox();
+            textBoxCount = new TextBox();
+            SuspendLayout();
+            // 
+            // buttonSell
+            // 
+            buttonSell.Location = new Point(237, 109);
+            buttonSell.Name = "buttonSell";
+            buttonSell.Size = new Size(118, 33);
+            buttonSell.TabIndex = 0;
+            buttonSell.Text = "Продать";
+            buttonSell.UseVisualStyleBackColor = true;
+            buttonSell.Click += buttonSell_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(378, 109);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(118, 33);
+            buttonCancel.TabIndex = 1;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            buttonCancel.Click += buttonCancel_Click;
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(20, 23);
+            label1.Name = "label1";
+            label1.Size = new Size(79, 20);
+            label1.TabIndex = 2;
+            label1.Text = "Консерва:";
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(20, 66);
+            label2.Name = "label2";
+            label2.Size = new Size(93, 20);
+            label2.TabIndex = 3;
+            label2.Text = "Количество:";
+            // 
+            // comboBoxCanned
+            // 
+            comboBoxCanned.FormattingEnabled = true;
+            comboBoxCanned.Location = new Point(128, 20);
+            comboBoxCanned.Name = "comboBoxCanned";
+            comboBoxCanned.Size = new Size(325, 28);
+            comboBoxCanned.TabIndex = 4;
+            // 
+            // textBoxCount
+            // 
+            textBoxCount.Location = new Point(128, 63);
+            textBoxCount.Name = "textBoxCount";
+            textBoxCount.Size = new Size(325, 27);
+            textBoxCount.TabIndex = 5;
+            // 
+            // FormShopSale
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(516, 151);
+            Controls.Add(textBoxCount);
+            Controls.Add(comboBoxCanned);
+            Controls.Add(label2);
+            Controls.Add(label1);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonSell);
+            Name = "FormShopSale";
+            Text = "Продажа консерв";
+            Load += FormShopSale_Load;
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Button buttonSell;
+        private Button buttonCancel;
+        private Label label1;
+        private Label label2;
+        private ComboBox comboBoxCanned;
+        private TextBox textBoxCount;
+    }
+}

FishFactory/FormShopSale.cs

@@ -0,0 +1,78 @@
+using Microsoft.Extensions.Logging;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.SearchModels;
+
+namespace FishFactory.Forms
+{
+    public partial class FormShopSale : Form
+    {
+        private readonly ILogger _logger;
+        private readonly ICannedLogic _logicC;
+        private readonly IShopLogic _logicS;
+        private List<CannedViewModel> _cannedList = new List<CannedViewModel>();
+
+        public FormShopSale(ILogger<FormShopSale> logger, ICannedLogic logicC, IShopLogic logicS)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicC = logicC;
+            _logicS = logicS;
+        }
+
+        private void FormShopSale_Load(object sender, EventArgs e)
+        {
+            _cannedList = _logicC.ReadList(null);
+            if (_cannedList != null)
+            {
+                comboBoxCanned.DisplayMember = "CannedName";
+                comboBoxCanned.ValueMember = "Id";
+                comboBoxCanned.DataSource = _cannedList;
+                comboBoxCanned.SelectedItem = null;
+                _logger.LogInformation("Загрузка консерв для продажи");
+            }
+        }
+        private void buttonSell_Click(object sender, EventArgs e)
+        {
+            if (comboBoxCanned.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите консерву", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Создание покупки");
+            try
+            {
+                bool sale = _logicS.Sale(new ReplenishSearchModel
+                {
+                    CannedId = Convert.ToInt32(comboBoxCanned.SelectedValue),
+                    Count = Convert.ToInt32(textBoxCount.Text)
+                });
+                if (sale)
+                {
+                    _logger.LogInformation("Проверка пройдена, продажа проведена");
+                    MessageBox.Show("Продажа проведена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    DialogResult = DialogResult.OK;
+                    Close();
+                }
+                else
+                {
+                    _logger.LogInformation("Проверка не пройдена");
+                    MessageBox.Show("Продажа не может быть создана.", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
+            }
+            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/FormShopSale.resx

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

FishFactory/FormShops.Designer.cs

@@ -0,0 +1,126 @@
+namespace FishFactory.Forms
+{
+    partial class FormShops
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            dataGridView = new DataGridView();
+            buttonAdd = new Button();
+            buttonUpd = new Button();
+            buttonDel = new Button();
+            buttonRef = new Button();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            dataGridView.AllowUserToAddRows = false;
+            dataGridView.AllowUserToDeleteRows = false;
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Location = new Point(0, 0);
+            dataGridView.Name = "dataGridView";
+            dataGridView.ReadOnly = true;
+            dataGridView.RowHeadersWidth = 51;
+            dataGridView.RowTemplate.Height = 29;
+            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+            dataGridView.Size = new Size(682, 673);
+            dataGridView.TabIndex = 0;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.AccessibleRole = AccessibleRole.None;
+            buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonAdd.Location = new Point(712, 76);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(130, 35);
+            buttonAdd.TabIndex = 1;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // buttonUpd
+            // 
+            buttonUpd.AccessibleRole = AccessibleRole.None;
+            buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonUpd.Location = new Point(712, 130);
+            buttonUpd.Name = "buttonUpd";
+            buttonUpd.Size = new Size(130, 35);
+            buttonUpd.TabIndex = 2;
+            buttonUpd.Text = "Изменить";
+            buttonUpd.UseVisualStyleBackColor = true;
+            buttonUpd.Click += buttonUpd_Click;
+            // 
+            // buttonDel
+            // 
+            buttonDel.AccessibleRole = AccessibleRole.None;
+            buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonDel.Location = new Point(712, 186);
+            buttonDel.Name = "buttonDel";
+            buttonDel.Size = new Size(130, 35);
+            buttonDel.TabIndex = 3;
+            buttonDel.Text = "Удалить";
+            buttonDel.UseVisualStyleBackColor = true;
+            buttonDel.Click += buttonDel_Click;
+            // 
+            // buttonRef
+            // 
+            buttonRef.AccessibleRole = AccessibleRole.None;
+            buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+            buttonRef.Location = new Point(712, 243);
+            buttonRef.Name = "buttonRef";
+            buttonRef.Size = new Size(130, 35);
+            buttonRef.TabIndex = 4;
+            buttonRef.Text = "Обновить";
+            buttonRef.UseVisualStyleBackColor = true;
+            buttonRef.Click += buttonRef_Click;
+            // 
+            // FormShops
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(869, 674);
+            Controls.Add(buttonRef);
+            Controls.Add(buttonDel);
+            Controls.Add(buttonUpd);
+            Controls.Add(buttonAdd);
+            Controls.Add(dataGridView);
+            Name = "FormShops";
+            Text = "Список магазинов";
+            Load += FormShops_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private DataGridView dataGridView;
+        private Button buttonAdd;
+        private Button buttonUpd;
+        private Button buttonDel;
+        private Button buttonRef;
+    }
+}

FishFactory/FormShops.cs

@@ -0,0 +1,106 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+
+namespace FishFactory.Forms
+{
+    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["ShopCanneds"].Visible = false;
+                    dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    //dataGridView.Columns["CapacityCanned"].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/FormShops.resx

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

FishFactory/Forms/FormReportCannedComponents.Designer.cs

@@ -1,106 +0,0 @@
-namespace FishFactory.Forms
-{
-    partial class FormReportCannedComponents
-    {
-        /// <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()
-        {
-            buttonSaveToExcel = new Button();
-            dataGridView = new DataGridView();
-            Count = new DataGridViewTextBoxColumn();
-            Canned = new DataGridViewTextBoxColumn();
-            Component = new DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // buttonSaveToExcel
-            // 
-            buttonSaveToExcel.Location = new Point(31, 19);
-            buttonSaveToExcel.Margin = new Padding(3, 4, 3, 4);
-            buttonSaveToExcel.Name = "buttonSaveToExcel";
-            buttonSaveToExcel.Size = new Size(183, 29);
-            buttonSaveToExcel.TabIndex = 0;
-            buttonSaveToExcel.Text = "Сохранить в Excel";
-            buttonSaveToExcel.UseVisualStyleBackColor = true;
-            buttonSaveToExcel.Click += buttonSaveToExcel_Click;
-            // 
-            // dataGridView
-            // 
-            dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { Component, Canned, Count });
-            dataGridView.Location = new Point(0, 60);
-            dataGridView.Margin = new Padding(3, 4, 3, 4);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders;
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(913, 555);
-            dataGridView.TabIndex = 1;
-            // 
-            // Count
-            // 
-            Count.HeaderText = "Количество";
-            Count.MinimumWidth = 6;
-            Count.Name = "Count";
-            Count.ReadOnly = true;
-            // 
-            // Canned
-            // 
-            Canned.HeaderText = "Консервы";
-            Canned.MinimumWidth = 6;
-            Canned.Name = "Canned";
-            // 
-            // Component
-            // 
-            Component.HeaderText = "Компонент";
-            Component.MinimumWidth = 6;
-            Component.Name = "Component";
-            Component.ReadOnly = true;
-            // 
-            // FormReportCannedComponents
-            // 
-            AutoScaleDimensions = new SizeF(8F, 19F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(915, 613);
-            Controls.Add(dataGridView);
-            Controls.Add(buttonSaveToExcel);
-            Margin = new Padding(3, 4, 3, 4);
-            Name = "FormReportCannedComponents";
-            Text = "Компоненты по консервам";
-            Load += FormReportCannedComponents_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Button buttonSaveToExcel;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn Component;
-        private DataGridViewTextBoxColumn Canned;
-        private DataGridViewTextBoxColumn Count;
-    }
-}

FishFactory/Forms/FormReportCannedComponents.cs

@@ -1,73 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-
-namespace FishFactory.Forms
-{
-    public partial class FormReportCannedComponents : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-        public FormReportCannedComponents(ILogger<FormReportCannedComponents> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-        private void FormReportCannedComponents_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                var dict = _logic.GetCannedComponent();
-                if (dict != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var elem in dict)
-                    {
-                        dataGridView.Rows.Add(new object[] { elem.CannedName, "", "" });
-                        foreach (var listElem in elem.Components)
-                        {
-                            dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
-                        }
-                        dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
-                        dataGridView.Rows.Add(Array.Empty<object>());
-                    }
-                }
-                _logger.LogInformation("Загрузка списка консерв по компонентам");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка консерв по компонентам");
-
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-               MessageBoxIcon.Error);
-            }
-        }
-        private void buttonSaveToExcel_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog
-            {
-                Filter = "xlsx|*.xlsx"
-            };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveCannedComponentToExcelFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName
-                    });
-                    _logger.LogInformation("Сохранение списка консерв по компонентам");
-
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка консерв по компонентам");
-
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

FishFactory/Forms/FormReportOrders.Designer.cs

@@ -1,135 +0,0 @@
-namespace FishFactory.Forms
-{
-    partial class FormReportOrders
-    {
-        /// <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()
-        {
-            dateTimePickerFrom = new DateTimePicker();
-            dateTimePickerTo = new DateTimePicker();
-            buttonMake = new Button();
-            label1 = new Label();
-            label2 = new Label();
-            panel = new Panel();
-            buttonSaveToPdf = new Button();
-            panel.SuspendLayout();
-            SuspendLayout();
-            // 
-            // dateTimePickerFrom
-            // 
-            dateTimePickerFrom.Location = new Point(38, 12);
-            dateTimePickerFrom.Margin = new Padding(3, 4, 3, 4);
-            dateTimePickerFrom.Name = "dateTimePickerFrom";
-            dateTimePickerFrom.Size = new Size(170, 27);
-            dateTimePickerFrom.TabIndex = 0;
-            // 
-            // dateTimePickerTo
-            // 
-            dateTimePickerTo.Location = new Point(246, 12);
-            dateTimePickerTo.Margin = new Padding(3, 4, 3, 4);
-            dateTimePickerTo.Name = "dateTimePickerTo";
-            dateTimePickerTo.Size = new Size(170, 27);
-            dateTimePickerTo.TabIndex = 1;
-            // 
-            // buttonMake
-            // 
-            buttonMake.Location = new Point(597, 13);
-            buttonMake.Margin = new Padding(3, 4, 3, 4);
-            buttonMake.Name = "buttonMake";
-            buttonMake.Size = new Size(137, 31);
-            buttonMake.TabIndex = 2;
-            buttonMake.Text = "Сформировать";
-            buttonMake.UseVisualStyleBackColor = true;
-            buttonMake.Click += buttonMake_Click;
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(15, 16);
-            label1.Name = "label1";
-            label1.Size = new Size(18, 20);
-            label1.TabIndex = 3;
-            label1.Text = "С";
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(218, 15);
-            label2.Name = "label2";
-            label2.Size = new Size(27, 20);
-            label2.TabIndex = 4;
-            label2.Text = "по";
-            // 
-            // panel
-            // 
-            panel.Controls.Add(buttonSaveToPdf);
-            panel.Controls.Add(dateTimePickerFrom);
-            panel.Controls.Add(label2);
-            panel.Controls.Add(dateTimePickerTo);
-            panel.Controls.Add(label1);
-            panel.Controls.Add(buttonMake);
-            panel.Dock = DockStyle.Top;
-            panel.Location = new Point(0, 0);
-            panel.Margin = new Padding(3, 3, 3, 4);
-            panel.Name = "panel";
-            panel.Size = new Size(941, 51);
-            panel.TabIndex = 5;
-            // 
-            // buttonSaveToPdf
-            // 
-            buttonSaveToPdf.Location = new Point(749, 13);
-            buttonSaveToPdf.Name = "buttonSaveToPdf";
-            buttonSaveToPdf.Size = new Size(140, 31);
-            buttonSaveToPdf.TabIndex = 6;
-            buttonSaveToPdf.Text = "Сохранить в pdf";
-            buttonSaveToPdf.UseVisualStyleBackColor = true;
-            buttonSaveToPdf.Click += buttonSaveToPdf_Click;
-            // 
-            // FormReportOrders
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(941, 723);
-            Controls.Add(panel);
-            Margin = new Padding(3, 4, 3, 4);
-            Name = "FormReportOrders";
-            Text = "Заказы";
-            panel.ResumeLayout(false);
-            panel.PerformLayout();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private DateTimePicker dateTimePickerFrom;
-        private DateTimePicker dateTimePickerTo;
-        private Button buttonMake;
-        private Label label1;
-        private Label label2;
-        private Panel panel;
-        private Button buttonSaveToPdf;
-    }
-}

FishFactory/Forms/FormReportOrders.cs

@@ -1,92 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using Microsoft.Reporting.WinForms;
-
-namespace FishFactory.Forms
-{
-    public partial class FormReportOrders : Form
-    {
-        private readonly ReportViewer reportViewer;
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-
-        public FormReportOrders(ILogger<FormReportOrders> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            reportViewer = new ReportViewer
-            {
-                Dock = DockStyle.Fill
-            };
-            reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open));
-            Controls.Clear();
-            Controls.Add(reportViewer);
-            Controls.Add(panel);
-        }
-        private void buttonMake_Click(object sender, EventArgs e)
-        {
-            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
-            {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            try
-            {
-                var dataSource = _logic.GetOrders(new ReportBindingModel
-                {
-                    DateFrom = dateTimePickerFrom.Value,
-                    DateTo = dateTimePickerTo.Value
-                });
-                var source = new ReportDataSource("DataSetOrders", dataSource);
-                reportViewer.LocalReport.DataSources.Clear();
-                reportViewer.LocalReport.DataSources.Add(source);
-                var parameters = new[] { new ReportParameter("ReportParameterPeriod",
-                    $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") };
-                reportViewer.LocalReport.SetParameters(parameters);
-
-                reportViewer.RefreshReport();
-                _logger.LogInformation("Загрузка списка заказов на период {From}-{ To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка заказов на период");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void buttonSaveToPdf_Click(object sender, EventArgs e)
-        {
-            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
-            {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            using var dialog = new SaveFileDialog
-            {
-                Filter = "pdf|*.pdf"
-            };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-                    _logic.SaveOrdersToPdfFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName,
-                        DateFrom = dateTimePickerFrom.Value,
-                        DateTo = dateTimePickerTo.Value
-                    });
-                    _logger.LogInformation("Сохранение списка заказов на период { From}-{ To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка заказов на период");
-
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

FishFactory/Program.cs

@@ -6,12 +6,10 @@ using FishFactoryFileImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
-using FishFactoryBusinessLogic.OfficePackage;
-using FishFactoryBusinessLogic.OfficePackage.Implements;
 
 namespace FishFactory
 {
-    internal static class Program
+    public static class Program
     {
         private static ServiceProvider? _serviceProvider;
         public static ServiceProvider? ServiceProvider => _serviceProvider;
@@ -40,13 +38,11 @@ namespace FishFactory
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ICannedStorage, CannedStorage>();
+            services.AddTransient<IShopStorage,  ShopStorage>();
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ICannedLogic, CannedLogic>();
-            services.AddTransient<IReportLogic, ReportLogic>();
-            services.AddTransient<AbstractSaveToWord, SaveToWord>();
-            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
-            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+            services.AddTransient<IShopLogic, ShopLogic>();
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -54,8 +50,10 @@ namespace FishFactory
             services.AddTransient<FormCanned>();
             services.AddTransient<FormCannedComponent>();
             services.AddTransient<FormCanneds>();
-            services.AddTransient<FormReportOrders>();
-            services.AddTransient<FormReportCannedComponents>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormShopReplenish>();
+            services.AddTransient<FormShopSale>();
         }
     }
 }

FishFactory/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace FishFactory.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
-    /// </summary>
-    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
-    // с помощью такого средства, как ResGen или Visual Studio.
-    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
-    // с параметром /str или перестройте свой проект VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FishFactory.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
-        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

FishFactory/Properties/Resources.resx

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

FishFactory/ReportOrders.rdlc

@@ -1,600 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
-  <AutoRefresh>0</AutoRefresh>
-  <DataSources>
-    <DataSource Name="FishFactoryContractsViewModels">
-      <ConnectionProperties>
-        <DataProvider>System.Data.DataSet</DataProvider>
-        <ConnectString>/* Local Connection */</ConnectString>
-      </ConnectionProperties>
-      <rd:DataSourceID>10791c83-cee8-4a38-bbd0-245fc17cefb3</rd:DataSourceID>
-    </DataSource>
-  </DataSources>
-  <DataSets>
-    <DataSet Name="DataSetOrders">
-      <Query>
-        <DataSourceName>FishFactoryContractsViewModels</DataSourceName>
-        <CommandText>/* Local Query */</CommandText>
-      </Query>
-      <Fields>
-        <Field Name="Id">
-          <DataField>Id</DataField>
-          <rd:TypeName>System.Int32</rd:TypeName>
-        </Field>
-        <Field Name="DateCreate">
-          <DataField>DateCreate</DataField>
-          <rd:TypeName>System.DateTime</rd:TypeName>
-        </Field>
-        <Field Name="CannedName">
-          <DataField>CannedName</DataField>
-          <rd:TypeName>System.String</rd:TypeName>
-        </Field>
-        <Field Name="Status">
-          <DataField>Status</DataField>
-          <rd:TypeName>FishFactoryDataModels.Status</rd:TypeName>
-        </Field>
-        <Field Name="Sum">
-          <DataField>Sum</DataField>
-          <rd:TypeName>System.Decimal</rd:TypeName>
-        </Field>
-      </Fields>
-      <rd:DataSetInfo>
-        <rd:DataSetName>FishFactoryContracts.ViewModels</rd:DataSetName>
-        <rd:TableName>ReportOrdersViewModel</rd:TableName>
-        <rd:ObjectDataSourceType>FishFactoryContracts.ViewModels.ReportOrdersViewModel, FishFactoryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</rd:ObjectDataSourceType>
-      </rd:DataSetInfo>
-    </DataSet>
-  </DataSets>
-  <ReportSections>
-    <ReportSection>
-      <Body>
-        <ReportItems>
-          <Textbox Name="ReportParameterPeriod">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Parameters!ReportParameterPeriod.Value</Value>
-                    <Style>
-                      <FontSize>14pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <rd:DefaultName>ReportParameterPeriod</rd:DefaultName>
-            <Top>1cm</Top>
-            <Height>1cm</Height>
-            <Width>21cm</Width>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <VerticalAlign>Middle</VerticalAlign>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Textbox Name="TextboxTitle">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Заказы</Value>
-                    <Style>
-                      <FontSize>16pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Height>1cm</Height>
-            <Width>21cm</Width>
-            <ZIndex>1</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <VerticalAlign>Middle</VerticalAlign>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Tablix Name="Tablix1">
-            <TablixBody>
-              <TablixColumns>
-                <TablixColumn>
-                  <Width>2.5cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.21438cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>8.23317cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>2.5cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>2.5cm</Width>
-                </TablixColumn>
-              </TablixColumns>
-              <TablixRows>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox5">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Номер</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox5</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox1">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Дата создания</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox1</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox3">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Консерва</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox3</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox2">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Статус</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox2</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox7">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Сумма</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox7</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Id">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Id.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Id</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="DateCreate">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!DateCreate.Value</Value>
-                                  <Style>
-                                    <Format>d</Format>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>DateCreate</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="CannedName">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!CannedName.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>CannedName</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Status">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Status.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Status</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Sum">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Sum.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Sum</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-              </TablixRows>
-            </TablixBody>
-            <TablixColumnHierarchy>
-              <TablixMembers>
-                <TablixMember />
-                <TablixMember />
-                <TablixMember />
-                <TablixMember />
-                <TablixMember />
-              </TablixMembers>
-            </TablixColumnHierarchy>
-            <TablixRowHierarchy>
-              <TablixMembers>
-                <TablixMember>
-                  <KeepWithGroup>After</KeepWithGroup>
-                </TablixMember>
-                <TablixMember>
-                  <Group Name="Подробности" />
-                </TablixMember>
-              </TablixMembers>
-            </TablixRowHierarchy>
-            <DataSetName>DataSetOrders</DataSetName>
-            <Top>2.48391cm</Top>
-            <Left>0.55245cm</Left>
-            <Height>1.2cm</Height>
-            <Width>18.94755cm</Width>
-            <ZIndex>2</ZIndex>
-            <Style>
-              <Border>
-                <Style>Double</Style>
-              </Border>
-            </Style>
-          </Tablix>
-          <Textbox Name="TextboxTotalSum">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Итого:</Value>
-                    <Style>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>4cm</Top>
-            <Left>12cm</Left>
-            <Height>0.6cm</Height>
-            <Width>2.5cm</Width>
-            <ZIndex>3</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Textbox Name="SumTotal">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Sum(Fields!Sum.Value, "DataSetOrders")</Value>
-                    <Style>
-                      <FontWeight>Bold</FontWeight>
-                      <Format>0.00;(0.00)</Format>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>4cm</Top>
-            <Left>14.5cm</Left>
-            <Height>0.6cm</Height>
-            <Width>2.5cm</Width>
-            <ZIndex>4</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-        </ReportItems>
-        <Height>5.72875cm</Height>
-        <Style />
-      </Body>
-      <Width>21cm</Width>
-      <Page>
-        <PageHeight>29.7cm</PageHeight>
-        <PageWidth>21cm</PageWidth>
-        <LeftMargin>2cm</LeftMargin>
-        <RightMargin>2cm</RightMargin>
-        <TopMargin>2cm</TopMargin>
-        <BottomMargin>2cm</BottomMargin>
-        <ColumnSpacing>0.13cm</ColumnSpacing>
-        <Style />
-      </Page>
-    </ReportSection>
-  </ReportSections>
-  <ReportParameters>
-    <ReportParameter Name="ReportParameterPeriod">
-      <DataType>String</DataType>
-      <Nullable>true</Nullable>
-      <Prompt>ReportParameter1</Prompt>
-    </ReportParameter>
-  </ReportParameters>
-  <ReportParametersLayout>
-    <GridLayoutDefinition>
-      <NumberOfColumns>4</NumberOfColumns>
-      <NumberOfRows>2</NumberOfRows>
-      <CellDefinitions>
-        <CellDefinition>
-          <ColumnIndex>0</ColumnIndex>
-          <RowIndex>0</RowIndex>
-          <ParameterName>ReportParameterPeriod</ParameterName>
-        </CellDefinition>
-      </CellDefinitions>
-    </GridLayoutDefinition>
-  </ReportParametersLayout>
-  <rd:ReportUnitType>Cm</rd:ReportUnitType>
-  <rd:ReportID>2de0031a-4d17-449d-922d-d9fc54572312</rd:ReportID>
-</Report>

FishFactoryBusinessLogic/BusinessLogic/CannedLogic.cs

@@ -4,11 +4,6 @@ using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.StoragesContracts;
 using FishFactoryContracts.ViewModels;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FishFactoryBusinessLogic.BusinessLogic
 {

FishFactoryBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -5,11 +5,6 @@ using FishFactoryContracts.StoragesContracts;
 using FishFactoryContracts.ViewModels;
 using FishFactoryDataModel.Enums;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FishFactoryBusinessLogic.BusinessLogic
 {
@@ -21,11 +16,13 @@ namespace FishFactoryBusinessLogic.BusinessLogic
 
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
+        private readonly IShopStorage _shopStorage;
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
+            _shopStorage = shopStorage;
         }
 
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
@@ -101,6 +98,19 @@ namespace FishFactoryBusinessLogic.BusinessLogic
 
             if (model.Status == OrderStatus.Выдан)
             {
+                var replenish = new ReplenishBindingModel
+                {
+                    ShopId = 0,
+                    CannedId = model.CannedId,
+                    Count = model.Count,
+                };
+
+                if (!_shopStorage.ReplenishShops(replenish))
+                {
+                    _logger.LogWarning("Status update to " + orderStatus + " operation failed");
+                    return false;
+                }
+
                 model.DateImplement = DateTime.Now;
             }
 

FishFactoryBusinessLogic/BusinessLogic/ReportLogic.cs

@@ -1,99 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-using FishFactoryBusinessLogic.OfficePackage;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryBusinessLogic.BusinessLogic
-{
-    public class ReportLogic : IReportLogic
-    {
-        private readonly IComponentStorage _componentStorage;
-        private readonly ICannedStorage _cannedStorage;
-        private readonly IOrderStorage _orderStorage;
-        private readonly AbstractSaveToExcel _saveToExcel;
-        private readonly AbstractSaveToWord _saveToWord;
-        private readonly AbstractSaveToPdf _saveToPdf;
-        public ReportLogic(ICannedStorage CannedStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
-        {
-            _cannedStorage = CannedStorage;
-            _componentStorage = componentStorage;
-            _orderStorage = orderStorage;
-            _saveToExcel = saveToExcel;
-            _saveToWord = saveToWord;
-            _saveToPdf = saveToPdf;
-        }
-        /// <summary>
-        /// Получение списка компонент с указанием, в каких изделиях используются
-        /// </summary>
-        /// <returns></returns>
-        public List<ReportCannedComponentViewModel> GetCannedComponent()
-        {
-            return _cannedStorage.GetFullList().Select(x => new ReportCannedComponentViewModel
-            {
-                CannedName = x.CannedName,
-                Components = x.CannedComponents.Select(x => (x.Value.Item1.ComponentName, x.Value.Item2)).ToList(),
-                TotalCount = x.CannedComponents.Select(x => x.Value.Item2).Sum()
-            }).ToList();
-        }
-        /// <summary>
-        /// Получение списка заказов за определенный период
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
-        {
-            return _orderStorage.GetFilteredList(new OrderSearchModel
-            {
-                DateFrom = model.DateFrom,
-                DateTo = model.DateTo
-            })
-            .Select(x => new ReportOrdersViewModel
-            {
-                Id = x.Id,
-                DateCreate = x.DateCreate,
-                CannedName = x.CannedName,
-                Status = x.Status.ToString(),
-                Sum = x.Sum
-            })
-           .ToList();
-        }
-
-        public void SaveCannedsToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateDoc(new WordInfo
-            {
-                FileName = model.FileName,
-                Title = "Список консерв",
-                Canneds = _cannedStorage.GetFullList()
-            });
-        }
-
-        public void SaveCannedComponentToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateReport(new ExcelInfo
-            {
-                FileName = model.FileName,
-                Title = "Список компонент",
-                CannedComponents = GetCannedComponent()
-            });
-        }
-        /// <summary>
-        /// Сохранение заказов в файл-Pdf
-        /// </summary>
-        /// <param name="model"></param>
-        public void SaveOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateDoc(new PdfInfo
-            {
-                FileName = model.FileName,
-                Title = "Список заказов",
-                DateFrom = model.DateFrom!.Value,
-                DateTo = model.DateTo!.Value,
-                Orders = GetOrders(model)
-            });
-        }
-    }
-}

FishFactoryBusinessLogic/BusinessLogic/ShopLogic.cs

@@ -0,0 +1,170 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.BusinessLogicsContracts;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+
+namespace FishFactoryBusinessLogic.BusinessLogic
+{
+    public class ShopLogic : IShopLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IShopStorage _shopStorage;
+        private readonly ICannedStorage _cannedStorage;
+
+        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, ICannedStorage cannedStorage)
+        {
+            _logger = logger;
+            _shopStorage = shopStorage;
+            _cannedStorage = cannedStorage;
+        }
+        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
+        {
+            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{Id}", model?.ShopName, model?.Id);
+            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
+            if (list == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+            return list;
+        }
+
+        public ShopViewModel? ReadElement(ShopSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{Id}", model.ShopName, model.Id);
+            var element = _shopStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
+
+        public bool Create(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool Update(ShopBindingModel model)
+        {
+            CheckModel(model);
+            if (_shopStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool Delete(ShopBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_shopStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool Replenish(ReplenishBindingModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (model.Count <= 0)
+            {
+                throw new ArgumentException("Количество изделий должно быть больше 0");
+            }
+            var shop = _shopStorage.GetElement(new ShopSearchModel
+            {
+                Id = model.ShopId
+            });
+            if (shop == null)
+            {
+                throw new ArgumentException("Магазина не существует");
+            }
+            if (shop.ShopCanneds.ContainsKey(model.CannedId))
+            {
+                var oldValue = shop.ShopCanneds[model.CannedId];
+                oldValue.Item2 += model.Count;
+                shop.ShopCanneds[model.CannedId] = oldValue;
+            }
+            else
+            {
+                var canned = _cannedStorage.GetElement(new CannedSearchModel
+                {
+                    Id = model.CannedId
+                });
+                if (canned == null)
+                {
+                    throw new ArgumentException($"Поставка: Товар с id:{model.CannedId} не найден");
+                }
+                shop.ShopCanneds.Add(model.CannedId, (canned, model.Count));
+            }
+            return true;
+        }
+
+        public bool Sale(ReplenishSearchModel model)
+        {
+            if (!model.CannedId.HasValue || !model.Count.HasValue)
+            {
+                return false;
+            }
+            _logger.LogInformation("Check canned count in all shops");
+            if (_shopStorage.Sale(model))
+            {
+                _logger.LogInformation("Selling success");
+                return true;
+            }
+            _logger.LogInformation("Selling failed");
+            return false;
+        }
+
+        private void CheckModel(ShopBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(model.Adress))
+            {
+                throw new ArgumentException("Нет адреса магазина", nameof(model.Adress));
+            }
+            if (string.IsNullOrEmpty(model.ShopName))
+            {
+                throw new ArgumentNullException("Нет названия компонента", nameof(model.ShopName));
+            }
+            _logger.LogInformation("Shop. ShopName:{ShopName}.Adress:{Adress}.OpeningDate:{OpeningDate}. Id: {Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
+            var element = _shopStorage.GetElement(new ShopSearchModel
+            {
+                ShopName = model.ShopName
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Магазин с таким названием уже есть");
+            }
+        }
+    }
+}

FishFactoryBusinessLogic/FishFactoryBusinessLogic.csproj

@@ -8,11 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-    <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
   </ItemGroup>
 
   <ItemGroup>

FishFactoryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -1,99 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToExcel
-    {
-        /// <summary>
-        /// Создание отчета
-        /// </summary>
-        /// <param name="info"></param>
-        public void CreateReport(ExcelInfo info)
-        {
-            CreateExcel(info);
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "C1"
-            });
-            uint rowIndex = 2;
-            foreach (var pc in info.CannedComponents)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = pc.CannedName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-                foreach (var Canned in pc.Components)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = rowIndex,
-                        Text = Canned.Item1,
-                        StyleInfo =
-                    ExcelStyleInfoType.TextWithBroder
-                    });
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "C",
-                        RowIndex = rowIndex,
-                        Text = Canned.Item2.ToString(),
-                        StyleInfo =
-                    ExcelStyleInfoType.TextWithBroder
-                    });
-                    rowIndex++;
-                }
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Итого",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = pc.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-            }
-            SaveExcel(info);
-        }
-        /// <summary>
-        /// Создание excel-файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void CreateExcel(ExcelInfo info);
-        /// <summary>
-        /// Добавляем новую ячейку в лист
-        /// </summary>
-        /// <param name="cellParameters"></param>
-        protected abstract void InsertCellInWorksheet(ExcelCellParameters
-        excelParams);
-        /// <summary>
-        /// Объединение ячеек
-        /// </summary>
-        /// <param name="mergeParameters"></param>
-        protected abstract void MergeCells(ExcelMergeParameters excelParams);
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void SaveExcel(ExcelInfo info);
-
-    }
-}

FishFactoryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -1,75 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToPdf
-    {
-        public void CreateDoc(PdfInfo info)
-        {
-            CreatePdf(info);
-            CreateParagraph(new PdfParagraph
-            {
-                Text = info.Title,
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-            CreateParagraph(new PdfParagraph
-            {
-                Text = $"с{ info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style = "Normal",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
-            CreateRow(new PdfRowParameters
-            {
-                Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Статус", "Сумма" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-            foreach (var order in info.Orders)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.CannedName, order.Status, order.Sum.ToString() },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
-            CreateParagraph(new PdfParagraph
-            {
-                Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t",
-                Style = "Normal",
-                ParagraphAlignment = PdfParagraphAlignmentType.Rigth
-            });
-            SavePdf(info);
-        }
-        /// <summary>
-        /// Создание doc-файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void CreatePdf(PdfInfo info);
-        /// <summary>
-        /// Создание параграфа с текстом
-        /// </summary>
-        /// <param name="title"></param>
-        /// <param name="style"></param>
-        protected abstract void CreateParagraph(PdfParagraph paragraph);
-        /// <summary>
-        /// Создание таблицы
-        /// </summary>
-        /// <param name="title"></param>
-        /// <param name="style"></param>
-        protected abstract void CreateTable(List<string> columns);
-        /// <summary>
-        /// Создание и заполнение строки
-        /// </summary>
-        /// <param name="rowParameters"></param>
-        protected abstract void CreateRow(PdfRowParameters rowParameters);
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void SavePdf(PdfInfo info);
-
-    }
-}

FishFactoryBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -1,56 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage
-{
-    public abstract class AbstractSaveToWord
-    {
-        public void CreateDoc(WordInfo info)
-        {
-            CreateWord(info);
-
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            foreach (var canned in info.Canneds)
-            {
-                CreateParagraph(new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> {
-                        (canned.CannedName + ' ', new WordTextProperties { Size = "24", Bold = true }),
-                        (canned.Price.ToString(), new WordTextProperties { Size = "24" })
-                    },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "24",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
-            SaveWord(info);
-        }
-        /// <summary>
-        /// Создание doc-файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void CreateWord(WordInfo info);
-        /// <summary>
-        /// Создание абзаца с текстом
-        /// </summary>
-        /// <param name="paragraph"></param>
-        /// <returns></returns>
-        protected abstract void CreateParagraph(WordParagraph paragraph);
-        /// <summary>
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void SaveWord(WordInfo info);
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum ExcelStyleInfoType
-    {
-        Title,
-        Text,
-        TextWithBroder
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum PdfParagraphAlignmentType
-    {
-        Center,
-        Left,
-        Rigth
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs

@@ -1,8 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperEnums
-{
-    public enum WordJustificationType
-    {
-        Center,
-        Both
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs

@@ -1,13 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelCellParameters
-    {
-        public string ColumnName { get; set; } = string.Empty;
-        public uint RowIndex { get; set; }
-        public string Text { get; set; } = string.Empty;
-        public string CellReference => $"{ColumnName}{RowIndex}";
-        public ExcelStyleInfoType StyleInfo { get; set; }
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -1,16 +0,0 @@
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ReportCannedComponentViewModel> CannedComponents
-        {
-            get;
-            set;
-        } = new();
-
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelMergeParameters
-    {
-        public string CellFromName { get; set; } = string.Empty;
-        public string CellToName { get; set; } = string.Empty;
-        public string Merge => $"{CellFromName}:{CellToName}";
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -1,13 +0,0 @@
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public DateTime DateFrom { get; set; }
-        public DateTime DateTo { get; set; }
-        public List<ReportOrdersViewModel> Orders { get; set; } = new();
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs

@@ -1,11 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfParagraph
-    {
-        public string Text { get; set; } = string.Empty;
-        public string Style { get; set; } = string.Empty;
-        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs

@@ -1,11 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfRowParameters
-    {
-        public List<string> Texts { get; set; } = new();
-        public string Style { get; set; } = string.Empty;
-        public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -1,11 +0,0 @@
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<CannedViewModel> Canneds { get; set; } = new();
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordParagraph
-    {
-        public List<(string, WordTextProperties)> Texts { get; set; } = new();
-        public WordTextProperties? TextProperties { get; set; }
-
-    }
-}

FishFactoryBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs

@@ -1,11 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-
-namespace FishFactoryBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordTextProperties
-    {
-        public string Size { get; set; } = string.Empty;
-        public bool Bold { get; set; }
-        public WordJustificationType JustificationType { get; set; }
-    }
-}

FishFactoryBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -1,332 +0,0 @@
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Office2013.Excel;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml;
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-
-namespace FishFactoryBusinessLogic.OfficePackage.Implements
-{
-    public class SaveToExcel : AbstractSaveToExcel
-    {
-        private SpreadsheetDocument? _spreadsheetDocument;
-        private SharedStringTablePart? _shareStringPart;
-        private Worksheet? _worksheet;
-        /// <summary>
-        /// Настройка стилей для файла
-        /// </summary>
-        /// <param name="workbookpart"></param>
-        private static void CreateStyles(WorkbookPart workbookpart)
-        {
-            var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
-            sp.Stylesheet = new Stylesheet();
-
-            var fonts = new Fonts() { Count = 2U, KnownFonts = true };
-
-            var fontUsual = new Font();
-            fontUsual.Append(new FontSize() { Val = 12D });
-            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Theme = 1U });
-            fontUsual.Append(new FontName() { Val = "Times New Roman" });
-            fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
-            fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
-            var fontTitle = new Font();
-            fontTitle.Append(new Bold());
-            fontTitle.Append(new FontSize() { Val = 14D });
-            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Theme = 1U });
-            fontTitle.Append(new FontName() { Val = "Times New Roman" });
-            fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
-            fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
-            fonts.Append(fontUsual);
-            fonts.Append(fontTitle);
-
-            var fills = new Fills() { Count = 2U };
-            var fill1 = new Fill();
-            fill1.Append(new PatternFill() { PatternType = PatternValues.None });
-            var fill2 = new Fill();
-            fill2.Append(new PatternFill()
-            {
-                PatternType = PatternValues.Gray125
-            });
-            fills.Append(fill1);
-            fills.Append(fill2);
-
-            var borders = new Borders() { Count = 2U };
-            var borderNoBorder = new Border();
-            borderNoBorder.Append(new LeftBorder());
-            borderNoBorder.Append(new RightBorder());
-            borderNoBorder.Append(new TopBorder());
-            borderNoBorder.Append(new BottomBorder());
-            borderNoBorder.Append(new DiagonalBorder());
-            var borderThin = new Border();
-            var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
-            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Indexed = 64U });
-            var rightBorder = new RightBorder()
-            {
-                Style = BorderStyleValues.Thin
-            };
-            rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Indexed = 64U });
-            var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
-            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Indexed = 64U });
-            var bottomBorder = new BottomBorder()
-            {
-                Style = BorderStyleValues.Thin
-            };
-            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
-            { Indexed = 64U });
-            borderThin.Append(leftBorder);
-            borderThin.Append(rightBorder);
-            borderThin.Append(topBorder);
-            borderThin.Append(bottomBorder);
-            borderThin.Append(new DiagonalBorder());
-            borders.Append(borderNoBorder);
-            borders.Append(borderThin);
-
-            var cellStyleFormats = new CellStyleFormats() { Count = 1U };
-            var cellFormatStyle = new CellFormat()
-            {
-                NumberFormatId = 0U,
-                FontId = 0U,
-                FillId = 0U,
-                BorderId = 0U
-            };
-            cellStyleFormats.Append(cellFormatStyle);
-            var cellFormats = new CellFormats() { Count = 3U };
-            var cellFormatFont = new CellFormat()
-            {
-                NumberFormatId = 0U,
-                FontId = 0U,
-                FillId = 0U,
-                BorderId = 0U,
-                FormatId = 0U,
-                ApplyFont = true
-            };
-            var cellFormatFontAndBorder = new CellFormat()
-            {
-                NumberFormatId = 0U,
-                FontId = 0U,
-                FillId = 0U,
-                BorderId = 1U,
-                FormatId = 0U,
-                ApplyFont = true,
-                ApplyBorder = true
-            };
-            var cellFormatTitle = new CellFormat()
-            {
-                NumberFormatId = 0U,
-                FontId = 1U,
-                FillId = 0U,
-                BorderId = 0U,
-                FormatId = 0U,
-                Alignment = new Alignment()
-                {
-                    Vertical = VerticalAlignmentValues.Center,
-                    WrapText = true,
-                    Horizontal = HorizontalAlignmentValues.Center
-                },
-                ApplyFont = true
-            };
-            cellFormats.Append(cellFormatFont);
-            cellFormats.Append(cellFormatFontAndBorder);
-            cellFormats.Append(cellFormatTitle);
-            var cellStyles = new CellStyles() { Count = 1U };
-            cellStyles.Append(new CellStyle()
-            {
-                Name = "Normal",
-                FormatId = 0U,
-                BuiltinId = 0U
-            });
-
-            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats()
-            { Count = 0U };
-
-            var tableStyles = new TableStyles()
-            {
-                Count = 0U,
-                DefaultTableStyle = "TableStyleMedium2",
-                DefaultPivotStyle = "PivotStyleLight16"
-            };
-            var stylesheetExtensionList = new StylesheetExtensionList();
-            var stylesheetExtension1 = new StylesheetExtension()
-            {
-                Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
-            };
-            stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
-            stylesheetExtension1.Append(new SlicerStyles()
-            {
-                DefaultSlicerStyle = "SlicerStyleLight1"
-            });
-            var stylesheetExtension2 = new StylesheetExtension()
-            {
-                Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}"
-            };
-            stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
-            stylesheetExtension2.Append(new TimelineStyles()
-            {
-                DefaultTimelineStyle = "TimeSlicerStyleLight1"
-            });
-            stylesheetExtensionList.Append(stylesheetExtension1);
-            stylesheetExtensionList.Append(stylesheetExtension2);
-            sp.Stylesheet.Append(fonts);
-            sp.Stylesheet.Append(fills);
-            sp.Stylesheet.Append(borders);
-            sp.Stylesheet.Append(cellStyleFormats);
-            sp.Stylesheet.Append(cellFormats);
-            sp.Stylesheet.Append(cellStyles);
-            sp.Stylesheet.Append(differentialFormats);
-            sp.Stylesheet.Append(tableStyles);
-            sp.Stylesheet.Append(stylesheetExtensionList);
-        }
-        /// <summary>
-        /// Получение номера стиля из типа
-        /// </summary>
-        /// <param name="styleInfo"></param>
-        /// <returns></returns>
-        private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
-        {
-            return styleInfo switch
-            {
-                ExcelStyleInfoType.Title => 2U,
-                ExcelStyleInfoType.TextWithBroder => 1U,
-                ExcelStyleInfoType.Text => 0U,
-                _ => 0U,
-            };
-        }
-        protected override void CreateExcel(ExcelInfo info)
-        {
-            _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
-            // Создаем книгу (в ней хранятся листы)
-            var workbookpart = _spreadsheetDocument.AddWorkbookPart();
-            workbookpart.Workbook = new Workbook();
-            CreateStyles(workbookpart);
-            // Получаем/создаем хранилище текстов для книги
-            _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
-            ?
-           _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
-            :
-           _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
-            // Создаем SharedStringTable, если его нет
-            if (_shareStringPart.SharedStringTable == null)
-            {
-                _shareStringPart.SharedStringTable = new SharedStringTable();
-            }
-            // Создаем лист в книгу
-            var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
-            worksheetPart.Worksheet = new Worksheet(new SheetData());
-            // Добавляем лист в книгу
-            var sheets =
-           _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
-            var sheet = new Sheet()
-            {
-                Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
-                SheetId = 1,
-                Name = "Лист"
-            };
-            sheets.Append(sheet);
-            _worksheet = worksheetPart.Worksheet;
-        }
-        protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
-        {
-            if (_worksheet == null || _shareStringPart == null)
-            {
-                return;
-            }
-            var sheetData = _worksheet.GetFirstChild<SheetData>();
-            if (sheetData == null)
-            {
-                return;
-            }
-            // Ищем строку, либо добавляем ее
-            Row row;
-            if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
-            {
-                row = sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).First();
-            }
-            else
-            {
-                row = new Row() { RowIndex = excelParams.RowIndex };
-                sheetData.Append(row);
-            }
-            // Ищем нужную ячейку
-            Cell cell;
-            if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
-            {
-                cell = row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
-            }
-            else
-            {
-                // Все ячейки должны быть последовательно друг за другом расположены
-                // нужно определить, после какой вставлять
-                 Cell? refCell = null;
-                foreach (Cell rowCell in row.Elements<Cell>())
-                {
-                    if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
-                    {
-                        refCell = rowCell;
-                        break;
-                    }
-                }
-                var newCell = new Cell()
-                {
-                    CellReference =
-               excelParams.CellReference
-                };
-                row.InsertBefore(newCell, refCell);
-                cell = newCell;
-            }
-            // вставляем новый текст
-            _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
-            _shareStringPart.SharedStringTable.Save();
-            cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
-            cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
-            cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
-        }
-        protected override void MergeCells(ExcelMergeParameters excelParams)
-        {
-            if (_worksheet == null)
-            {
-                return;
-            }
-            MergeCells mergeCells;
-            if (_worksheet.Elements<MergeCells>().Any())
-            {
-                mergeCells = _worksheet.Elements<MergeCells>().First();
-            }
-            else
-            {
-                mergeCells = new MergeCells();
-                if (_worksheet.Elements<CustomSheetView>().Any())
-                {
-                    _worksheet.InsertAfter(mergeCells,
-                   _worksheet.Elements<CustomSheetView>().First());
-                }
-                else
-                {
-                    _worksheet.InsertAfter(mergeCells,
-                   _worksheet.Elements<SheetData>().First());
-                }
-            }
-            var mergeCell = new MergeCell()
-            {
-                Reference = new StringValue(excelParams.Merge)
-            };
-            mergeCells.Append(mergeCell);
-        }
-        protected override void SaveExcel(ExcelInfo info)
-        {
-            if (_spreadsheetDocument == null)
-            {
-                return;
-            }
-            _spreadsheetDocument.WorkbookPart!.Workbook.Save();
-            _spreadsheetDocument.Close();
-        }
-    }
-}

FishFactoryBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -1,99 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-using MigraDoc.DocumentObjectModel;
-using MigraDoc.DocumentObjectModel.Tables;
-using MigraDoc.Rendering;
-
-namespace FishFactoryBusinessLogic.OfficePackage.Implements
-{
-    public class SaveToPdf : AbstractSaveToPdf
-    {
-        private Document? _document;
-        private Section? _section;
-        private Table? _table;
-        private static ParagraphAlignment
-       GetParagraphAlignment(PdfParagraphAlignmentType type)
-        {
-            return type switch
-            {
-                PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
-                PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
-                PdfParagraphAlignmentType.Rigth => ParagraphAlignment.Right,
-                _ => ParagraphAlignment.Justify,
-            };
-        }
-        /// <summary>
-        /// Создание стилей для документа
-        /// </summary>
-        /// <param name="document"></param>
-        private static void DefineStyles(Document document)
-        {
-            var style = document.Styles["Normal"];
-            style.Font.Name = "Times New Roman";
-            style.Font.Size = 14;
-            style = document.Styles.AddStyle("NormalTitle", "Normal");
-            style.Font.Bold = true;
-        }
-        protected override void CreatePdf(PdfInfo info)
-        {
-            _document = new Document();
-            DefineStyles(_document);
-            _section = _document.AddSection();
-        }
-        protected override void CreateParagraph(PdfParagraph pdfParagraph)
-        {
-            if (_section == null)
-            {
-                return;
-            }
-            var paragraph = _section.AddParagraph(pdfParagraph.Text);
-            paragraph.Format.SpaceAfter = "1cm";
-            paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
-            paragraph.Style = pdfParagraph.Style;
-        }
-        protected override void CreateTable(List<string> columns)
-        {
-            if (_document == null)
-            {
-                return;
-            }
-            _table = _document.LastSection.AddTable();
-            foreach (var elem in columns)
-            {
-                _table.AddColumn(elem);
-            }
-        }
-        protected override void CreateRow(PdfRowParameters rowParameters)
-        {
-            if (_table == null)
-            {
-                return;
-            }
-            var row = _table.AddRow();
-            for (int i = 0; i < rowParameters.Texts.Count; ++i)
-            {
-                row.Cells[i].AddParagraph(rowParameters.Texts[i]);
-                if (!string.IsNullOrEmpty(rowParameters.Style))
-                {
-                    row.Cells[i].Style = rowParameters.Style;
-                }
-                Unit borderWidth = 0.5;
-                row.Cells[i].Borders.Left.Width = borderWidth;
-                row.Cells[i].Borders.Right.Width = borderWidth;
-                row.Cells[i].Borders.Top.Width = borderWidth;
-                row.Cells[i].Borders.Bottom.Width = borderWidth;
-                row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
-                row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
-            }
-        }
-        protected override void SavePdf(PdfInfo info)
-        {
-            var renderer = new PdfDocumentRenderer(true)
-            {
-                Document = _document
-            };
-            renderer.RenderDocument();
-            renderer.PdfDocument.Save(info.FileName);
-        }
-    }
-}

FishFactoryBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -1,121 +0,0 @@
-using FishFactoryBusinessLogic.OfficePackage.HelperModels;
-using FishFactoryBusinessLogic.OfficePackage.HelperEnums;
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-
-namespace FishFactoryBusinessLogic.OfficePackage.Implements
-{
-    public class SaveToWord : AbstractSaveToWord
-    {
-        private WordprocessingDocument? _wordDocument;
-        private Body? _docBody;
-
-        /// <summary>
-        /// Получение типа выравнивания
-        /// </summary>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        private static JustificationValues
-       GetJustificationValues(WordJustificationType type)
-        {
-            return type switch
-            {
-                WordJustificationType.Both => JustificationValues.Both,
-                WordJustificationType.Center => JustificationValues.Center,
-                _ => JustificationValues.Left,
-            };
-        }
-        /// <summary>
-        /// Настройки страницы
-        /// </summary>
-        /// <returns></returns>
-        private static SectionProperties CreateSectionProperties()
-        {
-            var properties = new SectionProperties();
-            var pageSize = new PageSize
-            {
-                Orient = PageOrientationValues.Portrait
-            };
-            properties.AppendChild(pageSize);
-            return properties;
-        }
-        /// <summary>
-        /// Задание форматирования для абзаца
-        /// </summary>
-        /// <param name="paragraphProperties"></param>
-        /// <returns></returns>
-        private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
-        {
-            if (paragraphProperties == null)
-            {
-                return null;
-            }
-            var properties = new ParagraphProperties();
-            properties.AppendChild(new Justification()
-            {
-                Val = GetJustificationValues(paragraphProperties.JustificationType)
-            });
-            properties.AppendChild(new SpacingBetweenLines
-            {
-                LineRule = LineSpacingRuleValues.Auto
-            });
-            properties.AppendChild(new Indentation());
-            var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
-            if (!string.IsNullOrEmpty(paragraphProperties.Size))
-            {
-                paragraphMarkRunProperties.AppendChild(new FontSize
-                {
-                    Val = paragraphProperties.Size
-                });
-            }
-            properties.AppendChild(paragraphMarkRunProperties);
-            return properties;
-        }
-        protected override void CreateWord(WordInfo info)
-        {
-            _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
-            MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
-            mainPart.Document = new Document();
-            _docBody = mainPart.Document.AppendChild(new Body());
-        }
-        protected override void CreateParagraph(WordParagraph paragraph)
-        {
-            if (_docBody == null || paragraph == null)
-            {
-                return;
-            }
-            var docParagraph = new Paragraph();
-
-            docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
-            foreach (var run in paragraph.Texts)
-            {
-                var docRun = new Run();
-                var properties = new RunProperties();
-                properties.AppendChild(new FontSize { Val = run.Item2.Size });
-                if (run.Item2.Bold)
-                {
-                    properties.AppendChild(new Bold());
-                }
-                docRun.AppendChild(properties);
-                docRun.AppendChild(new Text
-                {
-                    Text = run.Item1,
-                    Space = SpaceProcessingModeValues.Preserve
-                });
-                docParagraph.AppendChild(docRun);
-            }
-            _docBody.AppendChild(docParagraph);
-        }
-        protected override void SaveWord(WordInfo info)
-        {
-            if (_docBody == null || _wordDocument == null)
-            {
-                return;
-            }
-            _docBody.AppendChild(CreateSectionProperties());
-            _wordDocument.MainDocumentPart!.Document.Save();
-            _wordDocument.Close();
-        }
-    }
-}

FishFactoryContracts/BindingModels/ReplenishBindingModel.cs

@@ -0,0 +1,11 @@
+using FishFactoryDataModel.Models;
+
+namespace FishFactoryContracts.BindingModels
+{
+    public class ReplenishBindingModel : IReplenishModel
+    {
+        public int ShopId { get; set; }
+        public int CannedId { get; set; }
+        public int Count { get; set; }
+    }
+}

FishFactoryContracts/BindingModels/ReportBindingModel.cs

@@ -1,10 +0,0 @@
-namespace FishFactoryContracts.BindingModels
-{
-    public class ReportBindingModel
-    {
-        public string FileName { get; set; } = string.Empty;
-        public DateTime? DateFrom { get; set; }
-        public DateTime? DateTo { get; set; }
-
-    }
-}

FishFactoryContracts/BindingModels/ShopBindingModel.cs

@@ -0,0 +1,14 @@
+using FishFactoryDataModel.Models;
+
+namespace FishFactoryContracts.BindingModels
+{
+    public class ShopBindingModel : IShopModel
+    {
+        public int Id { get; set; }
+        public string ShopName { get; set; } = string.Empty;
+        public string Adress { get; set; } = string.Empty;
+        public DateTime OpeningDate { get; set; } = DateTime.Now;
+        public int CapacityCanned { get; set; }
+        public Dictionary<int, (ICannedModel, int)> ShopCanneds { get; set; } = new();
+    }
+}

FishFactoryContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -1,35 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.BusinessLogicsContracts
-{
-    public interface IReportLogic
-    {
-        /// <summary>
-        /// Получение списка компонент с указанием, в каких изделиях используются
-        /// </summary>
-        /// <returns></returns>
-        List<ReportCannedComponentViewModel> GetCannedComponent();
-        /// <summary>
-        /// Получение списка заказов за определенный период
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
-        /// <summary>
-        /// Сохранение компонент в файл-Word
-        /// </summary>
-        /// <param name="model"></param>
-        void SaveCannedsToWordFile(ReportBindingModel model);
-        /// <summary>
-        /// Сохранение компонент с указаеним продуктов в файл-Excel
-        /// </summary>
-        /// <param name="model"></param>
-        void SaveCannedComponentToExcelFile(ReportBindingModel model);
-        /// <summary>
-        /// Сохранение заказов в файл-Pdf
-        /// </summary>
-        /// <param name="model"></param>
-        void SaveOrdersToPdfFile(ReportBindingModel model);
-    }
-}

FishFactoryContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -0,0 +1,17 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.ViewModels;
+
+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 Sale(ReplenishSearchModel model);
+        bool Replenish(ReplenishBindingModel model);
+    }
+}

FishFactoryContracts/SearchModels/OrderSearchModel.cs

@@ -3,7 +3,5 @@
     public class OrderSearchModel
     {
         public int? Id { get; set; }
-        public DateTime? DateFrom { get; set; }
-        public DateTime? DateTo { get; set; }
     }
 }

FishFactoryContracts/SearchModels/ReplenishSearchModel.cs

@@ -0,0 +1,8 @@
+namespace FishFactoryContracts.SearchModels
+{
+    public class ReplenishSearchModel
+    {
+        public int? CannedId { get; set; }
+        public int? Count { get; set; }
+    }
+}

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; }
+    }
+}

FishFactoryContracts/StoragesContracts/IOrderStorage.cs

@@ -1,6 +1,11 @@
 using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace FishFactoryContracts.StoragesContracts
 {

FishFactoryContracts/StoragesContracts/IShopStorage.cs

@@ -0,0 +1,18 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.ViewModels;
+
+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 Sale(ReplenishSearchModel model);
+        bool ReplenishShops(ReplenishBindingModel model);
+    }
+}

FishFactoryContracts/ViewModels/ReportCannedComponentViewModel.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryContracts.ViewModels
-{
-    public class ReportCannedComponentViewModel
-    {
-        public string CannedName { get; set; } = string.Empty;
-        public int TotalCount { get; set; }
-        public List<(string Component, int Count)> Components { get; set; } = new();
-    }
-}

FishFactoryContracts/ViewModels/ReportOrdersViewModel.cs

@@ -1,13 +0,0 @@
-
-namespace FishFactoryContracts.ViewModels
-{
-    public class ReportOrdersViewModel
-    {
-        public int Id { get; set; }
-        public DateTime DateCreate { get; set; }
-        public string CannedName { get; set; } = string.Empty;
-        public string Status { get; set; } = string.Empty;
-        public double Sum { get; set; }
-
-    }
-}

FishFactoryContracts/ViewModels/ShopViewModel.cs

@@ -0,0 +1,20 @@
+using FishFactoryDataModel.Models;
+using System.ComponentModel;
+
+namespace FishFactoryContracts.ViewModels
+{
+    public class ShopViewModel
+    {
+        public int Id { get; set; }
+        [DisplayName("Название")]
+        public string ShopName { get; set; } = string.Empty;
+        [DisplayName("Адрес")]
+        public string Adress { get; set; } = string.Empty;
+
+        [DisplayName("Вместимость")]
+        public int CapacityCanned { get; set; }
+        [DisplayName("Дата открытия")]
+        public DateTime OpeningDate { get; set; }
+        public Dictionary<int, (ICannedModel, int)> ShopCanneds { get; set; } = new();
+    }
+}

FishFactoryDataModels/FishFactoryDataModel.csproj

@@ -7,8 +7,4 @@
     <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </ItemGroup>
-
 </Project>

FishFactoryDataModels/Models/IReplenishModel.cs

@@ -0,0 +1,9 @@
+namespace FishFactoryDataModel.Models
+{
+    public interface IReplenishModel
+    {
+        int ShopId {  get; }
+        int CannedId {  get; }
+        int Count { get; }
+    }
+}

FishFactoryDataModels/Models/IShopModel.cs

@@ -0,0 +1,11 @@
+namespace FishFactoryDataModel.Models
+{
+    public interface IShopModel : IId
+    {
+        string ShopName { get; }
+        string Adress {  get; }
+        DateTime OpeningDate {  get; }
+        int CapacityCanned { get; }
+        Dictionary<int, (ICannedModel, int)> ShopCanneds { get; }
+    }
+}

FishFactoryDatabaseImplement/FishFactoryDatabase.cs

@@ -1,23 +0,0 @@
-using FishFactoryDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace FishFactoryDatabaseImplement
-{
-    public class FishFactoryDatabase : DbContext
-    {
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            if (optionsBuilder.IsConfigured == false)
-            {
-                optionsBuilder.UseNpgsql(@"Host=localhost;Database=FishFactory2;Username=postgres;Password=postgres");
-            }
-            base.OnConfiguring(optionsBuilder);
-            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
-            AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
-        }
-        public virtual DbSet<Component> Components { set; get; }
-        public virtual DbSet<Canned> Canneds { set; get; }
-        public virtual DbSet<CannedComponent> CannedComponents { set; get; }
-        public virtual DbSet<Order> Orders { set; get; }
-    }
-}

FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.16">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="netcore-psql-util" Version="1.2.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FishFactoryContracts\FishFactoryContracts.csproj" />
-    <ProjectReference Include="..\FishFactoryDataModels\FishFactoryDataModel.csproj" />
-  </ItemGroup>
-
-</Project>

FishFactoryDatabaseImplement/Implements/CannedStorage.cs

@@ -1,101 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class CannedStorage : ICannedStorage
-    {
-        public List<CannedViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.Canneds
-                .Include(x => x.Components)
-                .ThenInclude(x => x.Component)
-                .ToList()
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public List<CannedViewModel> GetFilteredList(CannedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.CannedName))
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Canneds
-                .Include(x => x.Components)
-                .ThenInclude(x => x.Component)
-                .Where(x => x.CannedName.Contains(model.CannedName))
-                .ToList()
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public CannedViewModel? GetElement(CannedSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.CannedName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Canneds
-                .Include(x => x.Components)
-                .ThenInclude(x => x.Component)
-                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.CannedName) && x.CannedName == model.CannedName) ||
-                (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
-        }
-        public CannedViewModel? Insert(CannedBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var newCanned = Canned.Create(context, model);
-            if (newCanned == null)
-            {
-                return null;
-            }
-            context.Canneds.Add(newCanned);
-            context.SaveChanges();
-            return newCanned.GetViewModel;
-        }
-        public CannedViewModel? Update(CannedBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            using var transaction = context.Database.BeginTransaction();
-            try
-            {
-                var Canned = context.Canneds.FirstOrDefault(rec => rec.Id == model.Id);
-                if (Canned == null)
-                {
-                    return null;
-                }
-                Canned.Update(model);
-                context.SaveChanges();
-                Canned.UpdateComponents(context, model);
-                transaction.Commit();
-                return Canned.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-        public CannedViewModel? Delete(CannedBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var element = context.Canneds
-                .Include(x => x.Components)
-                .FirstOrDefault(rec => rec.Id == model.Id);
-            if (element != null)
-            {
-                context.Canneds.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactoryDatabaseImplement/Implements/ComponentStorage.cs

@@ -1,76 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement.Models;
-
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class ComponentStorage : IComponentStorage
-    {
-        public List<ComponentViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.Components
-                .Select(x => x.GetViewModel).ToList();
-        }
-        public List<ComponentViewModel> GetFilteredList(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName))
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Components
-                .Where(x => x.ComponentName.Contains(model.ComponentName))
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public ComponentViewModel? GetElement(ComponentSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Components
-                .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-        public ComponentViewModel? Insert(ComponentBindingModel model)
-        {
-            var newComponent = Component.Create(model);
-            if (newComponent == null)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            context.Components.Add(newComponent);
-            context.SaveChanges();
-            return newComponent.GetViewModel;
-        }
-        public ComponentViewModel? Update(ComponentBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var component = context.Components.FirstOrDefault(x => x.Id == model.Id);
-            if (component == null)
-            {
-                return null;
-            }
-            component.Update(model);
-            context.SaveChanges();
-            return component.GetViewModel;
-        }
-        public ComponentViewModel? Delete(ComponentBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var element = context.Components.FirstOrDefault(rec => rec.Id == model.Id);
-            if (element != null)
-            {
-                context.Components.Remove(element);
-                context.SaveChanges();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactoryDatabaseImplement/Implements/OrderStorage.cs

@@ -1,84 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class OrderStorage : IOrderStorage
-    {
-        public List<OrderViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.Orders
-                .Include(x => x.Canned)
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Orders
-                .Include(x => x.Canned)
-                .Where(x => x.Id == model.Id)
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public OrderViewModel? GetElement(OrderSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.Orders
-                .Include(x => x.Canned)
-                .FirstOrDefault(x => x.Id == model.Id)
-                ?.GetViewModel;
-        }
-        public OrderViewModel? Insert(OrderBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            if (model == null)
-                return null;
-            var newOrder = Order.Create(context, model);
-            if (newOrder == null)
-            {
-                return null;
-            }
-            context.Orders.Add(newOrder);
-            context.SaveChanges();
-            return newOrder.GetViewModel;
-        }
-        public OrderViewModel? Update(OrderBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
-            if (order == null)
-            {
-                return null;
-            }
-            order.Update(model);
-            context.SaveChanges();
-            return order.GetViewModel;
-        }
-        public OrderViewModel? Delete(OrderBindingModel model)
-        {
-            using var context = new FishFactoryDatabase();
-            var order = context.Orders.FirstOrDefault(rec => rec.Id == model.Id);
-            if (order != null)
-            {
-                context.Orders.Remove(order);
-                context.SaveChanges();
-                return order.GetViewModel;
-            }
-            return null;
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/20240320065127_InitialCreate.Designer.cs

@@ -1,171 +0,0 @@
-// <auto-generated />
-using System;
-using FishFactoryDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    [DbContext(typeof(FishFactoryDatabase))]
-    [Migration("20240320065127_InitialCreate")]
-    partial class InitialCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("CannedVersion", "7.0.16")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("CannedName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Canneds");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ComponentId");
-
-                    b.ToTable("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("integer");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Components")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
-                        .WithMany("CannedComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Component");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Orders")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("CannedComponents");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/20240320065127_InitialCreate.cs

@@ -1,126 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitialCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Canneds",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    CannedName = table.Column<string>(type: "text", nullable: false),
-                    Price = table.Column<double>(type: "double precision", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Canneds", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Components",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ComponentName = table.Column<string>(type: "text", nullable: false),
-                    Cost = table.Column<double>(type: "double precision", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Components", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Orders",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    CannedId = table.Column<int>(type: "integer", nullable: false),
-                    Count = table.Column<int>(type: "integer", nullable: false),
-                    Sum = table.Column<double>(type: "double precision", nullable: false),
-                    Status = table.Column<int>(type: "integer", nullable: false),
-                    DateCreate = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "timestamp without time zone", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Orders", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Orders_Canneds_CannedId",
-                        column: x => x.CannedId,
-                        principalTable: "Canneds",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "CannedComponents",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    CannedId = table.Column<int>(type: "integer", nullable: false),
-                    ComponentId = table.Column<int>(type: "integer", nullable: false),
-                    Count = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CannedComponents", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_CannedComponents_Canneds_CannedId",
-                        column: x => x.CannedId,
-                        principalTable: "Canneds",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_CannedComponents_Components_ComponentId",
-                        column: x => x.ComponentId,
-                        principalTable: "Components",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CannedComponents_CannedId",
-                table: "CannedComponents",
-                column: "CannedId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CannedComponents_ComponentId",
-                table: "CannedComponents",
-                column: "ComponentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_CannedId",
-                table: "Orders",
-                column: "CannedId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "CannedComponents");
-
-            migrationBuilder.DropTable(
-                name: "Orders");
-
-            migrationBuilder.DropTable(
-                name: "Components");
-
-            migrationBuilder.DropTable(
-                name: "Canneds");
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs

@@ -1,168 +0,0 @@
-// <auto-generated />
-using System;
-using FishFactoryDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    [DbContext(typeof(FishFactoryDatabase))]
-    partial class FishFactoryDatabaseModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("CannedVersion", "7.0.16")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("CannedName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Canneds");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ComponentId");
-
-                    b.ToTable("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("integer");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Components")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
-                        .WithMany("CannedComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Component");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Orders")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("CannedComponents");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

FishFactoryDatabaseImplement/Models/Canned.cs

@@ -1,88 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModel.Models;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class Canned : ICannedModel
-    {
-        public int Id { get; set; }
-        [Required]
-        public string CannedName { get; set; } = string.Empty;
-        [Required]
-        public double Price { get; set; }
-        private Dictionary<int, (IComponentModel, int)>? _cannedComponents = null;
-        [NotMapped]
-        public Dictionary<int, (IComponentModel, int)> CannedComponents
-        {
-            get
-            {
-                if (_cannedComponents == null)
-                {
-                    _cannedComponents = Components.ToDictionary(recPC => recPC.ComponentId, recPC => (recPC.Component as IComponentModel, recPC.Count));
-                }
-                return _cannedComponents;
-            }
-        }
-        [ForeignKey("CannedId")]
-        public virtual List<CannedComponent> Components { get; set; } = new();
-        [ForeignKey("CannedId")]
-        public virtual List<Order> Orders { get; set; } = new();
-        public static Canned Create(FishFactoryDatabase context, CannedBindingModel model)
-        {
-            return new Canned()
-            {
-                Id = model.Id,
-                CannedName = model.CannedName,
-                Price = model.Price,
-                Components = model.CannedComponents.Select(x => new CannedComponent
-                {
-                    Component = context.Components.First(y => y.Id == x.Key),
-                    Count = x.Value.Item2
-                }).ToList()
-            };
-        }
-        public void Update(CannedBindingModel model)
-        {
-            CannedName = model.CannedName;
-            Price = model.Price;
-        }
-        public CannedViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CannedName = CannedName,
-            Price = Price,
-            CannedComponents = CannedComponents
-        };
-        public void UpdateComponents(FishFactoryDatabase context, CannedBindingModel model)
-        {
-            var cannedComponents = context.CannedComponents.Where(rec => rec.CannedId == model.Id).ToList();
-            if (cannedComponents != null && cannedComponents.Count > 0)
-            { // удалили те, которых нет в модели
-                context.CannedComponents.RemoveRange(cannedComponents.Where(rec => !model.CannedComponents.ContainsKey(rec.ComponentId)));
-                context.SaveChanges();
-                // обновили количество у существующих записей
-                foreach (var updateComponent in cannedComponents)
-                {
-                    updateComponent.Count = model.CannedComponents[updateComponent.ComponentId].Item2;
-                    model.CannedComponents.Remove(updateComponent.ComponentId);
-                }
-                context.SaveChanges();
-            }
-            var canned = context.Canneds.First(x => x.Id == Id);
-            foreach (var pc in model.CannedComponents)
-            {
-                context.CannedComponents.Add(new CannedComponent
-                {
-                    Canned = canned,
-                    Component = context.Components.First(x => x.Id == pc.Key),
-                    Count = pc.Value.Item2
-                });
-                context.SaveChanges();
-            }
-            _cannedComponents = null;
-        }
-    }
-}

FishFactoryDatabaseImplement/Models/CannedComponent.cs

@@ -1,17 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class CannedComponent
-    {
-        public int Id { get; set; }
-        [Required]
-        public int CannedId { get; set; }
-        [Required]
-        public int ComponentId { get; set; }
-        [Required]
-        public int Count { get; set; }
-        public virtual Component Component { get; set; } = new();
-        public virtual Canned Canned { get; set; } = new();
-    }
-}

FishFactoryDatabaseImplement/Models/Component.cs

@@ -1,56 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModel.Models;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class Component : IComponentModel
-    {
-        public int Id { get; private set; }
-        [Required]
-        public string ComponentName { get; private set; } = string.Empty;
-        [Required]
-        public double Cost { get; set; }
-        [ForeignKey("ComponentId")]
-        public virtual List<CannedComponent> CannedComponents { get; set; } = new();
-        public static Component? Create(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Component()
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-        public static Component Create(ComponentViewModel model)
-        {
-            return new Component
-            {
-                Id = model.Id,
-                ComponentName = model.ComponentName,
-                Cost = model.Cost
-            };
-        }
-        public void Update(ComponentBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ComponentName = model.ComponentName;
-            Cost = model.Cost;
-        }
-        public ComponentViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ComponentName = ComponentName,
-            Cost = Cost
-        };
-    }
-}

FishFactoryDatabaseImplement/Models/Order.cs

@@ -1,64 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using FishFactoryDataModel.Enums;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModel.Models;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class Order : IOrderModel
-    {
-        public int Id { get; private set; }
-        [Required]
-        public int CannedId { get; private set; }
-        public virtual Canned Canned { get; set; } = new();
-        [Required]
-        public int Count { get; private set; }
-        [Required]
-        public double Sum { get; private set; }
-        [Required]
-        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-        [Required]
-        public DateTime DateCreate { get; private set; } = DateTime.Now;
-        public DateTime? DateImplement { get; private set; }
-        public static Order Create (FishFactoryDatabase context, OrderBindingModel model)
-        {
-            return new Order()
-            {
-                Id = model.Id,
-                CannedId = model.CannedId,
-                Canned = context.Canneds.First(x => x.Id == model.CannedId),
-                Count = model.Count,
-                Sum = model.Sum,
-                Status = model.Status,
-                DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
-            };
-        }
-        public void Update(OrderBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Id = model.Id;
-            CannedId = model.CannedId;
-            Sum = model.Sum;
-            Status = model.Status;
-            DateCreate = model.DateCreate;
-            DateImplement = model.DateImplement;
-        }
-        public OrderViewModel GetViewModel => new()
-        {
-            Id = Id,
-            CannedId = CannedId,
-            CannedName = Canned.CannedName,
-            Count = Count,
-            Sum = Sum,
-            Status = Status,
-            DateCreate = DateCreate,
-            DateImplement = DateImplement,
-        };
-    }
-}

FishFactoryFileImplement/DataFileSingleton.cs

@@ -10,9 +10,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)
@@ -24,11 +26,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)
         {

FishFactoryFileImplement/Implements/OrderStorage.cs

@@ -3,7 +3,6 @@ using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.StoragesContracts;
 using FishFactoryContracts.ViewModels;
 using FishFactoryFileImplement.Models;
-using System.Reflection;
 using System.Xml.Linq;
 
 namespace FishFactoryFileImplement.Implements
@@ -19,15 +18,15 @@ namespace FishFactoryFileImplement.Implements
 
         public List<OrderViewModel> GetFullList()
         {
-            return _source.Orders.Select(x => AttachCannedName(x.GetViewModel)).ToList();
+            return _source.Orders.Select(x => AttachCannedName(x)).ToList();
         }
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
+            if (model == null || !model.Id.HasValue)
             {
                 return new();
             }
-            return _source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => AttachCannedName(x.GetViewModel)).ToList();
+            return _source.Orders.Where(x => x.Id == model.Id).Select(x => AttachCannedName(x)).ToList();
         }
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
@@ -35,7 +34,7 @@ namespace FishFactoryFileImplement.Implements
             {
                 return null;
             }
-            return AttachCannedName(_source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
+            return AttachCannedName(_source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id));
         }
         public OrderViewModel? Insert(OrderBindingModel model)
         {
@@ -47,7 +46,7 @@ namespace FishFactoryFileImplement.Implements
             }
             _source.Orders.Add(newOrder);
             _source.SaveOrders();
-            return AttachCannedName(newOrder.GetViewModel);
+            return AttachCannedName(newOrder);
         }
         public OrderViewModel? Update(OrderBindingModel model)
         {
@@ -58,7 +57,7 @@ namespace FishFactoryFileImplement.Implements
             }
             order.Update(model);
             _source.SaveOrders();
-            return AttachCannedName(order.GetViewModel);
+            return AttachCannedName(order);
         }
         public OrderViewModel? Delete(OrderBindingModel model)
         {
@@ -69,20 +68,17 @@ namespace FishFactoryFileImplement.Implements
             }
             _source.Orders.Remove(order);
             _source.SaveOrders();
-            return AttachCannedName(order.GetViewModel);
+            return AttachCannedName(order);
         }
-        private OrderViewModel? AttachCannedName(OrderViewModel? model)
+        private OrderViewModel AttachCannedName(Order order)
         {
-            if (model == null)
-            {
-                return null;
-            }
-            var canned = _source.Canneds.FirstOrDefault(x => x.Id == model.CannedId);
+            var viewModel = order.GetViewModel;
+            var canned = _source.Canneds.FirstOrDefault(x => x.Id == order.CannedId);
             if (canned != null)
             {
-                model.CannedName = canned.CannedName;
+                viewModel.CannedName = canned.CannedName;
             }
-            return model;
+            return viewModel;
         }
     }
 }

FishFactoryFileImplement/Implements/ShopStorage.cs

@@ -0,0 +1,143 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryFileImplement.Models;
+
+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 canned = _source.Shops.FirstOrDefault(x => x.Id == model.Id);
+            if (canned == null)
+            {
+                return null;
+            }
+            canned.Update(model);
+            _source.SaveShops();
+            return canned.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 Sale(ReplenishSearchModel model)
+        {
+            if (model == null || !model.CannedId.HasValue || !model.Count.HasValue)
+                return false;
+            int totalCount = _source.Shops.Select(x => x.Canneds.ContainsKey(model.CannedId.Value) ? x.Canneds[model.CannedId.Value] : 0).Sum();
+            if (totalCount < model.Count)
+            {
+                return false;
+            }
+            var shops = _source.Shops.Where(x => x.Canneds.ContainsKey(model.CannedId.Value)).OrderByDescending(x => x.Canneds[model.CannedId.Value]).ToList();
+            foreach ( var shop in shops )
+            {
+                int remains = model.Count.Value - shop.Canneds[model.CannedId.Value];
+                if (remains > 0)
+                {
+                    shop.Canneds.Remove(model.CannedId.Value);
+                    model.Count = remains;
+                }
+                else
+                {
+                    if (remains == 0)
+                    {
+                        shop.Canneds.Remove(model.CannedId.Value);
+                    }
+                    else
+                    {
+                        shop.Canneds[model.CannedId.Value] = -remains;
+                    }
+                    shop.CannedsUpdate();
+                    _source.SaveShops();
+                    return true;
+                }
+            }
+            _source.SaveShops();
+            return false;
+        }
+
+        public bool ReplenishShops(ReplenishBindingModel model)
+        {
+            int totalFreePlace = _source.Shops.Select(x => x.CapacityCanned - x.ShopCanneds.Select(x => x.Value.Item2).Sum()).Sum();
+            if (model == null || totalFreePlace < model.Count)
+            {
+                return false;
+            }
+            foreach (var shop in _source.Shops)
+            {
+                int freePlace = shop.CapacityCanned - shop.ShopCanneds.Select(x => x.Value.Item2).Sum();
+                if (freePlace <= 0)
+                {
+                    continue;
+                }
+                freePlace = Math.Min(freePlace, model.Count);
+                model.Count -= freePlace;
+                if (shop.Canneds.ContainsKey(model.CannedId))
+                {
+                    shop.Canneds[model.CannedId] += freePlace;
+                }
+                else
+                {
+                    shop.Canneds.Add(model.CannedId, freePlace);
+                }
+                shop.CannedsUpdate();
+                if (model.Count == 0)
+                {
+                    _source.SaveShops();
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

FishFactoryFileImplement/Models/Shop.cs

@@ -0,0 +1,102 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.ViewModels;
+using FishFactoryDataModel.Models;
+using System.Xml.Linq;
+
+namespace FishFactoryFileImplement.Models
+{
+    internal class Shop : IShopModel
+    {
+        public int Id { get; private set; }
+        public string ShopName { get; private set; } = string.Empty;
+        public string Adress { get; private set; } = string.Empty;
+        public DateTime OpeningDate { get; private set; }
+        public int CapacityCanned { get; private set; }
+        public Dictionary<int, int> Canneds { get; private set; } = new();
+        private Dictionary<int, (ICannedModel, int)>? _shopCanneds = null;
+        public Dictionary<int, (ICannedModel, int)> ShopCanneds
+        {
+            get
+            {
+                if (_shopCanneds == null)
+                {
+                    var source = DataFileSingleton.GetInstance();
+                    _shopCanneds = Canneds.ToDictionary(x => x.Key,
+                        y => ((source.Canneds.FirstOrDefault(z => z.Id == y.Key) as ICannedModel)!, y.Value));
+                }
+                return _shopCanneds;
+            }
+        }
+
+        public static Shop? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Shop()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                ShopName = element.Element("ShopName")!.Value,
+                Adress = element.Element("Adress")!.Value,
+                OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
+                CapacityCanned = Convert.ToInt32(element.Element("CapacityCanned")!.Value),
+                Canneds = element.Element("ShopCanneds")!.Elements("ShopCanned")!.ToDictionary
+                (x => Convert.ToInt32(x.Element("Key")?.Value),
+                x => Convert.ToInt32(x.Element("Value")?.Value))};
+        }
+        public static Shop? Create(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Shop()
+            {
+                Id = model.Id,
+                ShopName = model.ShopName,
+                Adress = model.Adress,
+                OpeningDate = model.OpeningDate,
+                CapacityCanned = model.CapacityCanned,
+                Canneds = model.ShopCanneds.ToDictionary(x => x.Key, x => x.Value.Item2)
+            };
+        }
+
+        public void Update(ShopBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ShopName = model.ShopName;
+            Adress = model.Adress;
+            OpeningDate = model.OpeningDate;
+            CapacityCanned = model.CapacityCanned;
+            _shopCanneds = null;
+        }
+
+        public void CannedsUpdate()
+        {
+            _shopCanneds = null;
+        }
+
+        public ShopViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ShopName = ShopName,
+            Adress = Adress,
+            OpeningDate = OpeningDate,
+            CapacityCanned = CapacityCanned,
+            ShopCanneds = ShopCanneds
+        };
+        public XElement GetXElement => new("Shop",
+          new XAttribute("Id", Id),
+          new XElement("ShopName", ShopName),
+          new XElement("Adress", Adress),
+          new XElement("OpeningDate", OpeningDate.ToString()),
+          new XElement("CapacityCanned", CapacityCanned.ToString()),
+          new XElement("ShopCanneds", Canneds.Select(
+            x => new XElement("ShopCanned", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray())
+        );
+    }
+}

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()
         {

FishFactoryListImplement/Implements/ShopStorage.cs

@@ -0,0 +1,110 @@
+using FishFactoryContracts.BindingModels;
+using FishFactoryContracts.SearchModels;
+using FishFactoryContracts.StoragesContracts;
+using FishFactoryContracts.ViewModels;
+using FishFactoryListImplement.Models;
+using System.Reflection;
+
+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))
+                {
+                    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 Sale(ReplenishSearchModel model)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool ReplenishShops(ReplenishBindingModel model)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}