Фикс формы

SecuritySystem/SecuritySystemView/FormMain.Designer.cs

@@ -33,17 +33,16 @@
             ComponentsToolStripMenuItem = new ToolStripMenuItem();
             SecuresToolStripMenuItem = new ToolStripMenuItem();
             клиентыToolStripMenuItem = new ToolStripMenuItem();
+            исполнителиToolStripMenuItem = new ToolStripMenuItem();
             отчетыToolStripMenuItem = new ToolStripMenuItem();
             списокКомпонентовToolStripMenuItem = new ToolStripMenuItem();
             компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem();
             списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
+            запускРаботToolStripMenuItem = new ToolStripMenuItem();
             dataGridView = new DataGridView();
             buttonCreateOrder = new Button();
-            buttonTakeOrderInWork = new Button();
-            buttonOrderReady = new Button();
             button4 = new Button();
             buttonRefresh = new Button();
-            исполнителиToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -51,7 +50,7 @@
             // menuStrip
             // 
             menuStrip.ImageScalingSize = new Size(20, 20);
-            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem });
+            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
             menuStrip.Size = new Size(1043, 28);
@@ -68,24 +67,31 @@
             // ComponentsToolStripMenuItem
             // 
             ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem";
-            ComponentsToolStripMenuItem.Size = new Size(224, 26);
+            ComponentsToolStripMenuItem.Size = new Size(185, 26);
             ComponentsToolStripMenuItem.Text = "Компоненты";
             ComponentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
             // 
             // SecuresToolStripMenuItem
             // 
             SecuresToolStripMenuItem.Name = "SecuresToolStripMenuItem";
-            SecuresToolStripMenuItem.Size = new Size(224, 26);
+            SecuresToolStripMenuItem.Size = new Size(185, 26);
             SecuresToolStripMenuItem.Text = "Изделия";
             SecuresToolStripMenuItem.Click += SecuresToolStripMenuItem_Click;
             // 
             // клиентыToolStripMenuItem
             // 
             клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            клиентыToolStripMenuItem.Size = new Size(224, 26);
+            клиентыToolStripMenuItem.Size = new Size(185, 26);
             клиентыToolStripMenuItem.Text = "Клиенты";
             клиентыToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
             // 
+            // исполнителиToolStripMenuItem
+            // 
+            исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
+            исполнителиToolStripMenuItem.Size = new Size(185, 26);
+            исполнителиToolStripMenuItem.Text = "Исполнители";
+            исполнителиToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
+            // 
             // отчетыToolStripMenuItem
             // 
             отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem });
@@ -114,6 +120,13 @@
             списокЗаказовToolStripMenuItem.Text = "Список заказов";
             списокЗаказовToolStripMenuItem.Click += ReportOrdersToolStripMenuItem_Click;
             // 
+            // запускРаботToolStripMenuItem
+            // 
+            запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem";
+            запускРаботToolStripMenuItem.Size = new Size(114, 24);
+            запускРаботToolStripMenuItem.Text = "Запуск работ";
+            запускРаботToolStripMenuItem.Click += StartWorksToolStripMenuItem_Click;
+            // 
             // dataGridView
             // 
             dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
@@ -139,32 +152,10 @@
             buttonCreateOrder.UseVisualStyleBackColor = true;
             buttonCreateOrder.Click += ButtonCreateOrder_Click;
             // 
-            // buttonTakeOrderInWork
-            // 
-            buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonTakeOrderInWork.Location = new Point(816, 110);
-            buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            buttonTakeOrderInWork.Size = new Size(216, 29);
-            buttonTakeOrderInWork.TabIndex = 2;
-            buttonTakeOrderInWork.Text = "Отдать на выполнение";
-            buttonTakeOrderInWork.UseVisualStyleBackColor = true;
-            buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
-            // 
-            // buttonOrderReady
-            // 
-            buttonOrderReady.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonOrderReady.Location = new Point(816, 167);
-            buttonOrderReady.Name = "buttonOrderReady";
-            buttonOrderReady.Size = new Size(216, 29);
-            buttonOrderReady.TabIndex = 3;
-            buttonOrderReady.Text = "Заказ готов";
-            buttonOrderReady.UseVisualStyleBackColor = true;
-            buttonOrderReady.Click += ButtonOrderReady_Click;
-            // 
             // button4
             // 
             button4.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            button4.Location = new Point(816, 230);
+            button4.Location = new Point(816, 120);
             button4.Name = "button4";
             button4.Size = new Size(216, 29);
             button4.TabIndex = 4;
@@ -175,7 +166,7 @@
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(816, 290);
+            buttonRefresh.Location = new Point(816, 180);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(216, 29);
             buttonRefresh.TabIndex = 5;
@@ -183,13 +174,6 @@
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += ButtonRefresh_Click;
             // 
-            // исполнителиToolStripMenuItem
-            // 
-            исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
-            исполнителиToolStripMenuItem.Size = new Size(224, 26);
-            исполнителиToolStripMenuItem.Text = "Исполнители";
-            исполнителиToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
-            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -197,8 +181,6 @@
             ClientSize = new Size(1043, 339);
             Controls.Add(buttonRefresh);
             Controls.Add(button4);
-            Controls.Add(buttonOrderReady);
-            Controls.Add(buttonTakeOrderInWork);
             Controls.Add(buttonCreateOrder);
             Controls.Add(dataGridView);
             Controls.Add(menuStrip);
@@ -221,8 +203,6 @@
         private ToolStripMenuItem SecuresToolStripMenuItem;
         private DataGridView dataGridView;
         private Button buttonCreateOrder;
-        private Button buttonTakeOrderInWork;
-        private Button buttonOrderReady;
         private Button button4;
         private Button buttonRefresh;
         private ToolStripMenuItem отчетыToolStripMenuItem;
@@ -231,5 +211,6 @@
         private ToolStripMenuItem списокЗаказовToolStripMenuItem;
         private ToolStripMenuItem клиентыToolStripMenuItem;
         private ToolStripMenuItem исполнителиToolStripMenuItem;
+        private ToolStripMenuItem запускРаботToolStripMenuItem;
     }
 }

SecuritySystem/SecuritySystemView/FormMain.cs

@@ -12,12 +12,14 @@ namespace SecuritySystemView
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
         private readonly IReportLogic _reportLogic;
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
+        private readonly IWorkProcess _workProcess;
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
+            _workProcess = workProcess;
         }
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -205,5 +207,11 @@ namespace SecuritySystemView
                 form.ShowDialog();
             }
         }
+
+        private void StartWorksToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
+            MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
     }
 }

SecuritySystem/SecuritySystemView/Program.cs

@@ -49,6 +49,7 @@ namespace SecuritySystemView
             services.AddTransient<IReportLogic, ReportLogic>();
             services.AddTransient<IClientLogic, ClientLogic>();
             services.AddTransient<IImplementerLogic, ImplementerLogic>();
+            services.AddTransient<IWorkProcess, WorkModeling>();
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();