lab3

Atelier/Atelier/Atelier.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -11,11 +11,14 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.35" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Npgsql" Version="9.0.2" />
+    <PackageReference Include="PDFsharp-MigraDoc-GDI" Version="6.1.1" />
+    <PackageReference Include="Serialize.Linq" Version="3.1.160" />
     <PackageReference Include="Serilog" Version="4.2.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />

Atelier/Atelier/Entities/Order.cs

@@ -18,4 +18,5 @@
 
         };
     }
+   
 }

Atelier/Atelier/Entities/Storage.cs

@@ -3,17 +3,16 @@
     public int Id { get; private set; }
     public int FabricId { get; private set; }
     public double StockMetrage { get; private set; }
+    public DateTime DateStorage { get; private set; }
 
-
-    public static Storage CreateOperation(int id, int fabricId, double stockMetrage)
+    public static Storage CreateOperation(int id, int fabricId, double stockMetrage, DateTime dateStorage)
     {
         return new Storage
         {
             Id = id,
             FabricId = fabricId,
-            StockMetrage = stockMetrage
-            
-
+            StockMetrage = stockMetrage,
+            DateStorage = dateStorage
         };
     }
 }

Atelier/Atelier/FormAtelier.Designer.cs

@@ -38,6 +38,9 @@
             OrdersToolStripMenuItem = new ToolStripMenuItem();
             StoragesToolStripMenuItem = new ToolStripMenuItem();
             отчётыToolStripMenuItem = new ToolStripMenuItem();
+            документСоСправочникамиToolStripMenuItem = new ToolStripMenuItem();
+            отчётПоЗаказамToolStripMenuItem = new ToolStripMenuItem();
+            отчётПоСкладуToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             SuspendLayout();
             // 
@@ -61,21 +64,21 @@
             // ClientsToolStripMenuItem
             // 
             ClientsToolStripMenuItem.Name = "ClientsToolStripMenuItem";
-            ClientsToolStripMenuItem.Size = new Size(224, 26);
+            ClientsToolStripMenuItem.Size = new Size(146, 26);
             ClientsToolStripMenuItem.Text = "Клиент";
             ClientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click_1;
             // 
             // ModelsToolStripMenuItem
             // 
             ModelsToolStripMenuItem.Name = "ModelsToolStripMenuItem";
-            ModelsToolStripMenuItem.Size = new Size(224, 26);
+            ModelsToolStripMenuItem.Size = new Size(146, 26);
             ModelsToolStripMenuItem.Text = "Модель";
             ModelsToolStripMenuItem.Click += ModelsToolStripMenuItem_Click_1;
             // 
             // FabricsToolStripMenuItem1
             // 
             FabricsToolStripMenuItem1.Name = "FabricsToolStripMenuItem1";
-            FabricsToolStripMenuItem1.Size = new Size(224, 26);
+            FabricsToolStripMenuItem1.Size = new Size(146, 26);
             FabricsToolStripMenuItem1.Text = "Ткань";
             FabricsToolStripMenuItem1.Click += FabricsToolStripMenuItem1_Click;
             // 
@@ -89,23 +92,48 @@
             // OrdersToolStripMenuItem
             // 
             OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem";
-            OrdersToolStripMenuItem.Size = new Size(224, 26);
+            OrdersToolStripMenuItem.Size = new Size(132, 26);
             OrdersToolStripMenuItem.Text = "Заказ";
             OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click_1;
             // 
             // StoragesToolStripMenuItem
             // 
             StoragesToolStripMenuItem.Name = "StoragesToolStripMenuItem";
-            StoragesToolStripMenuItem.Size = new Size(224, 26);
+            StoragesToolStripMenuItem.Size = new Size(132, 26);
             StoragesToolStripMenuItem.Text = "Склад";
             StoragesToolStripMenuItem.Click += StoragesToolStripMenuItem_Click_1;
             // 
             // отчётыToolStripMenuItem
             // 
+            отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { документСоСправочникамиToolStripMenuItem, отчётПоЗаказамToolStripMenuItem, отчётПоСкладуToolStripMenuItem });
             отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
             отчётыToolStripMenuItem.Size = new Size(73, 24);
             отчётыToolStripMenuItem.Text = "Отчёты";
             // 
+            // документСоСправочникамиToolStripMenuItem
+            // 
+            документСоСправочникамиToolStripMenuItem.Name = "документСоСправочникамиToolStripMenuItem";
+            документСоСправочникамиToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W;
+            документСоСправочникамиToolStripMenuItem.Size = new Size(350, 26);
+            документСоСправочникамиToolStripMenuItem.Text = "Документ со справочниками";
+            документСоСправочникамиToolStripMenuItem.Click += документСоСправочникамиToolStripMenuItem_Click;
+            // 
+            // отчётПоЗаказамToolStripMenuItem
+            // 
+            отчётПоЗаказамToolStripMenuItem.Name = "отчётПоЗаказамToolStripMenuItem";
+            отчётПоЗаказамToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E;
+            отчётПоЗаказамToolStripMenuItem.Size = new Size(350, 26);
+            отчётПоЗаказамToolStripMenuItem.Text = "Отчёт по заказам";
+            отчётПоЗаказамToolStripMenuItem.Click += отчётПоЗаказамToolStripMenuItem_Click;
+            // 
+            // отчётПоСкладуToolStripMenuItem
+            // 
+            отчётПоСкладуToolStripMenuItem.Name = "отчётПоСкладуToolStripMenuItem";
+            отчётПоСкладуToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P;
+            отчётПоСкладуToolStripMenuItem.Size = new Size(350, 26);
+            отчётПоСкладуToolStripMenuItem.Text = "Отчёт по складу";
+            отчётПоСкладуToolStripMenuItem.Click += отчётПоСкладуToolStripMenuItem_Click;
+            // 
             // FormAtelier
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -135,5 +163,8 @@
         private ToolStripMenuItem FabricsToolStripMenuItem1;
         private ToolStripMenuItem OrdersToolStripMenuItem;
         private ToolStripMenuItem StoragesToolStripMenuItem;
+        private ToolStripMenuItem документСоСправочникамиToolStripMenuItem;
+        private ToolStripMenuItem отчётПоЗаказамToolStripMenuItem;
+        private ToolStripMenuItem отчётПоСкладуToolStripMenuItem;
     }
 }

