diff --git a/GasStation/Entities/TempProductSelling.cs b/GasStation/Entities/TempProductSelling.cs new file mode 100644 index 0000000..883d695 --- /dev/null +++ b/GasStation/Entities/TempProductSelling.cs @@ -0,0 +1,14 @@ +namespace GasStation.Entities; + +public class TempProductSelling +{ + public int Id { get; private set; } + + public int GasmanId { get; private set; } + + public int Count { get; private set; } + + public DateTime SellingDateTime { get; private set; } + + public int ProductID { get; private set; } +} diff --git a/GasStation/FormGasstation.Designer.cs b/GasStation/FormGasstation.Designer.cs index 1442f50..6c8ec56 100644 --- a/GasStation/FormGasstation.Designer.cs +++ b/GasStation/FormGasstation.Designer.cs @@ -37,6 +37,9 @@ SupplyToolStripMenuItem = new ToolStripMenuItem(); SellingToolStripMenuItem = new ToolStripMenuItem(); отчётыToolStripMenuItem = new ToolStripMenuItem(); + DirectoryReportToolStripMenuItem = new ToolStripMenuItem(); + ProductReportToolStripMenuItem = new ToolStripMenuItem(); + productDistToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // @@ -59,21 +62,21 @@ // GasmanToolStripMenuItem // GasmanToolStripMenuItem.Name = "GasmanToolStripMenuItem"; - GasmanToolStripMenuItem.Size = new Size(180, 22); + GasmanToolStripMenuItem.Size = new Size(137, 22); GasmanToolStripMenuItem.Text = "Заправщик"; GasmanToolStripMenuItem.Click += GasmanToolStripMenuItem_Click; // // SupplierToolStripMenuItem // SupplierToolStripMenuItem.Name = "SupplierToolStripMenuItem"; - SupplierToolStripMenuItem.Size = new Size(180, 22); + SupplierToolStripMenuItem.Size = new Size(137, 22); SupplierToolStripMenuItem.Text = "Поставщик"; SupplierToolStripMenuItem.Click += SupplierToolStripMenuItem_Click; // // ProductToolStripMenuItem // ProductToolStripMenuItem.Name = "ProductToolStripMenuItem"; - ProductToolStripMenuItem.Size = new Size(180, 22); + ProductToolStripMenuItem.Size = new Size(137, 22); ProductToolStripMenuItem.Text = "Товар"; ProductToolStripMenuItem.Click += ProductToolStripMenuItem_Click; // @@ -87,23 +90,48 @@ // SupplyToolStripMenuItem // SupplyToolStripMenuItem.Name = "SupplyToolStripMenuItem"; - SupplyToolStripMenuItem.Size = new Size(180, 22); + SupplyToolStripMenuItem.Size = new Size(125, 22); SupplyToolStripMenuItem.Text = "Поставка"; SupplyToolStripMenuItem.Click += SupplyToolStripMenuItem_Click; // // SellingToolStripMenuItem // SellingToolStripMenuItem.Name = "SellingToolStripMenuItem"; - SellingToolStripMenuItem.Size = new Size(180, 22); + SellingToolStripMenuItem.Size = new Size(125, 22); SellingToolStripMenuItem.Text = "Продажа"; SellingToolStripMenuItem.Click += SellingToolStripMenuItem_Click; // // отчётыToolStripMenuItem // + отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem, ProductReportToolStripMenuItem, productDistToolStripMenuItem }); отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; + отчётыToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E; отчётыToolStripMenuItem.Size = new Size(60, 20); отчётыToolStripMenuItem.Text = "Отчёты"; // + // DirectoryReportToolStripMenuItem + // + DirectoryReportToolStripMenuItem.Name = "DirectoryReportToolStripMenuItem"; + DirectoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W; + DirectoryReportToolStripMenuItem.Size = new Size(280, 22); + DirectoryReportToolStripMenuItem.Text = "Документ со справочниками"; + DirectoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click; + // + // ProductReportToolStripMenuItem + // + ProductReportToolStripMenuItem.Name = "ProductReportToolStripMenuItem"; + ProductReportToolStripMenuItem.Size = new Size(280, 22); + ProductReportToolStripMenuItem.Text = "Движение товаров"; + ProductReportToolStripMenuItem.Click += ProductReportToolStripMenuItem_Click; + // + // productDistToolStripMenuItem + // + productDistToolStripMenuItem.Name = "productDistToolStripMenuItem"; + productDistToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P; + productDistToolStripMenuItem.Size = new Size(280, 22); + productDistToolStripMenuItem.Text = "Распределение товара"; + productDistToolStripMenuItem.Click += ProductDistToolStripMenuItem_Click; + // // FormGasStation // AutoScaleDimensions = new SizeF(7F, 15F); @@ -133,5 +161,8 @@ private ToolStripMenuItem ProductToolStripMenuItem; private ToolStripMenuItem SupplyToolStripMenuItem; private ToolStripMenuItem SellingToolStripMenuItem; + private ToolStripMenuItem DirectoryReportToolStripMenuItem; + private ToolStripMenuItem ProductReportToolStripMenuItem; + private ToolStripMenuItem productDistToolStripMenuItem; } } diff --git a/GasStation/FormGasstation.cs b/GasStation/FormGasstation.cs index 3d05cd9..dcc54a9 100644 --- a/GasStation/FormGasstation.cs +++ b/GasStation/FormGasstation.cs @@ -1,4 +1,5 @@ using GasStation.Forms; +using GasStation.Reports; using Unity; namespace GasStation @@ -73,5 +74,41 @@ namespace GasStation MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + + private void DirectoryReportToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ProductReportToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ProductDistToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } } diff --git a/GasStation/Forms/FormDirectoryReport.Designer.cs b/GasStation/Forms/FormDirectoryReport.Designer.cs new file mode 100644 index 0000000..98913a1 --- /dev/null +++ b/GasStation/Forms/FormDirectoryReport.Designer.cs @@ -0,0 +1,99 @@ +namespace GasStation.Forms +{ + partial class FormDirectoryReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + checkBoxGasmen = new CheckBox(); + checkBoxSuppliers = new CheckBox(); + checkBoxProducts = new CheckBox(); + buttonBuild = new Button(); + SuspendLayout(); + // + // checkBoxGasmen + // + checkBoxGasmen.AutoSize = true; + checkBoxGasmen.Location = new Point(50, 52); + checkBoxGasmen.Name = "checkBoxGasmen"; + checkBoxGasmen.Size = new Size(85, 19); + checkBoxGasmen.TabIndex = 0; + checkBoxGasmen.Text = "Работники"; + checkBoxGasmen.UseVisualStyleBackColor = true; + // + // checkBoxSuppliers + // + checkBoxSuppliers.AutoSize = true; + checkBoxSuppliers.Location = new Point(50, 119); + checkBoxSuppliers.Name = "checkBoxSuppliers"; + checkBoxSuppliers.Size = new Size(96, 19); + checkBoxSuppliers.TabIndex = 1; + checkBoxSuppliers.Text = "Поставщики"; + checkBoxSuppliers.UseVisualStyleBackColor = true; + // + // checkBoxProducts + // + checkBoxProducts.AutoSize = true; + checkBoxProducts.Location = new Point(50, 185); + checkBoxProducts.Name = "checkBoxProducts"; + checkBoxProducts.Size = new Size(67, 19); + checkBoxProducts.TabIndex = 2; + checkBoxProducts.Text = "Товары"; + checkBoxProducts.UseVisualStyleBackColor = true; + // + // buttonBuild + // + buttonBuild.Location = new Point(212, 115); + buttonBuild.Name = "buttonBuild"; + buttonBuild.Size = new Size(128, 23); + buttonBuild.TabIndex = 3; + buttonBuild.Text = "Сформировать"; + buttonBuild.UseVisualStyleBackColor = true; + buttonBuild.Click += ButtonBuild_Click; + // + // FormDirectoryReport + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(410, 265); + Controls.Add(buttonBuild); + Controls.Add(checkBoxProducts); + Controls.Add(checkBoxSuppliers); + Controls.Add(checkBoxGasmen); + Name = "FormDirectoryReport"; + Text = "FormDirectoryReport"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private CheckBox checkBoxGasmen; + private CheckBox checkBoxSuppliers; + private CheckBox checkBoxProducts; + private Button buttonBuild; + } +} \ No newline at end of file diff --git a/GasStation/Forms/FormDirectoryReport.cs b/GasStation/Forms/FormDirectoryReport.cs new file mode 100644 index 0000000..efcd755 --- /dev/null +++ b/GasStation/Forms/FormDirectoryReport.cs @@ -0,0 +1,54 @@ +using GasStation.Reports; +using Unity; + +namespace GasStation.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 (!checkBoxGasmen.Checked && !checkBoxSuppliers.Checked && !checkBoxProducts.Checked) + { + throw new Exception("Не выбран ни один справочник для выгрузки"); + } + + var sfd = new SaveFileDialog() + { + Filter = "Docx Files | *.docx" + }; + + if (sfd.ShowDialog() != DialogResult.OK) + { + throw new Exception("Не выбран файла для отчета"); + } + + if (_container.Resolve().CreateDoc(sfd.FileName, checkBoxGasmen.Checked, checkBoxSuppliers.Checked, checkBoxProducts.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); + } + } + +} + diff --git a/GasStation/Forms/FormDirectoryReport.resx b/GasStation/Forms/FormDirectoryReport.resx new file mode 100644 index 0000000..8b2ff64 --- /dev/null +++ b/GasStation/Forms/FormDirectoryReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GasStation/Forms/FormProductReport.Designer.cs b/GasStation/Forms/FormProductReport.Designer.cs new file mode 100644 index 0000000..727a673 --- /dev/null +++ b/GasStation/Forms/FormProductReport.Designer.cs @@ -0,0 +1,162 @@ +namespace GasStation.Forms +{ + partial class FormProductReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dateTimePickerEnd = new DateTimePicker(); + dateTimePickerBegin = new DateTimePicker(); + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + label4 = new Label(); + buttonMakeReport = new Button(); + comboBoxProduct = new ComboBox(); + buttonSelectFilePath = new Button(); + textBoxFilePath = new TextBox(); + SuspendLayout(); + // + // dateTimePickerEnd + // + dateTimePickerEnd.Location = new Point(176, 221); + dateTimePickerEnd.Name = "dateTimePickerEnd"; + dateTimePickerEnd.Size = new Size(200, 23); + dateTimePickerEnd.TabIndex = 0; + // + // dateTimePickerBegin + // + dateTimePickerBegin.Location = new Point(176, 156); + dateTimePickerBegin.Name = "dateTimePickerBegin"; + dateTimePickerBegin.Size = new Size(200, 23); + dateTimePickerBegin.TabIndex = 1; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(51, 156); + label1.Name = "label1"; + label1.Size = new Size(74, 15); + label1.TabIndex = 2; + label1.Text = "Дата начала"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(51, 221); + label2.Name = "label2"; + label2.Size = new Size(68, 15); + label2.TabIndex = 3; + label2.Text = "Дата конца"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(51, 99); + label3.Name = "label3"; + label3.Size = new Size(39, 15); + label3.TabIndex = 4; + label3.Text = "Товар"; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(51, 42); + label4.Name = "label4"; + label4.Size = new Size(87, 15); + label4.TabIndex = 5; + label4.Text = "Путь до файла"; + // + // buttonMakeReport + // + buttonMakeReport.Location = new Point(162, 290); + buttonMakeReport.Name = "buttonMakeReport"; + buttonMakeReport.Size = new Size(114, 23); + buttonMakeReport.TabIndex = 6; + buttonMakeReport.Text = "Сформировать"; + buttonMakeReport.UseVisualStyleBackColor = true; + buttonMakeReport.Click += ButtonMakeReport_Click; + // + // comboBoxProduct + // + comboBoxProduct.FormattingEnabled = true; + comboBoxProduct.Location = new Point(176, 96); + comboBoxProduct.Name = "comboBoxProduct"; + comboBoxProduct.Size = new Size(200, 23); + comboBoxProduct.TabIndex = 7; + // + // buttonSelectFilePath + // + buttonSelectFilePath.Location = new Point(337, 39); + buttonSelectFilePath.Name = "buttonSelectFilePath"; + buttonSelectFilePath.Size = new Size(39, 23); + buttonSelectFilePath.TabIndex = 8; + buttonSelectFilePath.Text = "..."; + buttonSelectFilePath.UseVisualStyleBackColor = true; + buttonSelectFilePath.Click += ButtonSelectFilePath_Click; + // + // textBoxFilePath + // + textBoxFilePath.Location = new Point(176, 39); + textBoxFilePath.Name = "textBoxFilePath"; + textBoxFilePath.Size = new Size(155, 23); + textBoxFilePath.TabIndex = 9; + // + // FormProductReport + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(484, 370); + Controls.Add(textBoxFilePath); + Controls.Add(buttonSelectFilePath); + Controls.Add(comboBoxProduct); + Controls.Add(buttonMakeReport); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(dateTimePickerBegin); + Controls.Add(dateTimePickerEnd); + Name = "FormProductReport"; + Text = "FormProductReport"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private DateTimePicker dateTimePickerEnd; + private DateTimePicker dateTimePickerBegin; + private Label label1; + private Label label2; + private Label label3; + private Label label4; + private Button buttonMakeReport; + private ComboBox comboBoxProduct; + private Button buttonSelectFilePath; + private TextBox textBoxFilePath; + } +} \ No newline at end of file diff --git a/GasStation/Forms/FormProductReport.cs b/GasStation/Forms/FormProductReport.cs new file mode 100644 index 0000000..8a0d927 --- /dev/null +++ b/GasStation/Forms/FormProductReport.cs @@ -0,0 +1,74 @@ +using GasStation.Reports; +using GasStation.Repositories; +using Unity; + +namespace GasStation.Forms +{ + public partial class FormProductReport : Form + { + private readonly IUnityContainer _container; + + public FormProductReport(IUnityContainer container, IProductRepository productRepository) + { + InitializeComponent(); + _container = container ?? + throw new ArgumentNullException(nameof(container)); + comboBoxProduct.DataSource = productRepository.ReadProduct(); + comboBoxProduct.DisplayMember = "ProductType"; + comboBoxProduct.ValueMember = "Id"; + } + + private void ButtonSelectFilePath_Click(object sender, EventArgs e) + { + var sfd = new SaveFileDialog() + { + Filter = "Excel Files | *.xlsx" + }; + if (sfd.ShowDialog() != DialogResult.OK) + { + return; + } + textBoxFilePath.Text = sfd.FileName; + } + + private void ButtonMakeReport_Click(object sender, EventArgs e) + { + try + { + if (string.IsNullOrWhiteSpace(textBoxFilePath.Text)) + { + throw new Exception("Отсутствует имя файла для отчета"); + } + if (comboBoxProduct.SelectedIndex < 0) + { + throw new Exception("Не выбран корм"); + } + if (dateTimePickerEnd.Value <= dateTimePickerBegin.Value) + { + throw new Exception("Дата начала должна быть раньше даты окончания"); + } + if + (_container.Resolve().CreateTable(textBoxFilePath.Text, (int)comboBoxProduct.SelectedValue!, + dateTimePickerBegin.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); + } + + } + } +} diff --git a/GasStation/Forms/FormProductReport.resx b/GasStation/Forms/FormProductReport.resx new file mode 100644 index 0000000..8b2ff64 --- /dev/null +++ b/GasStation/Forms/FormProductReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GasStation/Forms/FormSellDistRep.Designer.cs b/GasStation/Forms/FormSellDistRep.Designer.cs new file mode 100644 index 0000000..74894d5 --- /dev/null +++ b/GasStation/Forms/FormSellDistRep.Designer.cs @@ -0,0 +1,107 @@ +namespace GasStation.Reports +{ + partial class FormSellDistRep + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + buttonSelectFileName = new Button(); + buttonCreate = new Button(); + dateTimePicker = new DateTimePicker(); + label1 = new Label(); + labelFileName = new Label(); + SuspendLayout(); + // + // buttonSelectFileName + // + buttonSelectFileName.Location = new Point(37, 42); + buttonSelectFileName.Name = "buttonSelectFileName"; + buttonSelectFileName.Size = new Size(75, 23); + buttonSelectFileName.TabIndex = 0; + buttonSelectFileName.Text = "Выбрать"; + buttonSelectFileName.UseVisualStyleBackColor = true; + buttonSelectFileName.Click += ButtonSelectFileName_Click; + // + // buttonCreate + // + buttonCreate.Location = new Point(92, 143); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(124, 25); + buttonCreate.TabIndex = 1; + buttonCreate.Text = "Сформировать"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += ButtonCreate_Click; + // + // dateTimePicker + // + dateTimePicker.Location = new Point(92, 86); + dateTimePicker.Name = "dateTimePicker"; + dateTimePicker.Size = new Size(213, 23); + dateTimePicker.TabIndex = 2; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(37, 86); + label1.Name = "label1"; + label1.Size = new Size(32, 15); + label1.TabIndex = 3; + label1.Text = "Дата"; + // + // labelFileName + // + labelFileName.AutoSize = true; + labelFileName.Location = new Point(150, 50); + labelFileName.Name = "labelFileName"; + labelFileName.Size = new Size(36, 15); + labelFileName.TabIndex = 4; + labelFileName.Text = "Файл"; + // + // FormSellDistRep + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(343, 218); + Controls.Add(labelFileName); + Controls.Add(label1); + Controls.Add(dateTimePicker); + Controls.Add(buttonCreate); + Controls.Add(buttonSelectFileName); + Name = "FormSellDistRep"; + Text = "Распределение товара"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button buttonSelectFileName; + private Button buttonCreate; + private DateTimePicker dateTimePicker; + private Label label1; + private Label labelFileName; + } +} \ No newline at end of file diff --git a/GasStation/Forms/FormSellDistRep.cs b/GasStation/Forms/FormSellDistRep.cs new file mode 100644 index 0000000..87fcf97 --- /dev/null +++ b/GasStation/Forms/FormSellDistRep.cs @@ -0,0 +1,62 @@ +using Unity; + +namespace GasStation.Reports; + +public partial class FormSellDistRep : Form +{ + private string _fileName = string.Empty; + + private readonly IUnityContainer _container; + + public FormSellDistRep(IUnityContainer container) + { + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + } + + private void ButtonSelectFileName_Click(object sender, EventArgs e) + { + var sfd = new SaveFileDialog() + { + Filter = "Pdf Files | *.pdf" + }; + if (sfd.ShowDialog() == DialogResult.OK) + { + _fileName = sfd.FileName; + labelFileName.Text = Path.GetFileName(_fileName); + } + + } + + private void ButtonCreate_Click(object sender, EventArgs e) + { + try + { + if (string.IsNullOrWhiteSpace(_fileName)) + { + throw new Exception("Отсутствует имя файла для отчета"); + } + if + (_container.Resolve().CreateChart(_fileName, dateTimePicker.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); + } + + } + +} diff --git a/GasStation/Forms/FormSellDistRep.resx b/GasStation/Forms/FormSellDistRep.resx new file mode 100644 index 0000000..8b2ff64 --- /dev/null +++ b/GasStation/Forms/FormSellDistRep.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GasStation/Forms/FormSelling.cs b/GasStation/Forms/FormSelling.cs index 41be98e..94e19a8 100644 --- a/GasStation/Forms/FormSelling.cs +++ b/GasStation/Forms/FormSelling.cs @@ -61,7 +61,8 @@ namespace GasStation.Forms Convert.ToInt32(row.Cells["ColumnCount"].Value))); } - return list; + return list.GroupBy(x => x.ProductID, x => x.Count, (id, counts) => ProductSelling.CreateSelling(0, id,counts.Sum())).ToList(); + ; } } diff --git a/GasStation/GasStation.csproj b/GasStation/GasStation.csproj index 7e48435..1681080 100644 --- a/GasStation/GasStation.csproj +++ b/GasStation/GasStation.csproj @@ -10,11 +10,13 @@ + + diff --git a/GasStation/Reports/ChartReport.cs b/GasStation/Reports/ChartReport.cs new file mode 100644 index 0000000..0feaf83 --- /dev/null +++ b/GasStation/Reports/ChartReport.cs @@ -0,0 +1,42 @@ +using GasStation.Repositories; +using Microsoft.Extensions.Logging; + +namespace GasStation.Reports; + +internal class ChartReport +{ + private readonly ISellingRepository _sellingRepository; + private readonly ILogger _logger; + public ChartReport(ISellingRepository sellingRepository, ILogger logger) + { + _sellingRepository = sellingRepository ?? + throw new + ArgumentNullException(nameof(sellingRepository)); + _logger = logger ?? + throw new ArgumentNullException(nameof(logger)); + } + public bool CreateChart(string filePath, DateTime dateTime) + { + try + { + new PdfBuilder(filePath) + .AddHeader("Продажа продукта") + .AddPieChart("Проданный товар", GetData(dateTime)) + .Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + private List<(string Caption, double Value)> GetData(DateTime dateTime) + { + return _sellingRepository + .ReadSelling() + .Where(x => x.SellingDateTime.Date == dateTime.Date) + .GroupBy(x => x.GasmanId, (key, group) => new { Id = key, Count = group.Sum(x => x.Count)}) + .Select(x => (x.Id.ToString(), (double)x.Count)).ToList(); + } +} diff --git a/GasStation/Reports/DocReport.cs b/GasStation/Reports/DocReport.cs new file mode 100644 index 0000000..c28edf4 --- /dev/null +++ b/GasStation/Reports/DocReport.cs @@ -0,0 +1,89 @@ +using GasStation.Repositories; +using Microsoft.Extensions.Logging; + +namespace GasStation.Reports; + +internal class DocReport +{ + private readonly IGasmanRepository _gasmanRepository; + private readonly ISupplierRepository _supplierRepository; + private readonly IProductRepository _productRepository; + private readonly ILogger _logger; + + public DocReport(IGasmanRepository gasmanRepository, ISupplierRepository supplierRepository, + IProductRepository productRepository, ILogger logger) + { + _gasmanRepository = gasmanRepository ?? + throw new + ArgumentNullException(nameof(gasmanRepository)); + _supplierRepository = supplierRepository ?? + throw new ArgumentNullException(nameof(supplierRepository)); + _productRepository = productRepository ?? + throw new ArgumentNullException(nameof(productRepository)); + _logger = logger ?? + throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateDoc(string filePath, bool includeGasmen, bool includeSuppliers, bool includeProducts) + { + try + { + var builder = new WordBuilder(filePath) + .AddHeader("Документ со справочниками"); + if (includeGasmen) + { + builder.AddParagraph("Запрвщики") + .AddTable([2400, 2400, 2400], + GetGasmen()); + } + if (includeSuppliers) + { + builder.AddParagraph("Поставщики") + .AddTable([2400], GetSuppliers()); + } + if (includeProducts) + { + builder.AddParagraph("Товары") + .AddTable([2400, 2400], GetProducts()); + } + builder.Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + + private List GetGasmen() + { + return [ + ["Имя работника", "Телефон", "Должность"], + .. _gasmanRepository + .ReadGasman() + .Select(x => new string[] { x.GasmanName, x.PhoneNumber, x.Post.ToString() }), + ]; + } + + private List GetSuppliers() + { + return [ + ["Название поставщика"], + .. _supplierRepository + .ReadSupplier() + .Select(x => new string[] { x.SupplierName }), + ]; + } + + private List GetProducts() + { + return [ + ["Тип корма", "Название"], + .. _productRepository + .ReadProduct() + .Select(x => new string[] { x.ProductCost.ToString(), x.ProductType.ToString() }), + ]; + } + +} diff --git a/GasStation/Reports/ExcelBuilder.cs b/GasStation/Reports/ExcelBuilder.cs new file mode 100644 index 0000000..783f87f --- /dev/null +++ b/GasStation/Reports/ExcelBuilder.cs @@ -0,0 +1,307 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using DocumentFormat.OpenXml; + +namespace GasStation.Reports; + +internal 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.SimpleTextWithoutBorder); + 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 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.SimpleTextWithoutBorder); + } + _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.SimpleTextWithoutBorder); + } + _rowIndex++; + } + for (var j = 0; j < data.Last().Length; ++j) + { + CreateCell(j, _rowIndex, data.Last()[j], + StyleIndex.SimpleTextWithoutBorder); + } + _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.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().First()); + } + } + private static void GenerateStyle(WorkbookPart workbookPart) + { + var workbookStylesPart = + workbookPart.AddNewPart(); + 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.Minor) + }, + Bold = new Bold() { Val = true } + }); + workbookStylesPart.Stylesheet.Append(fonts); + + // Default Fill + var fills = new Fills() { Count = 1 }; + fills.Append(new Fill + { + PatternFill = new PatternFill() + { + PatternType = new EnumValue(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.Thin }, + RightBorder = new RightBorder() { Style = BorderStyleValues.Thin }, + TopBorder = new TopBorder() { Style = BorderStyleValues.Thin }, + BottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin }, + DiagonalBorder = new DiagonalBorder() + }); + 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 = 0, + FormatId = 0, + FontId = 1, + BorderId = 0, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Left, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + FormatId = 0, + FontId = 0, + BorderId = 1, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Left, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + 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, + BoldTextWithoutBorder = 1, + SimpleTextWithBorder = 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().FirstOrDefault(r => r.RowIndex! + == rowIndex); + if (row == null) + { + row = new Row() { RowIndex = rowIndex }; + _sheetData.Append(row); + } + var newCell = row.Elements() + .FirstOrDefault(c => c.CellReference != null && + c.CellReference.Value == columnName + rowIndex); + if (newCell == null) + { + Cell? refCell = null; + foreach (Cell cell in row.Elements()) + { + 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; + } +} diff --git a/GasStation/Reports/PdfBuilder.cs b/GasStation/Reports/PdfBuilder.cs new file mode 100644 index 0000000..6548ccb --- /dev/null +++ b/GasStation/Reports/PdfBuilder.cs @@ -0,0 +1,75 @@ +using MigraDoc.DocumentObjectModel; +using MigraDoc.DocumentObjectModel.Shapes.Charts; +using MigraDoc.Rendering; + +namespace GasStation.Reports; + +internal 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() + { + var renderer = new PdfDocumentRenderer(true) + { + Document = _document + }; + renderer.RenderDocument(); + renderer.PdfDocument.Save(_filePath); + } + private void DefineStyles() + { + var headerStyle = _document.Styles.AddStyle("NormalBold", "Normal"); + headerStyle.Font.Bold = true; + headerStyle.Font.Size = 14; + } + +} diff --git a/GasStation/Reports/TableReport.cs b/GasStation/Reports/TableReport.cs new file mode 100644 index 0000000..c8e5d44 --- /dev/null +++ b/GasStation/Reports/TableReport.cs @@ -0,0 +1,65 @@ +using GasStation.Repositories; +using Microsoft.Extensions.Logging; + +namespace GasStation.Reports; + +internal class TableReport +{ + private readonly ISupplyRepository _supplyRepository; + private readonly ISellingRepository _sellingRepository; + private readonly ILogger _logger; + + internal static readonly string[] item = ["Сотрудник", "Дата", "Количество пришло", "Количество ушло"]; + public TableReport(ISupplyRepository supplyRepository, ISellingRepository sellingRepository, + ILogger logger) + { + _supplyRepository = supplyRepository ?? + throw new + ArgumentNullException(nameof(supplyRepository)); + _sellingRepository = sellingRepository ?? + throw new + ArgumentNullException(nameof(sellingRepository)); + _logger = logger ?? + throw new ArgumentNullException(nameof(logger)); + } + public bool CreateTable(string filePath, int productId, DateTime startDate, DateTime endDate) + { + try + { + new ExcelBuilder(filePath) + .AddHeader("Сводка по движению товара", 0, 4) + .AddParagraph("за период", 0) + .AddTable([10, 10, 15, 15], GetData(productId, startDate, endDate)) + .Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + private List GetData(int productId, DateTime startDate, DateTime endDate) + { + var data = _supplyRepository + .ReadSupply() + .Where(x => x.SupplyDate >= startDate && x.SupplyDate <= endDate) + .Select(x => new { x.SupplierID, Date = x.SupplyDate, CountIn = (int?)x.Count, CountOut = (int?)null }) + .Union( + _sellingRepository + .ReadSelling() + .Where(x => x.SellingDateTime >= startDate && x.SellingDateTime <= endDate && x.ProdutcSellings.Any(y => y.ProductID == productId)) + .Select(x => new {x.GasmanId, Date = x.SellingDateTime, CountIn = (int?)null, + CountOut = x.ProdutcSellings.FirstOrDefault(y => y.ProductID == productId)?.Count }) + ) + .OrderBy(x => x.Date); + + return new List() { item }.Union(data + .Select(x => + new string[] { x.GasmanId.ToString(), x.Date.ToString(), x.CountIn?.ToString() ?? + string.Empty, x.CountOut?.ToString() ?? string.Empty})) + .Union( + [["Всего", "", data.Sum(x => x.CountIn ?? 0).ToString(), data.Sum(x => x.CountOut ?? 0).ToString()]] + ).ToList(); + } +} diff --git a/GasStation/Reports/WordBuilder.cs b/GasStation/Reports/WordBuilder.cs new file mode 100644 index 0000000..92536cd --- /dev/null +++ b/GasStation/Reports/WordBuilder.cs @@ -0,0 +1,104 @@ +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; + +namespace GasStation.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()); + var runProperties = run.AppendChild(new RunProperties()); + runProperties.AppendChild(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 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.Single), Size = 12 }, + new BottomBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 }, + new LeftBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 }, + new RightBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 }, + new InsideHorizontalBorder() { Val = new EnumValue(BorderValues.Single), Size = 12 }, + new InsideVerticalBorder() { Val = new EnumValue(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; + } + +} diff --git a/GasStation/Repositories/Implementations/SellingRepository.cs b/GasStation/Repositories/Implementations/SellingRepository.cs index 7451ede..10230c0 100644 --- a/GasStation/Repositories/Implementations/SellingRepository.cs +++ b/GasStation/Repositories/Implementations/SellingRepository.cs @@ -55,10 +55,13 @@ VALUES (@Id, @ProductID, @Count)"; try { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); - var querySelect = @"SELECT * FROM selling"; - var selling = connection.Query(querySelect); + var querySelect = @" +SELECT s.*, ps.ProductID, ps.Count FROM selling s +INNER JOIN ProductSelling ps ON ps.SellingId = s.Id"; + var selling = connection.Query(querySelect); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(selling)); - return selling; + return selling.GroupBy(x => x.Id, y => y, (key, value) => + Selling.CreateSelling(value.First(), value.Select(z => ProductSelling.CreateSelling(0, z.ProductID, z.Count)))).ToList(); } catch (Exception ex) {