From a2cb71b2972e544a34266158fb7f4b9b41d15522 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Wed, 19 Apr 2023 22:54:29 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=204-?= =?UTF-8?q?=D0=B9=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D0=BE=D0=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BlacksmithWorkshop/FormMain.Designer.cs | 56 ++++++++++++------- .../BlacksmithWorkshop/FormMain.cs | 26 ++++----- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs index ed08d4e..55c2305 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs @@ -40,12 +40,14 @@ manufactureToolStripMenuItem = new ToolStripMenuItem(); shopToolStripMenuItem = new ToolStripMenuItem(); addManufactureToolStripMenuItem = new ToolStripMenuItem(); - buttonSellManufacture = new Button(); reportToolStripMenuItem = new ToolStripMenuItem(); groupedOrdersReportToolStripMenuItem = new ToolStripMenuItem(); ordersReportToolStripMenuItem = new ToolStripMenuItem(); - manufactureWorkPiecesReportToolStripMenuItem = new ToolStripMenuItem(); + workloadStoresReportToolStripMenuItem = new ToolStripMenuItem(); shopsReportToolStripMenuItem = new ToolStripMenuItem(); + reportManufactureToolStripMenuItem = new ToolStripMenuItem(); + workPieceManufacturesToolStripMenuItem = new ToolStripMenuItem(); + buttonSellManufacture = new Button(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); menuStrip.SuspendLayout(); SuspendLayout(); @@ -156,19 +158,9 @@ addManufactureToolStripMenuItem.Text = "Пополнение магазина"; addManufactureToolStripMenuItem.Click += AddManufactureToolStripMenuItem_Click; // - // buttonSellManufacture - // - buttonSellManufacture.Location = new Point(1014, 440); - buttonSellManufacture.Name = "buttonSellManufacture"; - buttonSellManufacture.Size = new Size(233, 29); - buttonSellManufacture.TabIndex = 7; - buttonSellManufacture.Text = "Продажа изделий"; - buttonSellManufacture.UseVisualStyleBackColor = true; - buttonSellManufacture.Click += ButtonSellManufacture_Click; - // // reportToolStripMenuItem // - reportToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { groupedOrdersReportToolStripMenuItem, ordersReportToolStripMenuItem, manufactureWorkPiecesReportToolStripMenuItem, shopsReportToolStripMenuItem }); + reportToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { groupedOrdersReportToolStripMenuItem, ordersReportToolStripMenuItem, workloadStoresReportToolStripMenuItem, shopsReportToolStripMenuItem, reportManufactureToolStripMenuItem, workPieceManufacturesToolStripMenuItem }); reportToolStripMenuItem.Name = "reportToolStripMenuItem"; reportToolStripMenuItem.Size = new Size(73, 24); reportToolStripMenuItem.Text = "Отчёты"; @@ -187,12 +179,12 @@ ordersReportToolStripMenuItem.Text = "Список заказов"; ordersReportToolStripMenuItem.Click += OrdersReportToolStripMenuItem_Click; // - // manufactureWorkPiecesReportToolStripMenuItem + // workloadStoresReportToolStripMenuItem // - manufactureWorkPiecesReportToolStripMenuItem.Name = "manufactureWorkPiecesReportToolStripMenuItem"; - manufactureWorkPiecesReportToolStripMenuItem.Size = new Size(310, 26); - manufactureWorkPiecesReportToolStripMenuItem.Text = "Заготовки по изделиям"; - manufactureWorkPiecesReportToolStripMenuItem.Click += ManufactureWorkPiecesReportToolStripMenuItem_Click; + workloadStoresReportToolStripMenuItem.Name = "workloadStoresReportToolStripMenuItem"; + workloadStoresReportToolStripMenuItem.Size = new Size(310, 26); + workloadStoresReportToolStripMenuItem.Text = "Загруженность магазинов"; + workloadStoresReportToolStripMenuItem.Click += WorkloadStoresReportToolStripMenuItem_Click; // // shopsReportToolStripMenuItem // @@ -201,6 +193,30 @@ shopsReportToolStripMenuItem.Text = "Таблица магазинов"; shopsReportToolStripMenuItem.Click += ShopsReportToolStripMenuItem_Click; // + // reportManufactureToolStripMenuItem + // + reportManufactureToolStripMenuItem.Name = "reportManufactureToolStripMenuItem"; + reportManufactureToolStripMenuItem.Size = new Size(310, 26); + reportManufactureToolStripMenuItem.Text = "Список изделий"; + reportManufactureToolStripMenuItem.Click += ReportManufactureToolStripMenuItem_Click; + // + // workPieceManufacturesToolStripMenuItem + // + workPieceManufacturesToolStripMenuItem.Name = "workPieceManufacturesToolStripMenuItem"; + workPieceManufacturesToolStripMenuItem.Size = new Size(310, 26); + workPieceManufacturesToolStripMenuItem.Text = "Заготовки по изделиям"; + workPieceManufacturesToolStripMenuItem.Click += WorkPieceManufacturesToolStripMenuItem_Click; + // + // buttonSellManufacture + // + buttonSellManufacture.Location = new Point(1014, 440); + buttonSellManufacture.Name = "buttonSellManufacture"; + buttonSellManufacture.Size = new Size(233, 29); + buttonSellManufacture.TabIndex = 7; + buttonSellManufacture.Text = "Продажа изделий"; + buttonSellManufacture.UseVisualStyleBackColor = true; + buttonSellManufacture.Click += ButtonSellManufacture_Click; + // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -243,7 +259,9 @@ private ToolStripMenuItem reportToolStripMenuItem; private ToolStripMenuItem groupedOrdersReportToolStripMenuItem; private ToolStripMenuItem ordersReportToolStripMenuItem; - private ToolStripMenuItem manufactureWorkPiecesReportToolStripMenuItem; + private ToolStripMenuItem workloadStoresReportToolStripMenuItem; private ToolStripMenuItem shopsReportToolStripMenuItem; + private ToolStripMenuItem reportManufactureToolStripMenuItem; + private ToolStripMenuItem workPieceManufacturesToolStripMenuItem; } } \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs index e3c0f60..4aceec9 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs @@ -181,16 +181,6 @@ namespace BlacksmithWorkshop } } - private void ButtonSellIceCream_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormSellManufacture)); - if (service is FormSellManufacture form) - { - form.ShowDialog(); - LoadData(); - } - } - private void ButtonRef_Click(object sender, EventArgs e) { LoadData(); @@ -230,7 +220,7 @@ namespace BlacksmithWorkshop private void GroupedOrdersReportToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders)); - + if (service is FormReportGroupedOrders form) { form.ShowDialog(); @@ -240,14 +230,14 @@ namespace BlacksmithWorkshop private void OrdersReportToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - + if (service is FormReportOrders form) { form.ShowDialog(); } } - private void ManufactureWorkPiecesReportToolStripMenuItem_Click(object sender, EventArgs e) + private void WorkloadStoresReportToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormReportShopManufactures)); @@ -267,5 +257,15 @@ namespace BlacksmithWorkshop MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); } } + + private void ReportManufactureToolStripMenuItem_Click(object sender, EventArgs e) + { + + } + + private void WorkPieceManufacturesToolStripMenuItem_Click(object sender, EventArgs e) + { + + } } } \ No newline at end of file