diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs index f1d0445..9a04e3d 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs @@ -86,21 +86,21 @@ // ComponentsListToolStripMenuItem // ComponentsListToolStripMenuItem.Name = "ComponentsListToolStripMenuItem"; - ComponentsListToolStripMenuItem.Size = new Size(218, 22); - ComponentsListToolStripMenuItem.Text = "Список компонентов"; + ComponentsListToolStripMenuItem.Size = new Size(225, 22); + ComponentsListToolStripMenuItem.Text = "Список кузнечных изделий"; ComponentsListToolStripMenuItem.Click += ComponentsListToolStripMenuItem_Click; // // ManufacturesListToolStripMenuItem // ManufacturesListToolStripMenuItem.Name = "ManufacturesListToolStripMenuItem"; - ManufacturesListToolStripMenuItem.Size = new Size(218, 22); + ManufacturesListToolStripMenuItem.Size = new Size(225, 22); ManufacturesListToolStripMenuItem.Text = "Компоненты по изделиям"; ManufacturesListToolStripMenuItem.Click += ManufacturesListToolStripMenuItem_Click; // // OrdersListToolStripMenuItem // OrdersListToolStripMenuItem.Name = "OrdersListToolStripMenuItem"; - OrdersListToolStripMenuItem.Size = new Size(218, 22); + OrdersListToolStripMenuItem.Size = new Size(225, 22); OrdersListToolStripMenuItem.Text = "Список заказов"; OrdersListToolStripMenuItem.Click += OrdersListToolStripMenuItem_Click; // diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs index 50d4d32..e3c4bdd 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs @@ -165,7 +165,6 @@ namespace BlacksmithWorkshop { LoadData(); } - private void ComponentsListToolStripMenuItem_Click(object sender, EventArgs e) { using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; @@ -179,7 +178,6 @@ namespace BlacksmithWorkshop MessageBoxIcon.Information); } } - private void ManufacturesListToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormReportManufactureComponents)); @@ -188,7 +186,6 @@ namespace BlacksmithWorkshop form.ShowDialog(); } } - private void OrdersListToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc b/BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc index fa8050b..940580b 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc +++ b/BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc @@ -90,7 +90,7 @@ - ������ + Список заказов @@ -180,7 +180,7 @@ - ���� �������� + Дата заказа @@ -212,7 +212,7 @@ - ��������� + Изделие @@ -244,7 +244,7 @@ - ������ ������ + Сумма @@ -276,7 +276,7 @@ - ����� + Статус @@ -396,6 +396,36 @@ + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + @@ -424,36 +454,7 @@ 2pt - - - - - - true - true - - - - - =Fields!Sum.Value - - - 2pt - 2pt - 2pt - 2pt - - + true @@ -475,7 +476,7 @@ After - + @@ -498,7 +499,7 @@ - �����: + Итого: diff --git a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs index 6f60c09..996f325 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs @@ -90,7 +90,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics _saveToWord.CreateDoc(new WordInfo { FileName = model.FileName, - Title = "Список компонент", + Title = "Список кузнечных изделий", Manufactures = _ManufactureStorage.GetFullList() }); } @@ -103,7 +103,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics _saveToExcel.CreateReport(new ExcelInfo { FileName = model.FileName, - Title = "Список компонент", + Title = "Список кузнечных изделий", ManufactureComponents = GetManufactureComponent() }); }