From 458859d99577960ce3216820381de23fb3cd8952 Mon Sep 17 00:00:00 2001 From: platoff aeeee Date: Wed, 28 Feb 2024 11:03:17 +0400 Subject: [PATCH] almost finish lab1 --- .../BussinessLogic/OrderLogic.cs | 23 +--- .../DataListSingleton.cs | 11 +- .../FormCreateOrder.Designer.cs | 42 ++++---- .../FormFurniture.Designer.cs | 100 ++++++++++-------- .../FormFurnitureWorkPiece.resx | 62 +---------- .../FurnitureAssemblyView/FormFurnitures.resx | 62 +---------- .../FormMain.Designer.cs | 11 +- 7 files changed, 97 insertions(+), 214 deletions(-) diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/OrderLogic.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/OrderLogic.cs index e2d03fb..fec2d4d 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/OrderLogic.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/OrderLogic.cs @@ -13,26 +13,20 @@ using System.Threading.Tasks; namespace FurnitureAssemblyBusinessLogic.BussinessLogic { - // Класс, реализующий логику для заказов public class OrderLogic : IOrderLogic { - private readonly ILogger _logger; - private readonly IOrderStorage _orderStorage; - // Конструктор + private readonly ILogger _logger; + public OrderLogic(ILogger logger, IOrderStorage orderStorage) { _logger = logger; _orderStorage = orderStorage; } - - // Вывод отфильтрованного списка компонентов public List? ReadList(OrderSearchModel? model) { _logger.LogInformation("ReadList. Id:{Id}", model?.Id); - - // list хранит весь список в случае, если model пришло со значением null на вход метода var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); if(list == null) @@ -46,8 +40,6 @@ namespace FurnitureAssemblyBusinessLogic.BussinessLogic return list; } - - // Создание чека public bool CreateOrder(OrderBindingModel model) { CheckModel(model); @@ -84,16 +76,12 @@ namespace FurnitureAssemblyBusinessLogic.BussinessLogic { return StatusUpdate(model, OrderStatus.Выдан); } - - // Проверка на пустоту входного параметра private void CheckModel(OrderBindingModel model, bool withParams = true) { if (model == null) { throw new ArgumentNullException(nameof(model)); } - - // При удалении параметру withParams передаём false if (!withParams) { return; @@ -126,27 +114,23 @@ namespace FurnitureAssemblyBusinessLogic.BussinessLogic _logger.LogInformation("Order. OrderId:{Id}, Sum:{Sum}. FurnitureId:{Id}", model.Id, model.Sum, model.FurnitureId); } - // Обновление статуса заказа public bool StatusUpdate(OrderBindingModel model, OrderStatus newOrderStatus) { var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); - // Если не смогли найти указанный заказ по его Id if(viewModel == null) { throw new ArgumentNullException(nameof(model)); } - // Проверка на возможность обновления статуса на следующий if(viewModel.Status + 1 != newOrderStatus) { - _logger.LogWarning("Status update operation failed. New status " + newOrderStatus.ToString() + "incorrect"); + _logger.LogWarning("Status update operation failed. Status " + newOrderStatus.ToString() + "incorrect"); return false; } model.Status = newOrderStatus; - // Проверка на выдачу if(model.Status == OrderStatus.Выдан) { model.DateImplement = DateTime.Now; @@ -158,7 +142,6 @@ namespace FurnitureAssemblyBusinessLogic.BussinessLogic CheckModel(model, false); - // Финальная проверка на возможность обновления if(_orderStorage.Update(model) == null) { model.Status--; diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs index 1e72d6b..6fa7e16 100644 --- a/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs @@ -7,19 +7,14 @@ using System.Threading.Tasks; namespace FurnitureAssemblyListImplement { - // Класс для списков, в которых будет храниться информация при работе приложения public class DataListSingleton { private static DataListSingleton? _instance; - - // Список для хранения заготовок - public List WorkPiece { get; set; } - - // Список для хранения изделий + public List Orders { get; set; } public List Furnitures { get; set; } - // Список для хранения заказов - public List Orders { get; set; } + public List WorkPiece { get; set; } + public DataListSingleton() { diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormCreateOrder.Designer.cs b/FurnitureAssembly/FurnitureAssemblyView/FormCreateOrder.Designer.cs index 4e59035..72855e8 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormCreateOrder.Designer.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormCreateOrder.Designer.cs @@ -41,59 +41,63 @@ // labelFurniture // this.labelFurniture.AutoSize = true; - this.labelFurniture.Location = new System.Drawing.Point(24, 24); + this.labelFurniture.Location = new System.Drawing.Point(21, 18); this.labelFurniture.Name = "labelFurniture"; - this.labelFurniture.Size = new System.Drawing.Size(71, 20); + this.labelFurniture.Size = new System.Drawing.Size(56, 15); this.labelFurniture.TabIndex = 0; this.labelFurniture.Text = "Изделие:"; // // labelCount // this.labelCount.AutoSize = true; - this.labelCount.Location = new System.Drawing.Point(24, 70); + this.labelCount.Location = new System.Drawing.Point(21, 52); this.labelCount.Name = "labelCount"; - this.labelCount.Size = new System.Drawing.Size(93, 20); + this.labelCount.Size = new System.Drawing.Size(75, 15); this.labelCount.TabIndex = 1; this.labelCount.Text = "Количество:"; // // labelSum // this.labelSum.AutoSize = true; - this.labelSum.Location = new System.Drawing.Point(24, 113); + this.labelSum.Location = new System.Drawing.Point(21, 85); this.labelSum.Name = "labelSum"; - this.labelSum.Size = new System.Drawing.Size(58, 20); + this.labelSum.Size = new System.Drawing.Size(48, 15); this.labelSum.TabIndex = 2; this.labelSum.Text = "Сумма:"; // // comboBoxFurniture // this.comboBoxFurniture.FormattingEnabled = true; - this.comboBoxFurniture.Location = new System.Drawing.Point(166, 21); + this.comboBoxFurniture.Location = new System.Drawing.Point(127, 15); + this.comboBoxFurniture.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.comboBoxFurniture.Name = "comboBoxFurniture"; - this.comboBoxFurniture.Size = new System.Drawing.Size(278, 28); + this.comboBoxFurniture.Size = new System.Drawing.Size(244, 23); this.comboBoxFurniture.TabIndex = 3; this.comboBoxFurniture.SelectedIndexChanged += new System.EventHandler(this.ComboBoxFurniture_SelectedIndexChanged); // // textBoxCount // - this.textBoxCount.Location = new System.Drawing.Point(166, 67); + this.textBoxCount.Location = new System.Drawing.Point(127, 49); + this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxCount.Name = "textBoxCount"; - this.textBoxCount.Size = new System.Drawing.Size(278, 27); + this.textBoxCount.Size = new System.Drawing.Size(244, 23); this.textBoxCount.TabIndex = 4; this.textBoxCount.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged); // // textBoxSum // - this.textBoxSum.Location = new System.Drawing.Point(166, 110); + this.textBoxSum.Location = new System.Drawing.Point(127, 82); + this.textBoxSum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxSum.Name = "textBoxSum"; - this.textBoxSum.Size = new System.Drawing.Size(278, 27); + this.textBoxSum.Size = new System.Drawing.Size(244, 23); this.textBoxSum.TabIndex = 5; // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(230, 155); + this.buttonSave.Location = new System.Drawing.Point(186, 116); + this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(94, 29); + this.buttonSave.Size = new System.Drawing.Size(82, 22); this.buttonSave.TabIndex = 6; this.buttonSave.Text = "Сохранить"; this.buttonSave.UseVisualStyleBackColor = true; @@ -101,9 +105,10 @@ // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(340, 155); + this.buttonCancel.Location = new System.Drawing.Point(274, 116); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(94, 29); + this.buttonCancel.Size = new System.Drawing.Size(82, 22); this.buttonCancel.TabIndex = 7; this.buttonCancel.Text = "Отмена"; this.buttonCancel.UseVisualStyleBackColor = true; @@ -111,9 +116,9 @@ // // FormCreateOrder // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(479, 203); + this.ClientSize = new System.Drawing.Size(384, 157); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); this.Controls.Add(this.textBoxSum); @@ -122,6 +127,7 @@ this.Controls.Add(this.labelSum); this.Controls.Add(this.labelCount); this.Controls.Add(this.labelFurniture); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormCreateOrder"; this.Text = "Заказ"; this.Load += new System.EventHandler(this.FormCreateOrder_Load); diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormFurniture.Designer.cs b/FurnitureAssembly/FurnitureAssemblyView/FormFurniture.Designer.cs index e22e315..69ac0d5 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormFurniture.Designer.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormFurniture.Designer.cs @@ -38,11 +38,11 @@ this.buttonUpdate = new System.Windows.Forms.Button(); this.buttonAdd = new System.Windows.Forms.Button(); this.dataGridView = new System.Windows.Forms.DataGridView(); - this.buttonSave = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); this.ColumnID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); this.groupBoxWorkPiece.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -50,33 +50,35 @@ // labelName // this.labelName.AutoSize = true; - this.labelName.Location = new System.Drawing.Point(23, 30); + this.labelName.Location = new System.Drawing.Point(48, 23); this.labelName.Name = "labelName"; - this.labelName.Size = new System.Drawing.Size(80, 20); + this.labelName.Size = new System.Drawing.Size(62, 15); this.labelName.TabIndex = 0; this.labelName.Text = "Название:"; // // labelCost // this.labelCost.AutoSize = true; - this.labelCost.Location = new System.Drawing.Point(23, 84); + this.labelCost.Location = new System.Drawing.Point(38, 63); this.labelCost.Name = "labelCost"; - this.labelCost.Size = new System.Drawing.Size(86, 20); + this.labelCost.Size = new System.Drawing.Size(70, 15); this.labelCost.TabIndex = 1; this.labelCost.Text = "Стоимость:"; // // textBoxName // - this.textBoxName.Location = new System.Drawing.Point(133, 27); + this.textBoxName.Location = new System.Drawing.Point(116, 20); + this.textBoxName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(332, 27); + this.textBoxName.Size = new System.Drawing.Size(291, 23); this.textBoxName.TabIndex = 2; // // textBoxPrice // - this.textBoxPrice.Location = new System.Drawing.Point(133, 81); + this.textBoxPrice.Location = new System.Drawing.Point(116, 60); + this.textBoxPrice.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxPrice.Name = "textBoxPrice"; - this.textBoxPrice.Size = new System.Drawing.Size(196, 27); + this.textBoxPrice.Size = new System.Drawing.Size(291, 23); this.textBoxPrice.TabIndex = 3; // // groupBoxWorkPiece @@ -86,18 +88,21 @@ this.groupBoxWorkPiece.Controls.Add(this.buttonUpdate); this.groupBoxWorkPiece.Controls.Add(this.buttonAdd); this.groupBoxWorkPiece.Controls.Add(this.dataGridView); - this.groupBoxWorkPiece.Location = new System.Drawing.Point(23, 126); + this.groupBoxWorkPiece.Location = new System.Drawing.Point(12, 87); + this.groupBoxWorkPiece.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupBoxWorkPiece.Name = "groupBoxWorkPiece"; - this.groupBoxWorkPiece.Size = new System.Drawing.Size(567, 300); + this.groupBoxWorkPiece.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupBoxWorkPiece.Size = new System.Drawing.Size(491, 225); this.groupBoxWorkPiece.TabIndex = 4; this.groupBoxWorkPiece.TabStop = false; this.groupBoxWorkPiece.Text = "Заготовки"; // // buttonRefresh // - this.buttonRefresh.Location = new System.Drawing.Point(454, 196); + this.buttonRefresh.Location = new System.Drawing.Point(397, 120); + this.buttonRefresh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonRefresh.Name = "buttonRefresh"; - this.buttonRefresh.Size = new System.Drawing.Size(94, 29); + this.buttonRefresh.Size = new System.Drawing.Size(82, 27); this.buttonRefresh.TabIndex = 4; this.buttonRefresh.Text = "Обновить"; this.buttonRefresh.UseVisualStyleBackColor = true; @@ -105,9 +110,10 @@ // // buttonDelete // - this.buttonDelete.Location = new System.Drawing.Point(454, 145); + this.buttonDelete.Location = new System.Drawing.Point(397, 91); + this.buttonDelete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonDelete.Name = "buttonDelete"; - this.buttonDelete.Size = new System.Drawing.Size(94, 29); + this.buttonDelete.Size = new System.Drawing.Size(82, 25); this.buttonDelete.TabIndex = 3; this.buttonDelete.Text = "Удалить"; this.buttonDelete.UseVisualStyleBackColor = true; @@ -115,9 +121,10 @@ // // buttonUpdate // - this.buttonUpdate.Location = new System.Drawing.Point(454, 95); + this.buttonUpdate.Location = new System.Drawing.Point(397, 62); + this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonUpdate.Name = "buttonUpdate"; - this.buttonUpdate.Size = new System.Drawing.Size(94, 29); + this.buttonUpdate.Size = new System.Drawing.Size(82, 25); this.buttonUpdate.TabIndex = 2; this.buttonUpdate.Text = "Изменить"; this.buttonUpdate.UseVisualStyleBackColor = true; @@ -125,9 +132,10 @@ // // buttonAdd // - this.buttonAdd.Location = new System.Drawing.Point(454, 43); + this.buttonAdd.Location = new System.Drawing.Point(397, 32); + this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonAdd.Name = "buttonAdd"; - this.buttonAdd.Size = new System.Drawing.Size(94, 29); + this.buttonAdd.Size = new System.Drawing.Size(82, 26); this.buttonAdd.TabIndex = 1; this.buttonAdd.Text = "Добавить"; this.buttonAdd.UseVisualStyleBackColor = true; @@ -140,33 +148,14 @@ this.ColumnID, this.ColumnName, this.ColumnPrice}); - this.dataGridView.Location = new System.Drawing.Point(6, 26); + this.dataGridView.Location = new System.Drawing.Point(5, 20); + this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dataGridView.Name = "dataGridView"; this.dataGridView.RowHeadersWidth = 51; this.dataGridView.RowTemplate.Height = 29; - this.dataGridView.Size = new System.Drawing.Size(436, 268); + this.dataGridView.Size = new System.Drawing.Size(382, 201); this.dataGridView.TabIndex = 0; // - // buttonSave - // - this.buttonSave.Location = new System.Drawing.Point(340, 448); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(95, 29); - this.buttonSave.TabIndex = 5; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); - // - // buttonCancel - // - this.buttonCancel.Location = new System.Drawing.Point(458, 448); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(94, 29); - this.buttonCancel.TabIndex = 6; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); - // // ColumnID // this.ColumnID.HeaderText = "Id"; @@ -189,11 +178,33 @@ this.ColumnPrice.MinimumWidth = 6; this.ColumnPrice.Name = "ColumnPrice"; // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(271, 316); + this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(83, 22); + this.buttonSave.TabIndex = 5; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(360, 316); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(82, 22); + this.buttonCancel.TabIndex = 6; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // // FormFurniture // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(619, 500); + this.ClientSize = new System.Drawing.Size(517, 357); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); this.Controls.Add(this.groupBoxWorkPiece); @@ -201,6 +212,7 @@ this.Controls.Add(this.textBoxName); this.Controls.Add(this.labelCost); this.Controls.Add(this.labelName); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormFurniture"; this.Text = "Изделие"; this.Load += new System.EventHandler(this.FormFurniture_Load); diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.resx b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.resx index af32865..f298a7b 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.resx +++ b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.resx @@ -1,64 +1,4 @@ - - - + diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.resx b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.resx index af32865..f298a7b 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.resx +++ b/FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.resx @@ -1,64 +1,4 @@ - - - + diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormMain.Designer.cs b/FurnitureAssembly/FurnitureAssemblyView/FormMain.Designer.cs index 84ad37a..e2cc5bf 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormMain.Designer.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormMain.Designer.cs @@ -62,6 +62,7 @@ this.buttonCreateOrder.TabIndex = 1; this.buttonCreateOrder.Text = "Создать заказ"; this.buttonCreateOrder.UseVisualStyleBackColor = true; + this.buttonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click); // // buttonTakeOrderInWork // @@ -72,6 +73,7 @@ this.buttonTakeOrderInWork.TabIndex = 2; this.buttonTakeOrderInWork.Text = "Отдать на выполнение"; this.buttonTakeOrderInWork.UseVisualStyleBackColor = true; + this.buttonTakeOrderInWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click); // // buttonOrderReady // @@ -82,6 +84,7 @@ this.buttonOrderReady.TabIndex = 3; this.buttonOrderReady.Text = "Заказ готов"; this.buttonOrderReady.UseVisualStyleBackColor = true; + this.buttonOrderReady.Click += new System.EventHandler(this.ButtonOrderReady_Click); // // buttonIssuedOrder // @@ -92,6 +95,7 @@ this.buttonIssuedOrder.TabIndex = 4; this.buttonIssuedOrder.Text = "Заказ выдан"; this.buttonIssuedOrder.UseVisualStyleBackColor = true; + this.buttonIssuedOrder.Click += new System.EventHandler(this.ButtonIssuedOrder_Click); // // buttonRefresh // @@ -102,6 +106,7 @@ this.buttonRefresh.TabIndex = 5; this.buttonRefresh.Text = "Обновить"; this.buttonRefresh.UseVisualStyleBackColor = true; + this.buttonRefresh.Click += new System.EventHandler(this.ButtonRef_Click); // // menuStrip // @@ -127,14 +132,16 @@ // workPieceToolStripMenuItem // this.workPieceToolStripMenuItem.Name = "workPieceToolStripMenuItem"; - this.workPieceToolStripMenuItem.Size = new System.Drawing.Size(130, 22); + this.workPieceToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.workPieceToolStripMenuItem.Text = "Заготовки"; + this.workPieceToolStripMenuItem.Click += new System.EventHandler(this.WorkPieceToolStripMenuItem_Click); // // furnitureToolStripMenuItem // this.furnitureToolStripMenuItem.Name = "furnitureToolStripMenuItem"; - this.furnitureToolStripMenuItem.Size = new System.Drawing.Size(130, 22); + this.furnitureToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.furnitureToolStripMenuItem.Text = "Изделия"; + this.furnitureToolStripMenuItem.Click += new System.EventHandler(this.FurnitureToolStripMenuItem_Click); // // FormMain //