diff --git a/JewelryStore/JewelryStore/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IComponentLogic.datasource b/JewelryStore/JewelryStore/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IComponentLogic.datasource new file mode 100644 index 0000000..55435b4 --- /dev/null +++ b/JewelryStore/JewelryStore/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IComponentLogic.datasource @@ -0,0 +1,10 @@ + + + + JewelryStoreContracts.BusinessLogicsContracts.IComponentLogic, JewelryStoreContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormMain.Designer.cs b/JewelryStore/JewelryStore/FormMain.Designer.cs index 5deb703..0795cd8 100644 --- a/JewelryStore/JewelryStore/FormMain.Designer.cs +++ b/JewelryStore/JewelryStore/FormMain.Designer.cs @@ -32,6 +32,10 @@ this.СправочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ИзделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.списокИзделийToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.компонентыПоИзделиямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataGridView = new System.Windows.Forms.DataGridView(); this.buttonCreateOrder = new System.Windows.Forms.Button(); this.buttonTakeOrderInWork = new System.Windows.Forms.Button(); @@ -46,7 +50,8 @@ // this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.СправочникиToolStripMenuItem}); + this.СправочникиToolStripMenuItem, + this.отчетыToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; this.menuStrip.Size = new System.Drawing.Size(1121, 33); @@ -76,6 +81,37 @@ this.ИзделияToolStripMenuItem.Text = "Изделия"; this.ИзделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click); // + // отчетыToolStripMenuItem + // + this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.списокИзделийToolStripMenuItem, + this.компонентыПоИзделиямToolStripMenuItem, + this.списокЗаказовToolStripMenuItem}); + this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; + this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(88, 29); + this.отчетыToolStripMenuItem.Text = "Отчеты"; + // + // списокИзделийToolStripMenuItem + // + this.списокИзделийToolStripMenuItem.Name = "списокИзделийToolStripMenuItem"; + this.списокИзделийToolStripMenuItem.Size = new System.Drawing.Size(327, 34); + this.списокИзделийToolStripMenuItem.Text = "Список изделий"; + this.списокИзделийToolStripMenuItem.Click += new System.EventHandler(this.СписокИзделийToolStripMenuItem_Click); + // + // компонентыПоИзделиямToolStripMenuItem + // + this.компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; + this.компонентыПоИзделиямToolStripMenuItem.Size = new System.Drawing.Size(327, 34); + this.компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; + this.компонентыПоИзделиямToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыПоИзделиямToolStripMenuItem_Click); + // + // списокЗаказовToolStripMenuItem + // + this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(327, 34); + this.списокЗаказовToolStripMenuItem.Text = "Список заказов"; + this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.СписокЗаказовToolStripMenuItem_Click); + // // dataGridView // this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -177,5 +213,9 @@ private Button buttonOrderReady; private Button buttonIssuedOrder; private Button buttonRefresh; + private ToolStripMenuItem отчетыToolStripMenuItem; + private ToolStripMenuItem списокИзделийToolStripMenuItem; + private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem; + private ToolStripMenuItem списокЗаказовToolStripMenuItem; } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormMain.cs b/JewelryStore/JewelryStore/FormMain.cs index d35464d..69bd788 100644 --- a/JewelryStore/JewelryStore/FormMain.cs +++ b/JewelryStore/JewelryStore/FormMain.cs @@ -1,4 +1,5 @@ -using JewelryStoreContracts.BindingModels; +using JewelryStoreBusinessLogic.BusinessLogics; +using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.BusinessLogicsContracts; using JewelryStoreDataModels.Enums; using Microsoft.Extensions.Logging; @@ -10,12 +11,15 @@ namespace JewelryStore { private readonly ILogger _logger; private readonly IOrderLogic _orderLogic; + private readonly IReportLogic _reportLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic) + + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; + _reportLogic = reportLogic; } private void FormMain_Load(object sender, EventArgs e) @@ -145,5 +149,36 @@ namespace JewelryStore { LoadData(); } + + + private void СписокИзделийToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SaveJewelsToWordFile(new ReportBindingModel + { + FileName = dialog.FileName + }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, + MessageBoxIcon.Information); + } + } + private void КомпонентыПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportJewelComponents)); + if (service is FormReportJewelComponents form) + { + form.ShowDialog(); + } + } + private void СписокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + if (service is FormReportOrders form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormReportJewelComponents.Designer.cs b/JewelryStore/JewelryStore/FormReportJewelComponents.Designer.cs new file mode 100644 index 0000000..a49c5d6 --- /dev/null +++ b/JewelryStore/JewelryStore/FormReportJewelComponents.Designer.cs @@ -0,0 +1,108 @@ +namespace JewelryStore +{ + partial class FormReportJewelComponents + { + /// + /// 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() + { + this.buttonSaveToExcel = new System.Windows.Forms.Button(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.ColumnComponent = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnJewel = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // buttonSaveToExcel + // + this.buttonSaveToExcel.Location = new System.Drawing.Point(22, 21); + this.buttonSaveToExcel.Name = "buttonSaveToExcel"; + this.buttonSaveToExcel.Size = new System.Drawing.Size(193, 34); + this.buttonSaveToExcel.TabIndex = 0; + this.buttonSaveToExcel.Text = "Сохранить в Excel"; + this.buttonSaveToExcel.UseVisualStyleBackColor = true; + this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click); + // + // dataGridView + // + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.ColumnComponent, + this.ColumnJewel, + this.ColumnCount}); + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom; + this.dataGridView.Location = new System.Drawing.Point(0, 77); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.RowHeadersWidth = 62; + this.dataGridView.RowTemplate.Height = 33; + this.dataGridView.Size = new System.Drawing.Size(800, 373); + this.dataGridView.TabIndex = 1; + // + // ColumnComponent + // + this.ColumnComponent.HeaderText = "Компонент"; + this.ColumnComponent.MinimumWidth = 8; + this.ColumnComponent.Name = "ColumnComponent"; + // + // ColumnJewel + // + this.ColumnJewel.HeaderText = "Изделие"; + this.ColumnJewel.MinimumWidth = 8; + this.ColumnJewel.Name = "ColumnJewel"; + // + // ColumnCount + // + this.ColumnCount.HeaderText = "Количество"; + this.ColumnCount.MinimumWidth = 8; + this.ColumnCount.Name = "ColumnCount"; + // + // FormReportJewelComponents + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.buttonSaveToExcel); + this.Name = "FormReportJewelComponents"; + this.Text = "Компоненты по изделиям"; + this.Load += new System.EventHandler(this.FormReportJewelComponents_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Button buttonSaveToExcel; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn ColumnComponent; + private DataGridViewTextBoxColumn ColumnJewel; + private DataGridViewTextBoxColumn ColumnCount; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormReportJewelComponents.cs b/JewelryStore/JewelryStore/FormReportJewelComponents.cs new file mode 100644 index 0000000..4227e2f --- /dev/null +++ b/JewelryStore/JewelryStore/FormReportJewelComponents.cs @@ -0,0 +1,77 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace JewelryStore +{ + public partial class FormReportJewelComponents : Form + { + private readonly ILogger _logger; + private readonly IReportLogic _logic; + public FormReportJewelComponents(ILogger logger, IReportLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + private void FormReportJewelComponents_Load(object sender, EventArgs e) + { + try + { + var dict = _logic.GetJewelComponent(); + if (dict != null) + { + dataGridView.Rows.Clear(); + foreach (var elem in dict) + { + dataGridView.Rows.Add(new object[] { elem.JewelName, "", "" }); + foreach (var listElem in elem.Components) + { + dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); + } + dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount }); + dataGridView.Rows.Add(Array.Empty()); + } + } + _logger.LogInformation("Загрузка списка изделий по компонентам"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка изделий по компонентам"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonSaveToExcel_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + _logic.SaveJewelComponentToExcelFile(new ReportBindingModel + { + FileName = dialog.FileName + }); + _logger.LogInformation("Сохранение списка изделий по компонентам"); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения списка изделий по компонентам"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + +} diff --git a/JewelryStore/JewelryStore/FormReportJewelComponents.resx b/JewelryStore/JewelryStore/FormReportJewelComponents.resx new file mode 100644 index 0000000..b5456b6 --- /dev/null +++ b/JewelryStore/JewelryStore/FormReportJewelComponents.resx @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormReportOrders.Designer.cs b/JewelryStore/JewelryStore/FormReportOrders.Designer.cs new file mode 100644 index 0000000..9b3f2bb --- /dev/null +++ b/JewelryStore/JewelryStore/FormReportOrders.Designer.cs @@ -0,0 +1,138 @@ +namespace JewelryStore +{ + partial class FormReportOrders + { + /// + /// 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() + { + this.panel = new System.Windows.Forms.Panel(); + this.buttonToPdf = new System.Windows.Forms.Button(); + this.buttonMake = new System.Windows.Forms.Button(); + this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker(); + this.labelTo = new System.Windows.Forms.Label(); + this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker(); + this.labelFrom = new System.Windows.Forms.Label(); + this.panel.SuspendLayout(); + this.SuspendLayout(); + // + // panel + // + this.panel.Controls.Add(this.buttonToPdf); + this.panel.Controls.Add(this.buttonMake); + this.panel.Controls.Add(this.dateTimePickerTo); + this.panel.Controls.Add(this.labelTo); + this.panel.Controls.Add(this.dateTimePickerFrom); + this.panel.Controls.Add(this.labelFrom); + this.panel.Dock = System.Windows.Forms.DockStyle.Top; + this.panel.Location = new System.Drawing.Point(0, 0); + this.panel.Name = "panel"; + this.panel.Size = new System.Drawing.Size(1141, 71); + this.panel.TabIndex = 0; + // + // buttonToPdf + // + this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonToPdf.Location = new System.Drawing.Point(904, 14); + this.buttonToPdf.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.buttonToPdf.Name = "buttonToPdf"; + this.buttonToPdf.Size = new System.Drawing.Size(199, 45); + this.buttonToPdf.TabIndex = 10; + this.buttonToPdf.Text = "В Pdf"; + this.buttonToPdf.UseVisualStyleBackColor = true; + this.buttonToPdf.Click += new System.EventHandler(this.ButtonToPdf_Click); + // + // buttonMake + // + this.buttonMake.Location = new System.Drawing.Point(600, 14); + this.buttonMake.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.buttonMake.Name = "buttonMake"; + this.buttonMake.Size = new System.Drawing.Size(199, 45); + this.buttonMake.TabIndex = 8; + this.buttonMake.Text = "Сформировать"; + this.buttonMake.UseVisualStyleBackColor = true; + this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click); + // + // dateTimePickerTo + // + this.dateTimePickerTo.Location = new System.Drawing.Point(338, 19); + this.dateTimePickerTo.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.dateTimePickerTo.Name = "dateTimePickerTo"; + this.dateTimePickerTo.Size = new System.Drawing.Size(231, 31); + this.dateTimePickerTo.TabIndex = 7; + // + // labelTo + // + this.labelTo.AutoSize = true; + this.labelTo.Location = new System.Drawing.Point(293, 24); + this.labelTo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelTo.Name = "labelTo"; + this.labelTo.Size = new System.Drawing.Size(33, 25); + this.labelTo.TabIndex = 6; + this.labelTo.Text = "по"; + // + // dateTimePickerFrom + // + this.dateTimePickerFrom.Location = new System.Drawing.Point(50, 19); + this.dateTimePickerFrom.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.dateTimePickerFrom.Name = "dateTimePickerFrom"; + this.dateTimePickerFrom.Size = new System.Drawing.Size(231, 31); + this.dateTimePickerFrom.TabIndex = 2; + // + // labelFrom + // + this.labelFrom.AutoSize = true; + this.labelFrom.Location = new System.Drawing.Point(15, 24); + this.labelFrom.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelFrom.Name = "labelFrom"; + this.labelFrom.Size = new System.Drawing.Size(23, 25); + this.labelFrom.TabIndex = 1; + this.labelFrom.Text = "С"; + // + // FormReportOrders + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1141, 450); + this.Controls.Add(this.panel); + this.Name = "FormReportOrders"; + this.Text = "Заказы"; + this.panel.ResumeLayout(false); + this.panel.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private Panel panel; + private Button buttonMake; + private DateTimePicker dateTimePickerTo; + private Label labelTo; + private DateTimePicker dateTimePickerFrom; + private Label labelFrom; + private Button buttonToPdf; + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormReportOrders.cs b/JewelryStore/JewelryStore/FormReportOrders.cs new file mode 100644 index 0000000..059e29f --- /dev/null +++ b/JewelryStore/JewelryStore/FormReportOrders.cs @@ -0,0 +1,100 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using Microsoft.Reporting.WinForms; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace JewelryStore +{ + public partial class FormReportOrders : Form + { + private readonly ReportViewer reportViewer; + + private readonly ILogger _logger; + + private readonly IReportLogic _logic; + + public FormReportOrders(ILogger logger, IReportLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + reportViewer = new ReportViewer + { + Dock = DockStyle.Fill + }; + reportViewer.LocalReport.LoadReportDefinition(new FileStream("..\\..\\..\\ReportOrders.rdlc", FileMode.Open)); + Controls.Clear(); + Controls.Add(reportViewer); + Controls.Add(panel); + } + + private void ButtonMake_Click(object sender, EventArgs e) + { + if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) + { + MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + try + { + var dataSource = _logic.GetOrders(new ReportBindingModel + { + DateFrom = dateTimePickerFrom.Value, + DateTo = dateTimePickerTo.Value + }); + var source = new ReportDataSource("DataSetOrders", dataSource); + reportViewer.LocalReport.DataSources.Clear(); + reportViewer.LocalReport.DataSources.Add(source); + var parameters = new[] { new ReportParameter("ReportParameterPeriod", + $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") }; + reportViewer.LocalReport.SetParameters(parameters); + + reportViewer.RefreshReport(); + _logger.LogInformation("Загрузка списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка заказов на период"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonToPdf_Click(object sender, EventArgs e) + { + if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) + { + MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + _logic.SaveOrdersToPdfFile(new ReportBindingModel + { + FileName = dialog.FileName, + DateFrom = dateTimePickerFrom.Value, + DateTo = dateTimePickerTo.Value + }); + _logger.LogInformation("Сохранение списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения списка заказов на период"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } +} diff --git a/JewelryStore/JewelryStore/FormReportOrders.resx b/JewelryStore/JewelryStore/FormReportOrders.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/JewelryStore/JewelryStore/FormReportOrders.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/JewelryStore/JewelryStore/JewelryStore.csproj b/JewelryStore/JewelryStore/JewelryStore.csproj index 3f519ab..4ad7d1c 100644 --- a/JewelryStore/JewelryStore/JewelryStore.csproj +++ b/JewelryStore/JewelryStore/JewelryStore.csproj @@ -6,6 +6,7 @@ enable true enable + 6.0-all @@ -21,9 +22,11 @@ + + diff --git a/JewelryStore/JewelryStore/Program.cs b/JewelryStore/JewelryStore/Program.cs index 8d5a0fc..8e30174 100644 --- a/JewelryStore/JewelryStore/Program.cs +++ b/JewelryStore/JewelryStore/Program.cs @@ -5,6 +5,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using JewelryStoreBusinessLogic.BusinessLogics; +using JewelryStoreBusinessLogic.OfficePackage.Implements; +using JewelryStoreBusinessLogic.OfficePackage; namespace JewelryStore { @@ -38,6 +40,11 @@ namespace JewelryStore services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -45,6 +52,8 @@ namespace JewelryStore services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } diff --git a/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IJewelLogic.datasource b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IJewelLogic.datasource new file mode 100644 index 0000000..22f0759 --- /dev/null +++ b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IJewelLogic.datasource @@ -0,0 +1,10 @@ + + + + JewelryStoreContracts.BusinessLogicsContracts.IJewelLogic, JewelryStoreContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IOrderLogic.datasource b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IOrderLogic.datasource new file mode 100644 index 0000000..56a28cf --- /dev/null +++ b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IOrderLogic.datasource @@ -0,0 +1,10 @@ + + + + JewelryStoreContracts.BusinessLogicsContracts.IOrderLogic, JewelryStoreContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IReportLogic.datasource b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IReportLogic.datasource new file mode 100644 index 0000000..f791bb9 --- /dev/null +++ b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.BusinessLogicsContracts.IReportLogic.datasource @@ -0,0 +1,10 @@ + + + + JewelryStoreContracts.BusinessLogicsContracts.IReportLogic, JewelryStoreContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.StoragesContracts.IComponentStorage.datasource b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.StoragesContracts.IComponentStorage.datasource new file mode 100644 index 0000000..5f71a27 --- /dev/null +++ b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.StoragesContracts.IComponentStorage.datasource @@ -0,0 +1,10 @@ + + + + JewelryStoreContracts.StoragesContracts.IComponentStorage, JewelryStoreContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.StoragesContracts.IJewelStorage.datasource b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.StoragesContracts.IJewelStorage.datasource new file mode 100644 index 0000000..13f1fe5 --- /dev/null +++ b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.StoragesContracts.IJewelStorage.datasource @@ -0,0 +1,10 @@ + + + + JewelryStoreContracts.StoragesContracts.IJewelStorage, JewelryStoreContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.StoragesContracts.IOrderStorage.datasource b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.StoragesContracts.IOrderStorage.datasource new file mode 100644 index 0000000..8a74c06 --- /dev/null +++ b/JewelryStore/JewelryStore/Properties/DataSources/JewelryStoreContracts.StoragesContracts.IOrderStorage.datasource @@ -0,0 +1,10 @@ + + + + JewelryStoreContracts.StoragesContracts.IOrderStorage, JewelryStoreContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/ReportOrders.rdlc b/JewelryStore/JewelryStore/ReportOrders.rdlc new file mode 100644 index 0000000..5c63f63 --- /dev/null +++ b/JewelryStore/JewelryStore/ReportOrders.rdlc @@ -0,0 +1,572 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + 10791c83-cee8-4a38-bbd0-245fc17cefb3 + + + + + + JewelryStoreContractsViewModels + /* Local Query */ + + + + Id + System.Int32 + + + DateCreate + System.DateTime + + + JewelName + System.String + + + Sum + System.Decimal + + + Status + System.String + + + + JewelryStoreContracts.ViewModels + ReportOrdersViewModel + JewelryStoreContracts.ViewModels.ReportOrdersViewModel, JewelryStoreContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + + + + + + + true + true + + + + + Заказы + + + + 0.6cm + 16.51cm + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!ReportParameterPeriod.Value + + + + ReportParameterPeriod + 0.6cm + 0.6cm + 16.51cm + 1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + 2.60583cm + + + 3.262cm + + + 4.8495cm + + + 2.5cm + + + 2.5cm + + + + + 0.6cm + + + + + true + true + + + + + Номер + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Дата создания + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Изделие + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Статус + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Сумма + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!Id.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DateCreate.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!JewelName.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Status.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 1.9177cm + 0.79267cm + 1.2cm + 15.71733cm + 2 + + + + + + true + true + + + + + Итого: + + + + 3.46287cm + 11.51cm + 0.6cm + 2.5cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!Sum.Value, "DataSetOrders") + + + 2pt + 2pt + 2pt + 2pt + + + + 2in +