From ac6ab33e2c81a0219011042b83c90261ad18f3f8 Mon Sep 17 00:00:00 2001 From: the Date: Sun, 23 Jun 2024 22:32:43 +0400 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=B0=D0=B7=D1=8B=20=D0=B3?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2=D1=8B,=20=D0=BC=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC=D1=83=D0=BC=20=D0=BE=D1=81=D1=82=D0=B0=D0=BB=D0=BE?= =?UTF-8?q?=D1=81=D1=8C=20=D0=B4=D0=B0=D1=82=D1=83=20=D0=B7=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WinFormsApp/FormMain.Designer.cs | 13 +++++++++++++ WinFormsApp/FormMain.cs | 30 +++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/WinFormsApp/FormMain.Designer.cs b/WinFormsApp/FormMain.Designer.cs index 706261e..1567d57 100644 --- a/WinFormsApp/FormMain.Designer.cs +++ b/WinFormsApp/FormMain.Designer.cs @@ -34,6 +34,7 @@ товарыToolStripMenuItem = new ToolStripMenuItem(); поставщикиToolStripMenuItem = new ToolStripMenuItem(); buttonSupplyStatusArriving = new Button(); + buttonSupplyStatusCompleted = new Button(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); menuStrip1.SuspendLayout(); SuspendLayout(); @@ -90,11 +91,22 @@ buttonSupplyStatusArriving.UseVisualStyleBackColor = true; buttonSupplyStatusArriving.Click += buttonSupplyStatusArriving_Click; // + // buttonSupplyStatusCompleted + // + buttonSupplyStatusCompleted.Location = new Point(707, 125); + buttonSupplyStatusCompleted.Name = "buttonSupplyStatusCompleted"; + buttonSupplyStatusCompleted.Size = new Size(154, 23); + buttonSupplyStatusCompleted.TabIndex = 4; + buttonSupplyStatusCompleted.Text = "Поставка завершена"; + buttonSupplyStatusCompleted.UseVisualStyleBackColor = true; + buttonSupplyStatusCompleted.Click += buttonSupplyStatusCompleted_Click; + // // FormMain // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(901, 384); + Controls.Add(buttonSupplyStatusCompleted); Controls.Add(buttonSupplyStatusArriving); Controls.Add(buttonCreateSupply); Controls.Add(dataGridView); @@ -118,5 +130,6 @@ private ToolStripMenuItem товарыToolStripMenuItem; private ToolStripMenuItem поставщикиToolStripMenuItem; private Button buttonSupplyStatusArriving; + private Button buttonSupplyStatusCompleted; } } \ No newline at end of file diff --git a/WinFormsApp/FormMain.cs b/WinFormsApp/FormMain.cs index b3c05e3..e9fa189 100644 --- a/WinFormsApp/FormMain.cs +++ b/WinFormsApp/FormMain.cs @@ -96,7 +96,35 @@ namespace WinFormsApp }, SupplyStatus.Arriving); if (!operationResult) { - //throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка передачи заказа в работу"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + + private void buttonSupplyStatusCompleted_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + Guid id = (Guid)dataGridView.SelectedRows[0].Cells["Id"].Value; + _logger.LogInformation("Поставка No{id}. Меняется статус", id); + try + { + var operationResult = _supplyLogic.StatusUpdate(new SupplyBindingModel + { + Id = id, + Status = (SupplyStatus)dataGridView.SelectedRows[0].Cells["Status"].Value + }, SupplyStatus.Completed); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); } LoadData(); }