Atelier/Atelier/FormAtelier.cs

@@ -87,5 +87,45 @@ namespace Atelier
                 MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
+
+        private void документСоСправочникамиToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormDirectoryReport>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка при загрузке",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void отчётПоЗаказамToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormOrderReports>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка при загрузке",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+
+        }
+
+        private void отчётПоСкладуToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormStorageReport>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка при загрузке",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
     }
 }

Atelier/Atelier/Forms/FormDirectoryReport.Designer.cs

@@ -0,0 +1,100 @@
+namespace Atelier.Forms
+{
+    partial class FormDirectoryReport
+    {
+        /// <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()
+        {
+            buttonBuild = new Button();
+            checkBoxClients = new CheckBox();
+            checkBoxFabrics = new CheckBox();
+            checkBoxModels = new CheckBox();
+            SuspendLayout();
+            // 
+            // buttonBuild
+            // 
+            buttonBuild.Location = new Point(205, 95);
+            buttonBuild.Name = "buttonBuild";
+            buttonBuild.Size = new Size(133, 36);
+            buttonBuild.TabIndex = 0;
+            buttonBuild.Text = "Сформировать";
+            buttonBuild.UseVisualStyleBackColor = true;
+            buttonBuild.Click += ButtonBuild_Click;
+            // 
+            // checkBoxClients
+            // 
+            checkBoxClients.AutoSize = true;
+            checkBoxClients.Location = new Point(38, 38);
+            checkBoxClients.Name = "checkBoxClients";
+            checkBoxClients.Size = new Size(91, 24);
+            checkBoxClients.TabIndex = 1;
+            checkBoxClients.Text = "Клиенты";
+            checkBoxClients.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxFabrics
+            // 
+            checkBoxFabrics.AutoSize = true;
+            checkBoxFabrics.Location = new Point(38, 102);
+            checkBoxFabrics.Name = "checkBoxFabrics";
+            checkBoxFabrics.Size = new Size(72, 24);
+            checkBoxFabrics.TabIndex = 2;
+            checkBoxFabrics.Text = "Ткани";
+            checkBoxFabrics.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxModels
+            // 
+            checkBoxModels.AutoSize = true;
+            checkBoxModels.Location = new Point(38, 169);
+            checkBoxModels.Name = "checkBoxModels";
+            checkBoxModels.Size = new Size(86, 24);
+            checkBoxModels.TabIndex = 3;
+            checkBoxModels.Text = "Модели";
+            checkBoxModels.UseVisualStyleBackColor = true;
+            // 
+            // FormDirectoryReport
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(383, 225);
+            Controls.Add(checkBoxModels);
+            Controls.Add(checkBoxFabrics);
+            Controls.Add(checkBoxClients);
+            Controls.Add(buttonBuild);
+            Name = "FormDirectoryReport";
+            StartPosition = FormStartPosition.CenterParent;
+            Text = "Выгрузка справочников";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Button buttonBuild;
+        private CheckBox checkBoxClients;
+        private CheckBox checkBoxFabrics;
+        private CheckBox checkBoxModels;
+    }
+}

Atelier/Atelier/Forms/FormDirectoryReport.cs

@@ -0,0 +1,61 @@
+using Atelier.Reports;
+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 Unity;
+
+namespace Atelier.Forms;
+
+public partial class FormDirectoryReport : Form
+{
+    private readonly IUnityContainer _container;
+    public FormDirectoryReport(IUnityContainer container)
+    {
+        InitializeComponent();
+        _container = container ??
+        throw new ArgumentNullException(nameof(container));
+    }
+    private void ButtonBuild_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            if (!checkBoxClients.Checked && !checkBoxFabrics.Checked && !checkBoxModels.Checked)
+            {
+                throw new Exception("Не выбран ни один справочник для выгрузки");
+            }
+            var sfd = new SaveFileDialog()
+            {
+                Filter = "Docx Files | *.docx"
+            };
+            if (sfd.ShowDialog() != DialogResult.OK)
+            {
+                throw new Exception("Не выбран файла для отчета");
+            }
+            if
+            (_container.Resolve<DocReport>().CreateDoc(sfd.FileName, checkBoxClients.Checked, checkBoxFabrics.Checked,
+            checkBoxModels.Checked))
+            {
+                MessageBox.Show("Документ сформирован",
+                "Формирование документа",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Information);
+            }
+            else
+            {
+                MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах",
+                "Формирование документа",
+                MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при создании отчета", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+}

Atelier/Atelier/Forms/FormDirectoryReport.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>

Atelier/Atelier/Forms/FormOrderReports.Designer.cs

@@ -0,0 +1,163 @@
+namespace Atelier.Forms
+{
+    partial class FormOrderReports
+    {
+        /// <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()
+        {
+            dateTimePickerStart = new DateTimePicker();
+            dateTimePickerEnd = new DateTimePicker();
+            comboBoxModel = new ComboBox();
+            textBoxFile = new TextBox();
+            labelFile = new Label();
+            labelModel = new Label();
+            labelStart = new Label();
+            labelEnd = new Label();
+            buttonFile = new Button();
+            buttonBuild = new Button();
+            SuspendLayout();
+            // 
+            // dateTimePickerStart
+            // 
+            dateTimePickerStart.Location = new Point(202, 201);
+            dateTimePickerStart.Name = "dateTimePickerStart";
+            dateTimePickerStart.Size = new Size(250, 27);
+            dateTimePickerStart.TabIndex = 0;
+            // 
+            // dateTimePickerEnd
+            // 
+            dateTimePickerEnd.Location = new Point(202, 276);
+            dateTimePickerEnd.Name = "dateTimePickerEnd";
+            dateTimePickerEnd.Size = new Size(250, 27);
+            dateTimePickerEnd.TabIndex = 1;
+            // 
+            // comboBoxModel
+            // 
+            comboBoxModel.FormattingEnabled = true;
+            comboBoxModel.Location = new Point(202, 129);
+            comboBoxModel.Name = "comboBoxModel";
+            comboBoxModel.Size = new Size(250, 28);
+            comboBoxModel.TabIndex = 2;
+            // 
+            // textBoxFile
+            // 
+            textBoxFile.Location = new Point(202, 61);
+            textBoxFile.Name = "textBoxFile";
+            textBoxFile.Size = new Size(208, 27);
+            textBoxFile.TabIndex = 3;
+            // 
+            // labelFile
+            // 
+            labelFile.AutoSize = true;
+            labelFile.Location = new Point(63, 64);
+            labelFile.Name = "labelFile";
+            labelFile.Size = new Size(112, 20);
+            labelFile.TabIndex = 4;
+            labelFile.Text = "Путь до файла:\r\n";
+            // 
+            // labelModel
+            // 
+            labelModel.AutoSize = true;
+            labelModel.Location = new Point(63, 129);
+            labelModel.Name = "labelModel";
+            labelModel.Size = new Size(66, 20);
+            labelModel.TabIndex = 5;
+            labelModel.Text = "Модель:";
+            // 
+            // labelStart
+            // 
+            labelStart.AutoSize = true;
+            labelStart.Location = new Point(63, 206);
+            labelStart.Name = "labelStart";
+            labelStart.Size = new Size(97, 20);
+            labelStart.TabIndex = 6;
+            labelStart.Text = "Дата начала:";
+            // 
+            // labelEnd
+            // 
+            labelEnd.AutoSize = true;
+            labelEnd.Location = new Point(63, 281);
+            labelEnd.Name = "labelEnd";
+            labelEnd.Size = new Size(90, 20);
+            labelEnd.TabIndex = 7;
+            labelEnd.Text = "Дата конца:";
+            // 
+            // buttonFile
+            // 
+            buttonFile.Location = new Point(416, 61);
+            buttonFile.Name = "buttonFile";
+            buttonFile.Size = new Size(36, 27);
+            buttonFile.TabIndex = 8;
+            buttonFile.Text = "..";
+            buttonFile.UseVisualStyleBackColor = true;
+            buttonFile.Click += ButtonFile_Click;
+            // 
+            // buttonBuild
+            // 
+            buttonBuild.Location = new Point(167, 357);
+            buttonBuild.Name = "buttonBuild";
+            buttonBuild.Size = new Size(155, 29);
+            buttonBuild.TabIndex = 9;
+            buttonBuild.Text = "Сформировать";
+            buttonBuild.UseVisualStyleBackColor = true;
+            buttonBuild.Click += ButtonBuild_Click;
+            // 
+            // FormOrderReports
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(517, 421);
+            Controls.Add(buttonBuild);
+            Controls.Add(buttonFile);
+            Controls.Add(labelEnd);
+            Controls.Add(labelStart);
+            Controls.Add(labelModel);
+            Controls.Add(labelFile);
+            Controls.Add(textBoxFile);
+            Controls.Add(comboBoxModel);
+            Controls.Add(dateTimePickerEnd);
+            Controls.Add(dateTimePickerStart);
+            Name = "FormOrderReports";
+            StartPosition = FormStartPosition.CenterParent;
+            Text = "Отчёт по заказам";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private DateTimePicker dateTimePickerStart;
+        private DateTimePicker dateTimePickerEnd;
+        private ComboBox comboBoxModel;
+        private TextBox textBoxFile;
+        private Label labelFile;
+        private Label labelModel;
+        private Label labelStart;
+        private Label labelEnd;
+        private Button buttonFile;
+        private Button buttonBuild;
+    }
+}

Atelier/Atelier/Forms/FormOrderReports.cs

@@ -0,0 +1,77 @@
+using Atelier.Reports;
+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 Unity;
+
+namespace Atelier.Forms;
+
+public partial class FormOrderReports : Form
+{
+    private readonly IUnityContainer _container;
+    public FormOrderReports(IUnityContainer container, IOrderRepository orderRepository, IModelRepository modelRepository)
+    {
+        InitializeComponent();
+        _container = container ??
+        throw new ArgumentNullException(nameof(container));
+        comboBoxModel.DataSource = modelRepository.ReadModels();
+        comboBoxModel.DisplayMember = "ModelType";
+        comboBoxModel.ValueMember = "Id";
+    }
+    private void ButtonFile_Click(object sender, EventArgs e)
+    {
+        var sfd = new SaveFileDialog()
+        {
+            Filter = "Excel Files | *.xlsx"
+        };
+        if (sfd.ShowDialog() != DialogResult.OK)
+        {
+            return;
+        }
+        textBoxFile.Text = sfd.FileName;
+    }
+    private void ButtonBuild_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            if (string.IsNullOrWhiteSpace(textBoxFile.Text))
+            {
+                throw new Exception("Отсутствует имя файла для отчета");
+            }
+            if (comboBoxModel.SelectedIndex < 0)
+            {
+                throw new Exception("Не выбран клиент");
+            }
+            if (dateTimePickerEnd.Value <= dateTimePickerStart.Value)
+            {
+                throw new Exception("Дата начала должна быть раньше даты окончания");
+            }
+            if
+            (_container.Resolve<TableReport>().CreateTable(textBoxFile.Text,
+            (int)comboBoxModel.SelectedValue!, dateTimePickerStart.Value, dateTimePickerEnd.Value))
+            {
+                MessageBox.Show("Документ сформирован",
+                "Формирование документа",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Information);
+            }
+            else
+            {
+                MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах",
+                "Формирование документа",
+                MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при создании очета",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+}

Atelier/Atelier/Forms/FormOrderReports.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>

Atelier/Atelier/Forms/FormStorage.cs

@@ -34,7 +34,8 @@ namespace Atelier.Forms
                 {
                     throw new Exception("Имеются незаполненные поля");
                 }
-                _storageRepository.CreateStorage(Storage.CreateOperation(0, (int)comboBoxFabric.SelectedValue!, Convert.ToInt32(numericUpDownMetrage.Value)));
+                var currentDate = DateTime.Now.Date;
+                _storageRepository.CreateStorage(Storage.CreateOperation(0, (int)comboBoxFabric.SelectedValue!, Convert.ToInt32(numericUpDownMetrage.Value), currentDate));
                 Close();
             }
             catch (Exception ex)

Atelier/Atelier/Forms/FormStorageReport.Designer.cs

@@ -0,0 +1,108 @@
+namespace Atelier.Forms
+{
+    partial class FormStorageReport
+    {
+        /// <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()
+        {
+            dateTimePickerStorage = new DateTimePicker();
+            labelDate = new Label();
+            labelFile = new Label();
+            buttonBuild = new Button();
+            buttonChoose = new Button();
+            SuspendLayout();
+            // 
+            // dateTimePickerStorage
+            // 
+            dateTimePickerStorage.Location = new Point(106, 110);
+            dateTimePickerStorage.Name = "dateTimePickerStorage";
+            dateTimePickerStorage.Size = new Size(183, 27);
+            dateTimePickerStorage.TabIndex = 0;
+            // 
+            // labelDate
+            // 
+            labelDate.AutoSize = true;
+            labelDate.Location = new Point(33, 110);
+            labelDate.Name = "labelDate";
+            labelDate.Size = new Size(44, 20);
+            labelDate.TabIndex = 1;
+            labelDate.Text = "Дата:";
+            // 
+            // labelFile
+            // 
+            labelFile.AutoSize = true;
+            labelFile.Location = new Point(179, 54);
+            labelFile.Name = "labelFile";
+            labelFile.Size = new Size(45, 20);
+            labelFile.TabIndex = 2;
+            labelFile.Text = "Файл";
+            // 
+            // buttonBuild
+            // 
+            buttonBuild.Location = new Point(74, 169);
+            buttonBuild.Name = "buttonBuild";
+            buttonBuild.Size = new Size(141, 33);
+            buttonBuild.TabIndex = 3;
+            buttonBuild.Text = "Сформировать";
+            buttonBuild.UseVisualStyleBackColor = true;
+            buttonBuild.Click += ButtonBuild_Click;
+            // 
+            // buttonChoose
+            // 
+            buttonChoose.Location = new Point(33, 45);
+            buttonChoose.Name = "buttonChoose";
+            buttonChoose.Size = new Size(94, 29);
+            buttonChoose.TabIndex = 4;
+            buttonChoose.Text = "Выбрать";
+            buttonChoose.UseVisualStyleBackColor = true;
+            buttonChoose.Click += ButtonChoose_Click;
+            // 
+            // FormStorageReport
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(314, 249);
+            Controls.Add(buttonChoose);
+            Controls.Add(buttonBuild);
+            Controls.Add(labelFile);
+            Controls.Add(labelDate);
+            Controls.Add(dateTimePickerStorage);
+            Name = "FormStorageReport";
+            StartPosition = FormStartPosition.CenterParent;
+            Text = "Отчёт по складу";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private DateTimePicker dateTimePickerStorage;
+        private Label labelDate;
+        private Label labelFile;
+        private Button buttonBuild;
+        private Button buttonChoose;
+    }
+}

Atelier/Atelier/Forms/FormStorageReport.cs

@@ -0,0 +1,67 @@
+using Atelier.Reports;
+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 Unity;
+
+namespace Atelier.Forms;
+
+public partial class FormStorageReport : Form
+{
+    private string _fileName = string.Empty;
+    private readonly IUnityContainer _container;
+    public FormStorageReport(IUnityContainer container)
+    {
+        InitializeComponent();
+        _container = container ??
+        throw new ArgumentNullException(nameof(container));
+    }
+    private void ButtonChoose_Click(object sender, EventArgs e)
+    {
+        var sfd = new SaveFileDialog()
+        {
+            Filter = "Pdf Files | *.pdf"
+        };
+        if (sfd.ShowDialog() == DialogResult.OK)
+        {
+            _fileName = sfd.FileName;
+            labelFile.Text = Path.GetFileName(_fileName);
+        }
+    }
+    private void ButtonBuild_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            if (string.IsNullOrWhiteSpace(_fileName))
+            {
+                throw new Exception("Отсутствует имя файла для отчета");
+            }
+            if
+            (_container.Resolve<ChartReport>().CreateChart(_fileName, dateTimePickerStorage.Value))
+            {
+                MessageBox.Show("Документ сформирован",
+                "Формирование документа",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Information);
+            }
+            else
+            {
+                MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах",
+                "Формирование документа",
+                MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при создании очета",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+}
+

Atelier/Atelier/Forms/FormStorageReport.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>

Atelier/Atelier/Reports/ChartReport.cs

@@ -0,0 +1,54 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+
+namespace Atelier.Reports
+{
+    internal class ChartReport
+    {
+        private readonly IStorageRepository _storageRepository;
+        private readonly ILogger<ChartReport> _logger;
+
+        public ChartReport(IStorageRepository storageRepository, ILogger<ChartReport> logger)
+        {
+            _storageRepository = storageRepository ?? throw new ArgumentNullException(nameof(storageRepository));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public bool CreateChart(string filePath, DateTime dateTime)
+        {
+            try
+            {
+                var data = GetData(dateTime);
+                _logger.LogDebug("Data for chart: {Data}", System.Text.Json.JsonSerializer.Serialize(data));
+
+                new PdfBuilder(filePath)
+                    .AddHeader("Склад тканей")
+                    .AddPieChart("Остатки тканей", data)
+                    .Build();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка при формировании документа");
+                return false;
+            }
+        }
+
+        private List<(string Caption, double Value)> GetData(DateTime dateTime)
+        {
+            var data = _storageRepository
+                .ReadStorage()
+                .Where(x => x.DateStorage.Date == dateTime.Date)
+                .GroupBy(x => x.FabricId, (key, group) => new { Id = key, Stock = group.Sum(x => x.StockMetrage) })
+                .Select(x => (x.Id.ToString(), (double)x.Stock))
+                .ToList();
+
+            _logger.LogDebug("Raw data: {Data}", JsonSerializer.Serialize(data));
+            return data;
+        }
+
+    }
+}

Atelier/Atelier/Reports/DocReport.cs

@@ -0,0 +1,106 @@
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Atelier.Reports;
+
+internal class DocReport
+{
+    private readonly IClientRepository _clientRepository;
+    private readonly IFabricRepository _fabricRepository;
+    private readonly IModelRepository _modelRepository;
+    private readonly ILogger<DocReport> _logger;
+    public DocReport(IClientRepository clientRepository, IFabricRepository fabricRepository, IModelRepository modelRepository, ILogger<DocReport> logger)
+    {
+        _clientRepository = clientRepository ?? throw new ArgumentNullException(nameof(clientRepository));
+        _fabricRepository = fabricRepository ?? throw new ArgumentNullException(nameof(fabricRepository));
+        _modelRepository = modelRepository ?? throw new ArgumentNullException(nameof(modelRepository));
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+    }
+    public bool CreateDoc(string filePath, bool includeClients, bool includeFabrics, bool includeModels)
+    {
+        try
+        {
+            var builder = new WordBuilder(filePath)
+            .AddHeader("Документ со справочниками");
+            if (includeClients)
+            {
+                builder.AddParagraph("Клиенты")
+                .AddTable([2400, 2400, 2400], GetClients());
+            }
+            if (includeFabrics)
+            {
+                builder.AddParagraph("Ткани")
+                .AddTable([2400, 2400, 2400], GetFabrics());
+            }
+            if (includeModels)
+            {
+                builder.AddParagraph("Модели")
+                .AddTable([2400, 2400, 1200, 1200], GetModels());
+            }
+            builder.Build();
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при формировании документа");
+            return false;
+        }
+    }
+    private List<string[]> GetClients()
+    {
+        return [
+        ["Имя", "Фамилия", "Контактные данные"],
+.. _clientRepository
+.ReadClients()
+.Select(x => new string[] { x.FirstName, x.LastName, x.ContactInformation }),
+];
+    }
+    private List<string[]> GetFabrics()
+    {
+        return [
+        ["Тип ткани", "Цвет", "Метраж"],
+.. _fabricRepository
+.ReadFabrics()
+.Select(x => new string[] { x.FabricType.ToString(), x.Color.ToString(), x.Metrage.ToString() }),
+];
+    }
+    private List<string[]> GetModels()
+    {
+        // Заголовок таблицы
+        var result = new List<string[]>
+    {
+        new[] { "Тип модели", "Цена", "Ткань", "Количество" }
+    };
+
+        // Добавляем строки с данными
+        var models = _modelRepository.ReadModels().ToList();
+        _logger.LogDebug("Models: {Models}", JsonConvert.SerializeObject(models));
+
+        result.AddRange(
+            models.Select(x =>
+            {
+                // Формируем строки для каждой модели
+                var fabricTypes = string.Join(", ", x.FabricModel
+                    .Select(y => _fabricRepository.ReadFabricById(y.FabricId)?.FabricType)
+                    .Where(type => type != null)); // Filter out null types
+                var fabricCounts = string.Join(", ", x.FabricModel.Select(y => y.Count.ToString()));
+                _logger.LogDebug("ModelType: {ModelType}, Price: {Price}, FabricTypes: {FabricTypes}, FabricCounts: {FabricCounts}", x.ModelType, x.Price, fabricTypes, fabricCounts);
+
+                return new[]
+                {
+                x.ModelType.ToString(),
+                x.Price.ToString(),
+                fabricTypes,
+                fabricCounts
+                };
+            })
+        );
+
+        return result;
+    }
+}

Atelier/Atelier/Reports/ExcelBuilder.cs

@@ -0,0 +1,310 @@
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Atelier.Reports;
+
+public class ExcelBuilder
+{
+    private readonly string _filePath;
+    private readonly SheetData _sheetData;
+    private readonly MergeCells _mergeCells;
+    private readonly Columns _columns;
+    private uint _rowIndex = 0;
+
+    public ExcelBuilder(string filePath)
+    {
+        if (string.IsNullOrWhiteSpace(filePath))
+        {
+            throw new ArgumentNullException(nameof(filePath));
+        }
+        if (File.Exists(filePath))
+        {
+            File.Delete(filePath);
+        }
+        _filePath = filePath;
+        _sheetData = new SheetData();
+        _mergeCells = new MergeCells();
+        _columns = new Columns();
+        _rowIndex = 1;
+    }
+
+    public ExcelBuilder AddHeader(string header, int startIndex, int count)
+    {
+        CreateCell(startIndex, _rowIndex, header,
+        StyleIndex.BoldTextWithoutBorder);
+        for (int i = startIndex + 1; i < startIndex + count; ++i)
+        {
+            CreateCell(i, _rowIndex, "", StyleIndex.SimpleTextWithoutBorder);
+        }
+        _mergeCells.Append(new MergeCell()
+        {
+            Reference = new StringValue($"{GetExcelColumnName(startIndex)}{_rowIndex}:{GetExcelColumnName(startIndex + count - 1)}{_rowIndex}")
+        });
+        _rowIndex++;
+        return this;
+    }
+
+    public ExcelBuilder AddParagraph(string text, int columnIndex)
+    {
+        CreateCell(columnIndex, _rowIndex++, text, StyleIndex.SimpleTextWithoutBorder);
+        return this;
+    }
+    public ExcelBuilder AddTable(int[] columnsWidths, List<string[]> data)
+    {
+        if (columnsWidths == null || columnsWidths.Length == 0)
+        {
+            throw new ArgumentNullException(nameof(columnsWidths));
+        }
+        if (data == null || data.Count == 0)
+        {
+            throw new ArgumentNullException(nameof(data));
+        }
+        if (data.Any(x => x.Length != columnsWidths.Length))
+        {
+            throw new InvalidOperationException("widths.Length != data.Length");
+        }
+        uint counter = 1;
+        int coef = 2;
+        _columns.Append(columnsWidths.Select(x => new Column
+        {
+            Min = counter,
+            Max = counter++,
+            Width = x * coef,
+            CustomWidth = true
+        }));
+        for (var j = 0; j < data.First().Length; ++j)
+        {
+            CreateCell(j, _rowIndex, data.First()[j], StyleIndex.BoldTextWithBorder);
+        }
+        _rowIndex++;
+        for (var i = 1; i < data.Count - 1; ++i)
+        {
+            for (var j = 0; j < data[i].Length; ++j)
+            {
+                CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithBorder);
+            }
+            _rowIndex++;
+        }
+        for (var j = 0; j < data.Last().Length; ++j)
+        {
+            CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.BoldTextWithBorder);
+        }
+        _rowIndex++;
+        return this;
+    }
+
+    public void Build()
+    {
+        using var spreadsheetDocument = SpreadsheetDocument.Create(_filePath, SpreadsheetDocumentType.Workbook);
+        var workbookpart = spreadsheetDocument.AddWorkbookPart();
+        GenerateStyle(workbookpart);
+        workbookpart.Workbook = new Workbook();
+        var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
+        worksheetPart.Worksheet = new Worksheet();
+        if (_columns.HasChildren)
+        {
+            worksheetPart.Worksheet.Append(_columns);
+        }
+        worksheetPart.Worksheet.Append(_sheetData);
+        var sheets = spreadsheetDocument.WorkbookPart!.Workbook.AppendChild(new Sheets());
+        var sheet = new Sheet()
+        {
+            Id = spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+            SheetId = 1,
+            Name = "Лист 1"
+        };
+        sheets.Append(sheet);
+        if (_mergeCells.HasChildren)
+        {
+            worksheetPart.Worksheet.InsertAfter(_mergeCells, worksheetPart.Worksheet.Elements<SheetData>().First());
+        }
+    }
+
+    private static void GenerateStyle(WorkbookPart workbookPart)
+    {
+        var workbookStylesPart = workbookPart.AddNewPart<WorkbookStylesPart>();
+        workbookStylesPart.Stylesheet = new Stylesheet();
+        var fonts = new Fonts()
+        {
+            Count = 2,
+            KnownFonts = BooleanValue.FromBoolean(true)
+        };
+        fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
+        {
+            FontSize = new FontSize() { Val = 11 },
+            FontName = new FontName() { Val = "Calibri" },
+            FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
+            FontScheme = new FontScheme()
+            {
+                Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor)
+            }
+        });
+
+        fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
+        {
+            FontSize = new FontSize() { Val = 11 },
+            FontName = new FontName() { Val = "Calibri" },
+            Bold = new Bold(),
+            FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
+            FontScheme = new FontScheme()
+            {
+                Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor)
+            }
+        });
+        workbookStylesPart.Stylesheet.Append(fonts);
+        // Default Fill
+        var fills = new Fills() { Count = 1 };
+        fills.Append(new Fill
+        {
+            PatternFill = new PatternFill()
+            {
+                PatternType = new EnumValue<PatternValues>(PatternValues.None)
+            }
+        });
+        workbookStylesPart.Stylesheet.Append(fills);
+        // Default Border
+        var borders = new Borders() { Count = 2 };
+        borders.Append(new Border
+        {
+            LeftBorder = new LeftBorder(),
+            RightBorder = new RightBorder(),
+            TopBorder = new TopBorder(),
+            BottomBorder = new BottomBorder(),
+            DiagonalBorder = new DiagonalBorder()
+        });
+
+        borders.Append(new Border
+        {
+            LeftBorder = new LeftBorder() { Style = BorderStyleValues.Medium },
+            RightBorder = new RightBorder() { Style = BorderStyleValues.Medium },
+            TopBorder = new TopBorder() { Style = BorderStyleValues.Medium },
+            BottomBorder = new BottomBorder() { Style = BorderStyleValues.Medium },
+            DiagonalBorder = new DiagonalBorder() { Style = BorderStyleValues.Medium },
+        });
+        workbookStylesPart.Stylesheet.Append(borders);
+        // Default cell format and a date cell format
+        var cellFormats = new CellFormats() { Count = 4 };
+        cellFormats.Append(new CellFormat
+        {
+            NumberFormatId = 0,
+            FormatId = 0,
+            FontId = 0,
+            BorderId = 0,
+            FillId = 0,
+            Alignment = new Alignment()
+            {
+                Horizontal = HorizontalAlignmentValues.Left,
+                Vertical = VerticalAlignmentValues.Center,
+                WrapText = true
+            }
+        });
+
+        cellFormats.Append(new CellFormat
+        {
+            NumberFormatId = 1,
+            FormatId = 0,
+            FontId = 0,
+            BorderId = 1,
+            FillId = 0,
+            Alignment = new Alignment()
+            {
+                Horizontal = HorizontalAlignmentValues.Left,
+                Vertical = VerticalAlignmentValues.Center,
+                WrapText = true
+            }
+        });
+        cellFormats.Append(new CellFormat
+        {
+            NumberFormatId = 2,
+            FormatId = 0,
+            FontId = 1,
+            BorderId = 0,
+            FillId = 0,
+            Alignment = new Alignment()
+            {
+                Horizontal = HorizontalAlignmentValues.Left,
+                Vertical = VerticalAlignmentValues.Center,
+                WrapText = true
+            }
+        });
+        cellFormats.Append(new CellFormat
+        {
+            NumberFormatId = 3,
+            FormatId = 0,
+            FontId = 1,
+            BorderId = 1,
+            FillId = 0,
+            Alignment = new Alignment()
+            {
+                Horizontal = HorizontalAlignmentValues.Left,
+                Vertical = VerticalAlignmentValues.Center,
+                WrapText = true
+            }
+        });
+        workbookStylesPart.Stylesheet.Append(cellFormats);
+    }
+
+    private enum StyleIndex
+    {
+        SimpleTextWithoutBorder = 0,
+        SimpleTextWithBorder = 1,
+        BoldTextWithoutBorder = 2,
+        BoldTextWithBorder = 3,
+    }
+
+    private void CreateCell(int columnIndex, uint rowIndex, string text, StyleIndex styleIndex)
+    {
+        var columnName = GetExcelColumnName(columnIndex);
+        var cellReference = columnName + rowIndex;
+        var row = _sheetData.Elements<Row>().FirstOrDefault(r => r.RowIndex! == rowIndex);
+        if (row == null)
+        {
+            row = new Row() { RowIndex = rowIndex };
+            _sheetData.Append(row);
+        }
+        var newCell = row.Elements<Cell>().FirstOrDefault(c => c.CellReference != null && c.CellReference.Value == columnName + rowIndex);
+        if (newCell == null)
+        {
+            Cell? refCell = null;
+            foreach (Cell cell in row.Elements<Cell>())
+            {
+                if (cell.CellReference?.Value != null && cell.CellReference.Value.Length == cellReference.Length)
+                {
+                    if (string.Compare(cell.CellReference.Value, cellReference, true) > 0)
+                    {
+                        refCell = cell;
+                        break;
+                    }
+                }
+            }
+            newCell = new Cell() { CellReference = cellReference };
+            row.InsertBefore(newCell, refCell);
+        }
+        newCell.CellValue = new CellValue(text);
+        newCell.DataType = CellValues.String;
+        newCell.StyleIndex = (uint)styleIndex;
+    }
+
+    private static string GetExcelColumnName(int columnNumber)
+    {
+        columnNumber += 1;
+        int dividend = columnNumber;
+        string columnName = string.Empty;
+        int modulo;
+        while (dividend > 0)
+        {
+            modulo = (dividend - 1) % 26;
+            columnName = Convert.ToChar(65 + modulo).ToString() +
+            columnName;
+            dividend = (dividend - modulo) / 26;
+        }
+        return columnName;
+    }
+
+}

Atelier/Atelier/Reports/PdfBuilder.cs

@@ -0,0 +1,88 @@
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Shapes.Charts;
+using MigraDoc.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Atelier.Reports;
+
+public class PdfBuilder
+{
+    private readonly string _filePath;
+    private readonly Document _document;
+    public PdfBuilder(string filePath)
+    {
+        if (string.IsNullOrWhiteSpace(filePath))
+        {
+            throw new ArgumentNullException(nameof(filePath));
+        }
+        if (File.Exists(filePath))
+        {
+            File.Delete(filePath);
+        }
+        _filePath = filePath;
+        _document = new Document();
+        DefineStyles();
+    }
+    public PdfBuilder AddHeader(string header)
+    {
+        _document.AddSection().AddParagraph(header, "NormalBold");
+        return this;
+    }
+
+    public PdfBuilder AddPieChart(string title, List<(string Caption, double Value)> data)
+    {
+        if (data == null || data.Count == 0)
+        {
+            return this;
+        }
+        var chart = new Chart(ChartType.Pie2D);
+        var series = chart.SeriesCollection.AddSeries();
+        series.Add(data.Select(x => x.Value).ToArray());
+
+        var xseries = chart.XValues.AddXSeries();
+        xseries.Add(data.Select(x => x.Caption).ToArray());
+
+        chart.DataLabel.Type = DataLabelType.Percent;
+        chart.DataLabel.Position = DataLabelPosition.OutsideEnd;
+
+        chart.Width = Unit.FromCentimeter(16);
+        chart.Height = Unit.FromCentimeter(12);
+
+        chart.TopArea.AddParagraph(title);
+
+        chart.XAxis.MajorTickMark = TickMarkType.Outside;
+
+        chart.YAxis.MajorTickMark = TickMarkType.Outside;
+        chart.YAxis.HasMajorGridlines = true;
+
+        chart.PlotArea.LineFormat.Width = 1;
+        chart.PlotArea.LineFormat.Visible = true;
+
+        chart.TopArea.AddLegend();
+
+        _document.LastSection.Add(chart);
+        return this;
+    }
+
+    public void Build()
+    {
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+        var renderer = new PdfDocumentRenderer(true)
+        {
+            Document = _document
+        };
+        renderer.RenderDocument();
+        renderer.PdfDocument.Save(_filePath);
+    }
+    private void DefineStyles()
+    {
+        var headerStyle = _document.AddStyle("NormalBold", "Normal");
+        headerStyle.Font.Bold = true;
+        headerStyle.Font.Size = 14;
+        headerStyle.Font.Color = Colors.DeepPink;
+    }
+}

Atelier/Atelier/Reports/TableReport.cs

@@ -0,0 +1,68 @@
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Atelier.Reports
+{
+    internal class TableReport
+    {
+        private readonly IOrderRepository _orderRepository;
+        private readonly IStorageRepository _storageRepository;
+        private readonly ILogger<TableReport> _logger;
+        internal static readonly string[] item = ["Клиент", "Дата", "Модель", "Количество"];
+
+        public TableReport(IOrderRepository orderRepository, IStorageRepository storageRepository, ILogger<TableReport> logger)
+        {
+            _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository));
+            _storageRepository = storageRepository ?? throw new ArgumentNullException(nameof(storageRepository));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public bool CreateTable(string filePath, int modelId, DateTime startDate, DateTime endDate)
+        {
+            try
+            {
+                new ExcelBuilder(filePath)
+                    .AddHeader("Сводка по заказам", 0, 4)
+                    .AddParagraph("за период", 0)
+                    .AddTable(new[] { 15, 15, 20, 15 }, GetData(modelId, startDate, endDate))
+                    .Build();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка при формировании документа");
+                return false;
+            }
+        }
+
+        private List<string[]> GetData(int modelId, DateTime startDate, DateTime endDate)
+        {
+            var orderData = _orderRepository
+                .ReadOrders()
+                .Where(x => x.Date >= startDate && x.Date <= endDate && x.ModelOrder.Any(y => y.ModelId == modelId))
+                .SelectMany(x => x.ModelOrder, (order, modelOrder) => new { order.ClientId, order.Date, modelOrder.ModelId, modelOrder.Count })
+                .OrderBy(x => x.Date);
+
+            var storageData = _storageRepository
+                .ReadStorage()
+                .Where(x => x.DateStorage >= startDate && x.DateStorage <= endDate)
+                .Select(x => new { x.FabricId, x.DateStorage, x.StockMetrage })
+                .OrderBy(x => x.DateStorage);
+
+            _logger.LogDebug("Order Data: {OrderData}", JsonConvert.SerializeObject(orderData));
+            _logger.LogDebug("Storage Data: {StorageData}", JsonConvert.SerializeObject(storageData));
+
+            var result = new List<string[]>() { item };
+
+            result.AddRange(orderData.Select(x => new string[] { x.ClientId.ToString(), x.Date.ToString("yyyy-MM-dd"), x.ModelId.ToString(), x.Count.ToString() }));
+            result.AddRange(storageData.Select(x => new string[] { "", x.DateStorage.ToString("yyyy-MM-dd"), x.FabricId.ToString(), x.StockMetrage.ToString() }));
+
+            result.Add(new[] { "Всего", "", "", (orderData.Sum(x => x.Count) + storageData.Sum(x => x.StockMetrage)).ToString() });
+
+            return result;
+        }
+    }
+}

Atelier/Atelier/Reports/WordBuilder.cs

@@ -0,0 +1,133 @@
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+
+namespace Atelier.Reports;
+
+internal class WordBuilder
+{
+    private readonly string _filePath;
+
+    private readonly Document _document;
+
+    private readonly Body _body;
+    public WordBuilder(string filePath)
+    {
+        if (string.IsNullOrWhiteSpace(filePath))
+        {
+            throw new ArgumentNullException(nameof(filePath));
+        }
+        if (File.Exists(filePath))
+        {
+            File.Delete(filePath);
+        }
+        _filePath = filePath;
+        _document = new Document();
+        _body = _document.AppendChild(new Body());
+    }
+    public WordBuilder AddHeader(string header)
+    {
+        var paragraph = _body.AppendChild(new Paragraph());
+        var run = paragraph.AppendChild(new Run());
+        run.PrependChild(new RunProperties());
+        run.RunProperties.AddChild(new Bold());
+        run.AppendChild(new Text(header));
+        return this;
+    }
+    public WordBuilder AddParagraph(string text)
+    {
+        var paragraph = _body.AppendChild(new Paragraph());
+        var run = paragraph.AppendChild(new Run());
+        run.AppendChild(new Text(text));
+        return this;
+    }
+    public WordBuilder AddTable(int[] widths, List<string[]> data)
+    {
+        if (widths == null || widths.Length == 0)
+        {
+            throw new ArgumentNullException(nameof(widths));
+        }
+        if (data == null || data.Count == 0)
+        {
+            throw new ArgumentNullException(nameof(data));
+        }
+        if (data.Any(x => x.Length != widths.Length))
+        {
+            throw new InvalidOperationException("widths.Length != data.Length");
+        }
+        var table = new Table();
+        table.AppendChild(new TableProperties(
+        new TableBorders(
+        new TopBorder()
+        {
+            Val = new EnumValue<BorderValues>(BorderValues.Single),
+            Size = 12
+        },
+
+        new BottomBorder()
+        {
+            Val = new EnumValue<BorderValues>(BorderValues.Single),
+            Size = 12
+        },
+
+        new LeftBorder()
+        {
+            Val = new EnumValue<BorderValues>(BorderValues.Single),
+            Size = 12
+        },
+
+        new RightBorder()
+        {
+            Val = new EnumValue<BorderValues>(BorderValues.Single),
+            Size = 12
+        },
+
+        new InsideHorizontalBorder()
+        {
+            Val = new EnumValue<BorderValues>(BorderValues.Single),
+            Size = 12
+        },
+
+        new InsideVerticalBorder()
+        {
+            Val = new EnumValue<BorderValues>(BorderValues.Single),
+            Size = 12
+        }
+        )
+        ));
+
+        // Заголовок
+        var tr = new TableRow();
+        for (var j = 0; j < widths.Length; ++j)
+        {
+            tr.Append(new TableCell(
+            new TableCellProperties(new TableCellWidth()
+            {
+                Width = widths[j].ToString()
+            }),
+
+            new Paragraph(new Run(new RunProperties(new Bold()), new
+            Text(data.First()[j])))));
+        }
+        table.Append(tr);
+
+        // Данные
+        table.Append(data.Skip(1).Select(x =>
+        new TableRow(x.Select(y => new TableCell(new Paragraph(new Run(new Text(y))))))));
+        _body.Append(table);
+        return this;
+    }
+    public void Build()
+    {
+        using var wordDocument = WordprocessingDocument.Create(_filePath, WordprocessingDocumentType.Document);
+        var mainPart = wordDocument.AddMainDocumentPart();
+        mainPart.Document = _document;
+    }
+
+}

Atelier/Atelier/Repositories/Implementations/ModelRepository.cs

@@ -159,12 +159,19 @@ internal class ModelRepository : IModelRepository
         _logger.LogInformation("Получение всех объектов");
         try
         {
-            using var connection = new
-            NpgsqlConnection(_connectionString.ConnectionString);
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
             var querySelect = "SELECT * FROM Models";
-            var models = connection.Query<Model>(querySelect);
-            _logger.LogDebug("Полученные объекты: {json}",
-            JsonConvert.SerializeObject(models));
+            var models = connection.Query<Model>(querySelect).ToList();
+
+            foreach (var model in models)
+            {
+                var querySelectSub = @$"SELECT * FROM FabricModel fm WHERE ModelId = {model.Id}";
+                var fabricModel = connection.Query<FabricModel>(querySelectSub).ToList();
+                model.CreateList(fabricModel);
+                _logger.LogDebug("Model ID: {ModelId}, FabricModels: {FabricModels}", model.Id, JsonConvert.SerializeObject(fabricModel));
+            }
+
+            _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(models));
             return models;
         }
         catch (Exception ex)

Atelier/Atelier/Repositories/Implementations/StorageRepository.cs

@@ -22,8 +22,8 @@ internal class StorageRepository : IStorageRepository
         {
             using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
             var queryInsert = @"
-INSERT INTO Storages (FabricId, StockMetrage)
-VALUES (@FabricId, @StockMetrage)";
+INSERT INTO Storages (FabricId, StockMetrage, DateStorage)
+VALUES (@FabricId, @StockMetrage, @DateStorage)";
             connection.Execute(queryInsert, storage);
         }
         catch (Exception ex)
@@ -52,23 +52,21 @@ WHERE Id=@id";
             throw;
         }
     }
-    public IEnumerable<Storage> ReadStorage(int? fabricId = null, double ? minStockMetrage = null, double? StockMetrage = null)
+    public IEnumerable<Storage> ReadStorage(int? fabricId = null, double? minStockMetrage = null, double? StockMetrage = null)
     {
-        _logger.LogInformation("Получение всех объектов");
+        _logger.LogInformation("Получение всех данных о складе");
         try
         {
-            using var connection = new
-            NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = @"SELECT * FROM Storages";
-            var storages =
-            connection.Query<Storage>(querySelect);
-            _logger.LogDebug("Полученные объекты: {json}",
-            JsonConvert.SerializeObject(storages));
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = "SELECT * FROM Storages";
+            var storages = connection.Query<Storage>(querySelect).ToList();
+
+            _logger.LogDebug("Полученные данные о складе: {json}", JsonConvert.SerializeObject(storages));
             return storages;
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Ошибка при чтении объектов");
+            _logger.LogError(ex, "Ошибка при чтении данных о складе");
             throw;
         }
     }