diff --git a/ProjectGasStation.zip b/ProjectGasStation.zip new file mode 100644 index 0000000..36a49ae Binary files /dev/null and b/ProjectGasStation.zip differ diff --git a/ProjectGasStation/ProjectGasStation/Entities/Receipt.cs b/ProjectGasStation/ProjectGasStation/Entities/Receipt.cs index 74f3490..83f0355 100644 --- a/ProjectGasStation/ProjectGasStation/Entities/Receipt.cs +++ b/ProjectGasStation/ProjectGasStation/Entities/Receipt.cs @@ -29,4 +29,15 @@ public class Receipt }; } + public static Receipt CreateOperation(TempSaleReceiptProduct tempSaleReceiptProduct, IEnumerable receiptProducts) + { + return new Receipt + { + Id = tempSaleReceiptProduct.Id, + DateTime = tempSaleReceiptProduct.DateTime, + SupplierId = tempSaleReceiptProduct.SupplierId, + ReceiptProducts = receiptProducts + }; + } + } diff --git a/ProjectGasStation/ProjectGasStation/Entities/Sale.cs b/ProjectGasStation/ProjectGasStation/Entities/Sale.cs index 0e6bc6b..c35ae39 100644 --- a/ProjectGasStation/ProjectGasStation/Entities/Sale.cs +++ b/ProjectGasStation/ProjectGasStation/Entities/Sale.cs @@ -25,4 +25,15 @@ public class Sale }; } + + public static Sale CreateOperation(TempSaleReceiptProduct tempSaleReceiptProduct, IEnumerable saleProducts) + { + return new Sale + { + Id = tempSaleReceiptProduct.Id, + DateTime = tempSaleReceiptProduct.DateTime, + WorkerId = tempSaleReceiptProduct.WorkerId, + SaleProducts = saleProducts + }; + } } diff --git a/ProjectGasStation/ProjectGasStation/Entities/TempSaleReceiptProduct.cs b/ProjectGasStation/ProjectGasStation/Entities/TempSaleReceiptProduct.cs new file mode 100644 index 0000000..04a4db2 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Entities/TempSaleReceiptProduct.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectGasStation.Entities; + +public class TempSaleReceiptProduct +{ + public int Id { get; private set; } + public DateTime DateTime { get; private set; } + public int SupplierId { get; private set; } + + public int WorkerId { get; private set; } + public int ProductId { get; private set; } + + public int Quantity { get; private set; } +} diff --git a/ProjectGasStation/ProjectGasStation/FormGasStation.Designer.cs b/ProjectGasStation/ProjectGasStation/FormGasStation.Designer.cs index 722bce8..0965d00 100644 --- a/ProjectGasStation/ProjectGasStation/FormGasStation.Designer.cs +++ b/ProjectGasStation/ProjectGasStation/FormGasStation.Designer.cs @@ -30,33 +30,36 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormGasStation)); menuStrip1 = new MenuStrip(); - спрафочникиToolStripMenuItem = new ToolStripMenuItem(); + ListsToolStripMenuItem = new ToolStripMenuItem(); ProductToolStripMenuItem = new ToolStripMenuItem(); WorkerToolStripMenuItem = new ToolStripMenuItem(); SupplierToolStripMenuItem = new ToolStripMenuItem(); - операцииToolStripMenuItem = new ToolStripMenuItem(); + OperationsToolStripMenuItem = new ToolStripMenuItem(); ReceiptToolStripMenuItem = new ToolStripMenuItem(); SaleToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); + ReportsToolStripMenuItem = new ToolStripMenuItem(); + DirectoryReportToolStripMenuItem = new ToolStripMenuItem(); + productReportToolStripMenuItem = new ToolStripMenuItem(); + SalesToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // // menuStrip1 // menuStrip1.ImageScalingSize = new Size(20, 20); - menuStrip1.Items.AddRange(new ToolStripItem[] { спрафочникиToolStripMenuItem, операцииToolStripMenuItem, отчетыToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { ListsToolStripMenuItem, OperationsToolStripMenuItem, ReportsToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new Size(782, 28); menuStrip1.TabIndex = 0; menuStrip1.Text = "menuStrip"; // - // спрафочникиToolStripMenuItem + // ListsToolStripMenuItem // - спрафочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ProductToolStripMenuItem, WorkerToolStripMenuItem, SupplierToolStripMenuItem }); - спрафочникиToolStripMenuItem.Name = "спрафочникиToolStripMenuItem"; - спрафочникиToolStripMenuItem.Size = new Size(117, 24); - спрафочникиToolStripMenuItem.Text = "Справочники"; + ListsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ProductToolStripMenuItem, WorkerToolStripMenuItem, SupplierToolStripMenuItem }); + ListsToolStripMenuItem.Name = "ListsToolStripMenuItem"; + ListsToolStripMenuItem.Size = new Size(117, 24); + ListsToolStripMenuItem.Text = "Справочники"; // // ProductToolStripMenuItem // @@ -79,12 +82,12 @@ SupplierToolStripMenuItem.Text = "Поставщики"; SupplierToolStripMenuItem.Click += SupplierToolStripMenuItem_Click; // - // операцииToolStripMenuItem + // OperationsToolStripMenuItem // - операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ReceiptToolStripMenuItem, SaleToolStripMenuItem }); - операцииToolStripMenuItem.Name = "операцииToolStripMenuItem"; - операцииToolStripMenuItem.Size = new Size(95, 24); - операцииToolStripMenuItem.Text = "Операции"; + OperationsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ReceiptToolStripMenuItem, SaleToolStripMenuItem }); + OperationsToolStripMenuItem.Name = "OperationsToolStripMenuItem"; + OperationsToolStripMenuItem.Size = new Size(95, 24); + OperationsToolStripMenuItem.Text = "Операции"; // // ReceiptToolStripMenuItem // @@ -100,11 +103,36 @@ SaleToolStripMenuItem.Text = "Продажи"; SaleToolStripMenuItem.Click += SaleToolStripMenuItem_Click; // - // отчетыToolStripMenuItem + // ReportsToolStripMenuItem // - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(73, 24); - отчетыToolStripMenuItem.Text = "Отчеты"; + ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem, productReportToolStripMenuItem, SalesToolStripMenuItem }); + ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem"; + ReportsToolStripMenuItem.Size = new Size(73, 24); + ReportsToolStripMenuItem.Text = "Отчеты"; + // + // DirectoryReportToolStripMenuItem + // + DirectoryReportToolStripMenuItem.Name = "DirectoryReportToolStripMenuItem"; + DirectoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W; + DirectoryReportToolStripMenuItem.Size = new Size(344, 26); + DirectoryReportToolStripMenuItem.Text = "Докумен со справочниками"; + DirectoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click; + // + // productReportToolStripMenuItem + // + productReportToolStripMenuItem.Name = "productReportToolStripMenuItem"; + productReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E; + productReportToolStripMenuItem.Size = new Size(344, 26); + productReportToolStripMenuItem.Text = "Движение товара"; + productReportToolStripMenuItem.Click += productReportToolStripMenuItem_Click; + // + // SalesToolStripMenuItem + // + SalesToolStripMenuItem.Name = "SalesToolStripMenuItem"; + SalesToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P; + SalesToolStripMenuItem.Size = new Size(344, 26); + SalesToolStripMenuItem.Text = "Продажи"; + SalesToolStripMenuItem.Click += SalesToolStripMenuItem_Click; // // FormGasStation // @@ -127,13 +155,16 @@ #endregion private MenuStrip menuStrip1; - private ToolStripMenuItem спрафочникиToolStripMenuItem; - private ToolStripMenuItem операцииToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; + private ToolStripMenuItem ListsToolStripMenuItem; + private ToolStripMenuItem OperationsToolStripMenuItem; + private ToolStripMenuItem ReportsToolStripMenuItem; private ToolStripMenuItem ProductToolStripMenuItem; private ToolStripMenuItem WorkerToolStripMenuItem; private ToolStripMenuItem SupplierToolStripMenuItem; private ToolStripMenuItem ReceiptToolStripMenuItem; private ToolStripMenuItem SaleToolStripMenuItem; + private ToolStripMenuItem DirectoryReportToolStripMenuItem; + private ToolStripMenuItem productReportToolStripMenuItem; + private ToolStripMenuItem SalesToolStripMenuItem; } } diff --git a/ProjectGasStation/ProjectGasStation/FormGasStation.cs b/ProjectGasStation/ProjectGasStation/FormGasStation.cs index 9354a89..d79aff4 100644 --- a/ProjectGasStation/ProjectGasStation/FormGasStation.cs +++ b/ProjectGasStation/ProjectGasStation/FormGasStation.cs @@ -85,5 +85,44 @@ namespace ProjectGasStation } } + + 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 SalesToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } } diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.Designer.cs b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.Designer.cs new file mode 100644 index 0000000..4185ae4 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.Designer.cs @@ -0,0 +1,99 @@ +namespace ProjectGasStation.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() + { + checkBoxProducts = new CheckBox(); + checkBoxWorkers = new CheckBox(); + checkBoxSuppliers = new CheckBox(); + buttonBuild = new Button(); + SuspendLayout(); + // + // checkBoxProducts + // + checkBoxProducts.AutoSize = true; + checkBoxProducts.Location = new Point(28, 29); + checkBoxProducts.Name = "checkBoxProducts"; + checkBoxProducts.Size = new Size(84, 24); + checkBoxProducts.TabIndex = 0; + checkBoxProducts.Text = "Товары"; + checkBoxProducts.UseVisualStyleBackColor = true; + // + // checkBoxWorkers + // + checkBoxWorkers.AutoSize = true; + checkBoxWorkers.Location = new Point(28, 77); + checkBoxWorkers.Name = "checkBoxWorkers"; + checkBoxWorkers.Size = new Size(113, 24); + checkBoxWorkers.TabIndex = 1; + checkBoxWorkers.Text = "Сотрудники"; + checkBoxWorkers.UseVisualStyleBackColor = true; + // + // checkBoxSuppliers + // + checkBoxSuppliers.AutoSize = true; + checkBoxSuppliers.Location = new Point(28, 125); + checkBoxSuppliers.Name = "checkBoxSuppliers"; + checkBoxSuppliers.Size = new Size(117, 24); + checkBoxSuppliers.TabIndex = 2; + checkBoxSuppliers.Text = "Поставщики"; + checkBoxSuppliers.UseVisualStyleBackColor = true; + // + // buttonBuild + // + buttonBuild.Location = new Point(207, 55); + buttonBuild.Name = "buttonBuild"; + buttonBuild.Size = new Size(129, 66); + buttonBuild.TabIndex = 3; + buttonBuild.Text = "Сформировать отчет"; + buttonBuild.UseVisualStyleBackColor = true; + buttonBuild.Click += buttonBuild_Click; + // + // FormDirectoryReport + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(383, 196); + Controls.Add(buttonBuild); + Controls.Add(checkBoxSuppliers); + Controls.Add(checkBoxWorkers); + Controls.Add(checkBoxProducts); + Name = "FormDirectoryReport"; + Text = "FormDirectoryReport"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private CheckBox checkBoxProducts; + private CheckBox checkBoxWorkers; + private CheckBox checkBoxSuppliers; + private Button buttonBuild; + } +} \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.cs b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.cs new file mode 100644 index 0000000..b9bc8df --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.cs @@ -0,0 +1,66 @@ +using ProjectGasStation.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 ProjectGasStation.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 (!checkBoxProducts.Checked && + !checkBoxWorkers.Checked && !checkBoxSuppliers.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, checkBoxProducts.Checked, + checkBoxWorkers.Checked, checkBoxSuppliers.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/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.resx b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/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/ProjectGasStation/ProjectGasStation/Forms/FormProductReport.Designer.cs b/ProjectGasStation/ProjectGasStation/Forms/FormProductReport.Designer.cs new file mode 100644 index 0000000..fa2e3e6 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormProductReport.Designer.cs @@ -0,0 +1,163 @@ +namespace ProjectGasStation.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() + { + dateTimePickerBegin = new DateTimePicker(); + dateTimePickerEnd = new DateTimePicker(); + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + label4 = new Label(); + buttonMakeReport = new Button(); + buttonSelectPathFile = new Button(); + textBoxFilePath = new TextBox(); + comboBoxProduct = new ComboBox(); + SuspendLayout(); + // + // dateTimePickerBegin + // + dateTimePickerBegin.Location = new Point(175, 148); + dateTimePickerBegin.Name = "dateTimePickerBegin"; + dateTimePickerBegin.Size = new Size(250, 27); + dateTimePickerBegin.TabIndex = 0; + // + // dateTimePickerEnd + // + dateTimePickerEnd.Location = new Point(175, 200); + dateTimePickerEnd.Name = "dateTimePickerEnd"; + dateTimePickerEnd.Size = new Size(250, 27); + dateTimePickerEnd.TabIndex = 1; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(24, 36); + label1.Name = "label1"; + label1.Size = new Size(109, 20); + label1.TabIndex = 2; + label1.Text = "Путь до файла"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(24, 91); + label2.Name = "label2"; + label2.Size = new Size(51, 20); + label2.TabIndex = 3; + label2.Text = "Товар"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(24, 148); + label3.Name = "label3"; + label3.Size = new Size(98, 20); + label3.TabIndex = 4; + label3.Text = "Дата начала "; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(24, 205); + label4.Name = "label4"; + label4.Size = new Size(125, 20); + label4.TabIndex = 5; + label4.Text = "Дата окончания "; + // + // buttonMakeReport + // + buttonMakeReport.Location = new Point(110, 243); + buttonMakeReport.Name = "buttonMakeReport"; + buttonMakeReport.Size = new Size(211, 43); + buttonMakeReport.TabIndex = 6; + buttonMakeReport.Text = "Сформировать отчет"; + buttonMakeReport.UseVisualStyleBackColor = true; + buttonMakeReport.Click += buttonMakeReport_Click; + // + // buttonSelectPathFile + // + buttonSelectPathFile.Location = new Point(389, 36); + buttonSelectPathFile.Name = "buttonSelectPathFile"; + buttonSelectPathFile.Size = new Size(36, 29); + buttonSelectPathFile.TabIndex = 7; + buttonSelectPathFile.Text = "..."; + buttonSelectPathFile.UseVisualStyleBackColor = true; + buttonSelectPathFile.Click += buttonSelectPathFile_Click; + // + // textBoxFilePath + // + textBoxFilePath.Location = new Point(175, 36); + textBoxFilePath.Name = "textBoxFilePath"; + textBoxFilePath.ReadOnly = true; + textBoxFilePath.Size = new Size(209, 27); + textBoxFilePath.TabIndex = 8; + // + // comboBoxProduct + // + comboBoxProduct.FormattingEnabled = true; + comboBoxProduct.Location = new Point(175, 91); + comboBoxProduct.Name = "comboBoxProduct"; + comboBoxProduct.Size = new Size(250, 28); + comboBoxProduct.TabIndex = 9; + // + // FormProductReport + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(458, 309); + Controls.Add(comboBoxProduct); + Controls.Add(textBoxFilePath); + Controls.Add(buttonSelectPathFile); + Controls.Add(buttonMakeReport); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(dateTimePickerEnd); + Controls.Add(dateTimePickerBegin); + Name = "FormProductReport"; + Text = "FormProductReport"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private DateTimePicker dateTimePickerBegin; + private DateTimePicker dateTimePickerEnd; + private Label label1; + private Label label2; + private Label label3; + private Label label4; + private Button buttonMakeReport; + private Button buttonSelectPathFile; + private TextBox textBoxFilePath; + private ComboBox comboBoxProduct; + } +} \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormProductReport.cs b/ProjectGasStation/ProjectGasStation/Forms/FormProductReport.cs new file mode 100644 index 0000000..6cff868 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormProductReport.cs @@ -0,0 +1,80 @@ +using ProjectGasStation.Reports; +using ProjectGasStation.Repositories; +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 ProjectGasStation.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 = "Name"; + comboBoxProduct.ValueMember = "Id"; + } + + private void buttonSelectPathFile_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/ProjectGasStation/ProjectGasStation/Forms/FormProductReport.resx b/ProjectGasStation/ProjectGasStation/Forms/FormProductReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/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/ProjectGasStation/ProjectGasStation/Forms/FormReceipt.cs b/ProjectGasStation/ProjectGasStation/Forms/FormReceipt.cs index 53c9726..fea32c2 100644 --- a/ProjectGasStation/ProjectGasStation/Forms/FormReceipt.cs +++ b/ProjectGasStation/ProjectGasStation/Forms/FormReceipt.cs @@ -69,7 +69,8 @@ namespace ProjectGasStation.Forms } list.Add(SaleReceiptProduct.CreateElement(0, Convert.ToInt32(row.Cells["ColumnProduct"].Value), Convert.ToInt32(row.Cells["ColumnQuantity"].Value))); } - return list; + return list.GroupBy(x => x.ProductId, x => x.Quantity, (id, counts) => + SaleReceiptProduct.CreateElement(0, id, counts.Sum())).ToList(); } } diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormReceipts.cs b/ProjectGasStation/ProjectGasStation/Forms/FormReceipts.cs index ff66b5a..52bd604 100644 --- a/ProjectGasStation/ProjectGasStation/Forms/FormReceipts.cs +++ b/ProjectGasStation/ProjectGasStation/Forms/FormReceipts.cs @@ -1,4 +1,6 @@ -using ProjectGasStation.Repositories; +using Npgsql; +using ProjectGasStation.Repositories; +using ProjectGasStation.Repositories.Implementations; using System; using System.Collections.Generic; using System.ComponentModel; @@ -71,6 +73,7 @@ namespace ProjectGasStation.Forms } try { + _receiptRepository.DeleteReceipt(findId); LoadList(); } @@ -100,4 +103,6 @@ namespace ProjectGasStation.Forms } + + } diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormSale.cs b/ProjectGasStation/ProjectGasStation/Forms/FormSale.cs index 7a0adf0..7a78602 100644 --- a/ProjectGasStation/ProjectGasStation/Forms/FormSale.cs +++ b/ProjectGasStation/ProjectGasStation/Forms/FormSale.cs @@ -63,7 +63,8 @@ namespace ProjectGasStation.Forms } list.Add(SaleReceiptProduct.CreateElement(0, Convert.ToInt32(row.Cells["ColumnProduct"].Value), Convert.ToInt32(row.Cells["ColumnQuantity"].Value))); } - return list; + return list.GroupBy(x => x.ProductId, x => x.Quantity, (id, counts) => + SaleReceiptProduct.CreateElement(0, id, counts.Sum())).ToList(); } } } diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormSaleDistributionReport.Designer.cs b/ProjectGasStation/ProjectGasStation/Forms/FormSaleDistributionReport.Designer.cs new file mode 100644 index 0000000..aa4c323 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormSaleDistributionReport.Designer.cs @@ -0,0 +1,107 @@ +namespace ProjectGasStation.Forms +{ + partial class FormSaleDistributionReport + { + /// + /// 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(); + buttonMakeReport = new Button(); + labelFileName = new Label(); + label2 = new Label(); + dateTimePicker = new DateTimePicker(); + SuspendLayout(); + // + // buttonSelectFileName + // + buttonSelectFileName.Location = new Point(30, 34); + buttonSelectFileName.Name = "buttonSelectFileName"; + buttonSelectFileName.Size = new Size(94, 29); + buttonSelectFileName.TabIndex = 0; + buttonSelectFileName.Text = "Выбрать"; + buttonSelectFileName.UseVisualStyleBackColor = true; + buttonSelectFileName.Click += buttonSelectFileName_Click; + // + // buttonMakeReport + // + buttonMakeReport.Location = new Point(119, 137); + buttonMakeReport.Name = "buttonMakeReport"; + buttonMakeReport.Size = new Size(153, 37); + buttonMakeReport.TabIndex = 1; + buttonMakeReport.Text = "Сформировать"; + buttonMakeReport.UseVisualStyleBackColor = true; + buttonMakeReport.Click += buttonMakeReport_Click; + // + // labelFileName + // + labelFileName.AutoSize = true; + labelFileName.Location = new Point(152, 38); + labelFileName.Name = "labelFileName"; + labelFileName.Size = new Size(45, 20); + labelFileName.TabIndex = 2; + labelFileName.Text = "Файл"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(30, 92); + label2.Name = "label2"; + label2.Size = new Size(41, 20); + label2.TabIndex = 3; + label2.Text = "Дата"; + // + // dateTimePicker + // + dateTimePicker.Location = new Point(96, 87); + dateTimePicker.Name = "dateTimePicker"; + dateTimePicker.Size = new Size(258, 27); + dateTimePicker.TabIndex = 4; + // + // FormSaleDistributionReport + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(387, 186); + Controls.Add(dateTimePicker); + Controls.Add(label2); + Controls.Add(labelFileName); + Controls.Add(buttonMakeReport); + Controls.Add(buttonSelectFileName); + Name = "FormSaleDistributionReport"; + Text = "FormSaleDistributionReport"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button buttonSelectFileName; + private Button buttonMakeReport; + private Label labelFileName; + private Label label2; + private DateTimePicker dateTimePicker; + } +} \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormSaleDistributionReport.cs b/ProjectGasStation/ProjectGasStation/Forms/FormSaleDistributionReport.cs new file mode 100644 index 0000000..ea0327f --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormSaleDistributionReport.cs @@ -0,0 +1,74 @@ +using ProjectGasStation.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 ProjectGasStation.Forms +{ + public partial class FormSaleDistributionReport : Form + { + + private string _fileName = string.Empty; + private readonly IUnityContainer _container; + + public FormSaleDistributionReport(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 buttonMakeReport_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/ProjectGasStation/ProjectGasStation/Forms/FormSaleDistributionReport.resx b/ProjectGasStation/ProjectGasStation/Forms/FormSaleDistributionReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormSaleDistributionReport.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/ProjectGasStation/ProjectGasStation/ProjectGasStation.csproj b/ProjectGasStation/ProjectGasStation/ProjectGasStation.csproj index 17c594d..99367f1 100644 --- a/ProjectGasStation/ProjectGasStation/ProjectGasStation.csproj +++ b/ProjectGasStation/ProjectGasStation/ProjectGasStation.csproj @@ -10,11 +10,13 @@ + + diff --git a/ProjectGasStation/ProjectGasStation/Reports/ChartReport.cs b/ProjectGasStation/ProjectGasStation/Reports/ChartReport.cs new file mode 100644 index 0000000..449db06 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/ChartReport.cs @@ -0,0 +1,47 @@ +using Microsoft.Extensions.Logging; +using ProjectGasStation.Repositories; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectGasStation.Reports; + +internal class ChartReport +{ + private readonly ISaleRepository _saleRepository; + private readonly ILogger _logger; + public ChartReport(ISaleRepository saleRepository, ILogger logger) + { + _saleRepository = saleRepository + ?? throw new ArgumentNullException(nameof(saleRepository)); + _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 _saleRepository + .ReadSale() + .Where(x => x.DateTime.Date == dateTime.Date) + .GroupBy(x => x.WorkerId, (key, group) => new { Id = key, Count = group.Sum(y => y.SaleProducts.Count()) }) + .Select(x => (x.Id.ToString(), (double)x.Count)) + .ToList(); + } +} diff --git a/ProjectGasStation/ProjectGasStation/Reports/DocReport.cs b/ProjectGasStation/ProjectGasStation/Reports/DocReport.cs new file mode 100644 index 0000000..70c4eeb --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/DocReport.cs @@ -0,0 +1,96 @@ +using Microsoft.Extensions.Logging; +using ProjectGasStation.Repositories; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectGasStation.Reports; + +internal class DocReport +{ + private readonly IProductRepository _productRepository; + private readonly IWorkerRepository _workerRepository; + private readonly ISupplierRepository _supplierRepository; + private readonly ILogger _logger; + public DocReport(IProductRepository productRepository, IWorkerRepository + workerRepository, ISupplierRepository supplierRepository, ILogger logger) + { + _productRepository = productRepository ?? + throw new ArgumentNullException(nameof(productRepository)); + _workerRepository = workerRepository ?? + throw new ArgumentNullException(nameof(workerRepository)); + _supplierRepository = supplierRepository ?? + throw new ArgumentNullException(nameof(supplierRepository)); + _logger = logger ?? + throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateDoc(string filePath, bool includeProducts, bool includeWorkers, bool includeSuppliers) + { + try + { + var builder = new WordBuilder(filePath) + .AddHeader("Документ со справочниками"); + if (includeProducts) + { + builder.AddParagraph("Продукты") + .AddTable([2400, 2400, 1200], + GetProducts()); + } + if (includeWorkers) + { + builder.AddParagraph("Сотрудники") + .AddTable([2400, 2400], + GetWorkers()); + } + if (includeSuppliers) + { + builder.AddParagraph("Поставщики") + .AddTable([2400, 2400, 2400], + GetSuppliers()); + } + builder.Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + + private List GetProducts() + { + return [ + ["Название", "Цена", "Категория"], + .. _productRepository + .ReadProduct() + .Select(x => new string[] { x.Name, x.Price.ToString(), x.Category.ToString() }), + ]; + } + + private List GetWorkers() + { + return [ + ["ФИО", "Должность"], + .. _workerRepository + .ReadWorker() + .Select(x => new string[] { x.Name, x.JobTitle.ToString()}), + ]; + } + + private List GetSuppliers() + { + return [ + ["Название" + + "ФИО", "Номер телефона", "Адрес"], + .. _supplierRepository + .ReadSupplier() + .Select(x => new string[] { x.Name, x.PhoneNumber.ToString(), x.Address.ToString() }), + ]; + } + + +} diff --git a/ProjectGasStation/ProjectGasStation/Reports/ExcelBuilder.cs b/ProjectGasStation/ProjectGasStation/Reports/ExcelBuilder.cs new file mode 100644 index 0000000..ae7c890 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/ExcelBuilder.cs @@ -0,0 +1,342 @@ +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectGasStation.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.SimpleTextWithBorder); + 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 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.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.BoldTextWithoutBorder); + } + _rowIndex++; + } + for (var j = 0; j < data.Last().Length; ++j) + { + CreateCell(j, _rowIndex, data.Last()[j], + StyleIndex.BoldTextWithoutBorder); + } + _rowIndex++; + return this; + } + + public ExcelBuilder AddParagraph(string text, int columnIndex) + { + CreateCell(columnIndex, _rowIndex++, text, + StyleIndex.SimpleTextWithoutBorder); + 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) + } + }); + // шрифт с жирным + 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.Minor) + } + }); + + 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() + }); + // настройкa с границами + 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 + } + }); + // TODO дополнить форматы + + cellFormats.Append(new CellFormat + { + NumberFormatId = 1, + FormatId = 0, + FontId = 1, + BorderId = 0, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Left, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + cellFormats.Append(new CellFormat + { + NumberFormatId = 2, + FormatId = 0, + FontId = 0, + BorderId = 1, + 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().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/ProjectGasStation/ProjectGasStation/Reports/PdfBuilder.cs b/ProjectGasStation/ProjectGasStation/Reports/PdfBuilder.cs new file mode 100644 index 0000000..d4bbbc3 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/PdfBuilder.cs @@ -0,0 +1,89 @@ +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; +using Color = MigraDoc.DocumentObjectModel.Color; + +namespace ProjectGasStation.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() + { + 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.DarkRed; + } +} diff --git a/ProjectGasStation/ProjectGasStation/Reports/TableReport.cs b/ProjectGasStation/ProjectGasStation/Reports/TableReport.cs new file mode 100644 index 0000000..7488758 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/TableReport.cs @@ -0,0 +1,77 @@ +using Microsoft.Extensions.Logging; +using ProjectGasStation.Repositories; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectGasStation.Reports; + +internal class TableReport +{ + private readonly IReceiptRepository _receiptRepository; + private readonly ISaleRepository _saleRepository; + private readonly ILogger _logger; + + internal static readonly string[] item = ["Сотрудник", "Поставщик", "Дата", "Количество пришло", "Количество ушло"]; + + + public TableReport(IReceiptRepository receiptRepository, ISaleRepository saleRepository, ILogger logger) + { + _receiptRepository = receiptRepository ?? + throw new ArgumentNullException(nameof(receiptRepository)); + _saleRepository = saleRepository ?? + throw new ArgumentNullException(nameof(saleRepository)); + _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, 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 = _receiptRepository + .ReadReceipt() + .Where(x => x.DateTime >= startDate && x.DateTime <= endDate && x.ReceiptProducts.Any(y => y.ProductId == productId)) + .Select(x => new { WorkerId = (int?)null, SupplierId = (int?)null, Date = x.DateTime, CountIn = x.ReceiptProducts.FirstOrDefault(y => y.ProductId == productId)?.Quantity, CountOut = (int?)null }) + .Union( + _saleRepository + .ReadSale() + .Where(x => x.DateTime >= startDate && x.DateTime <= endDate && x.SaleProducts.Any(y => y.ProductId == productId)) + .Select(x => new { WorkerId = (int?)null, SupplierId = (int?)null, Date = x.DateTime, CountIn = (int?)null, CountOut = x.SaleProducts.FirstOrDefault(y => y.ProductId == productId)?.Quantity })) + .OrderBy(x => x.Date); + + + _logger.LogInformation("Объединенные данные: {0}", string.Join(", ", data.Select(d => d.Date.ToString()))); + + return + new List() { item } + .Union( + data + .Select(x => new string[] {x.WorkerId.ToString(), x.SupplierId.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/ProjectGasStation/ProjectGasStation/Reports/WordBuilder.cs b/ProjectGasStation/ProjectGasStation/Reports/WordBuilder.cs new file mode 100644 index 0000000..a22ebd0 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/WordBuilder.cs @@ -0,0 +1,137 @@ +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 ProjectGasStation.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 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/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ReceiptRepository.cs b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ReceiptRepository.cs index dcff6f9..36c2d36 100644 --- a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ReceiptRepository.cs +++ b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ReceiptRepository.cs @@ -65,9 +65,15 @@ VALUES (@ProductID, @ReceiptID, @Quantity)"; using var connection = new NpgsqlConnection(_conectionString.ConectionString); connection.Open(); - var queryDelete = @" DELETE FROM Receipt -WHERE ID = @id"; - connection.Execute(queryDelete, new { id }); + // Удаляем записи из таблицы ReceiptProducts, связанные с текущим Receipt + var queryDeleteReceiptProducts = @" DELETE FROM ReceiptProducts + WHERE ReceiptId = @id"; + connection.Execute(queryDeleteReceiptProducts, new { id }); + + // Удаляем запись из таблицы Receipt + var queryDeleteReceipt = @" DELETE FROM Receipt + WHERE ID = @id"; + connection.Execute(queryDeleteReceipt, new { id }); } catch (Exception ex) { @@ -84,11 +90,14 @@ WHERE ID = @id"; { using var connection = new NpgsqlConnection(_conectionString.ConectionString); connection.Open(); - var querySelect = @" SELECT * FROM Receipt"; - var receipt = connection.Query(querySelect); + var querySelect = @" SELECT fr.*, ffr.ProductId, ffr. Quantity FROM Receipt fr +INNER JOIN ReceiptProducts ffr ON ffr.ReceiptId = fr.Id"; + var receipt = connection.Query(querySelect); _logger.LogDebug("Получены объекты: {json}", JsonConvert.SerializeObject(receipt)); - return receipt; + return receipt.GroupBy(x => x.Id, y => y, + (key, value) => Receipt.CreateOperation(value.First(), + value.Select(z => SaleReceiptProduct.CreateElement(0, z.ProductId, z.Quantity)))).ToList(); } catch (Exception ex) { diff --git a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/SaleRepository.cs b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/SaleRepository.cs index aa7df96..6a95c80 100644 --- a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/SaleRepository.cs +++ b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/SaleRepository.cs @@ -65,9 +65,16 @@ VALUES (@SaleID, @ProductID, @Quantity)"; using var connection = new NpgsqlConnection(_conectionString.ConectionString); connection.Open(); - var queryDelete = @" DELETE FROM Sale -WHERE ID = @id"; - connection.Execute(queryDelete, new { id }); + // Удаляем записи из таблицы SaleProducts, связанные с текущей продажей + var queryDeleteSaleProducts = @" DELETE FROM SaleProducts + WHERE SaleId = @id"; + connection.Execute(queryDeleteSaleProducts, new { id }); + + // Удаляем запись из таблицы Sale + var queryDeleteSale = @" DELETE FROM Sale + WHERE ID = @id"; + connection.Execute(queryDeleteSale, new { id }); + } catch (Exception ex) { @@ -84,11 +91,15 @@ WHERE ID = @id"; { using var connection = new NpgsqlConnection(_conectionString.ConectionString); connection.Open(); - var querySelect = @" SELECT * FROM Sale"; - var sale = connection.Query(querySelect); + var querySelect = @" SELECT fr.*, ffr.ProductId, ffr. Quantity FROM Sale fr +INNER JOIN SaleProducts ffr ON ffr.SaleId = fr.Id"; + var sale = connection.Query(querySelect); _logger.LogDebug("Получены объекты: {json}", JsonConvert.SerializeObject(sale)); - return sale; + + return sale.GroupBy(x => x.Id, y => y, + (key, value) => Sale.CreateOperation(value.First(), + value.Select(z => SaleReceiptProduct.CreateElement(0, z.ProductId, z.Quantity)))).ToList(); } catch (Exception ex) {