From e5a9b72a7602a96ef0cb8bbf5270107798633804 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Sun, 12 Feb 2023 22:37:47 +0400 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B2=D0=B5=D1=80=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8=20=D0=BA=D0=BE=D0=B4=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BlacksmithWorkshop/FormCreateOrder.cs | 22 ++++++++--------- .../FormManufacture.Designer.cs | 16 ++++++------- .../BlacksmithWorkshop/FormManufacture.cs | 24 ++++++++++--------- .../BlacksmithWorkshop/FormManufacture.resx | 6 +++++ .../FormManufactureWorkPiece.cs | 1 + .../BlacksmithWorkshop/FormManufactures.cs | 6 ++--- .../FormWorkPiece.Designer.cs | 16 ++++++------- .../BlacksmithWorkshop/FormWorkPiece.cs | 7 +++--- .../BlacksmithWorkshop/FormWorkPieces.cs | 19 +++++++-------- 9 files changed, 62 insertions(+), 55 deletions(-) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.cs index c988e63..b9559a3 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.cs @@ -18,16 +18,16 @@ namespace BlacksmithWorkshop { private readonly ILogger _logger; - private readonly IManufactureLogic _logicA; + private readonly IManufactureLogic _logicM; private readonly IOrderLogic _logicO; - public FormCreateOrder(ILogger logger, IManufactureLogic logicA, IOrderLogic logicO) + public FormCreateOrder(ILogger logger, IManufactureLogic logicM, IOrderLogic logicO) { InitializeComponent(); _logger = logger; - _logicA = logicA; + _logicM = logicM; _logicO = logicO; } @@ -46,12 +46,13 @@ namespace BlacksmithWorkshop { int id = Convert.ToInt32(comboBoxManufacture.SelectedValue); - var manufacture = _logicA.ReadElement(new ManufactureSearchModel + var manufacture = _logicM.ReadElement(new ManufactureSearchModel { Id = id }); int count = Convert.ToInt32(textBoxCount.Text); + textBoxSum.Text = Math.Round(count * (manufacture?.Price ?? 0), 2).ToString(); _logger.LogInformation("Расчет суммы заказа"); @@ -64,12 +65,12 @@ namespace BlacksmithWorkshop } } - private void ComboBoxManufacture_SelectedIndexChanged(object sender, EventArgs e) + private void TextBoxCount_TextChanged(object sender, EventArgs e) { CalcSum(); } - private void TextBoxCount_TextChanged(object sender, EventArgs e) + private void ComboBoxManufacture_SelectedIndexChanged(object sender, EventArgs e) { CalcSum(); } @@ -78,16 +79,14 @@ namespace BlacksmithWorkshop { if (string.IsNullOrEmpty(textBoxCount.Text)) { - MessageBox.Show("Заполните поле Количество", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } if (comboBoxManufacture.SelectedValue == null) { - MessageBox.Show("Выберите изделие", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } @@ -108,8 +107,7 @@ namespace BlacksmithWorkshop throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах."); } - MessageBox.Show("Сохранение прошло успешно", "Сообщение", - MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); DialogResult = DialogResult.OK; Close(); diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.Designer.cs index 0a4a273..b1cad83 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.Designer.cs @@ -31,7 +31,7 @@ this.labelName = new System.Windows.Forms.Label(); this.labelCost = new System.Windows.Forms.Label(); this.textBoxName = new System.Windows.Forms.TextBox(); - this.textBoxCost = new System.Windows.Forms.TextBox(); + this.textBoxPrice = new System.Windows.Forms.TextBox(); this.groupBoxWorkPiece = new System.Windows.Forms.GroupBox(); this.buttonRef = new System.Windows.Forms.Button(); this.buttonDel = new System.Windows.Forms.Button(); @@ -71,12 +71,12 @@ this.textBoxName.Size = new System.Drawing.Size(332, 27); this.textBoxName.TabIndex = 2; // - // textBoxCost + // textBoxPrice // - this.textBoxCost.Location = new System.Drawing.Point(133, 81); - this.textBoxCost.Name = "textBoxCost"; - this.textBoxCost.Size = new System.Drawing.Size(196, 27); - this.textBoxCost.TabIndex = 3; + this.textBoxPrice.Location = new System.Drawing.Point(133, 81); + this.textBoxPrice.Name = "textBoxPrice"; + this.textBoxPrice.Size = new System.Drawing.Size(196, 27); + this.textBoxPrice.TabIndex = 3; // // groupBoxWorkPiece // @@ -187,7 +187,7 @@ this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); this.Controls.Add(this.groupBoxWorkPiece); - this.Controls.Add(this.textBoxCost); + this.Controls.Add(this.textBoxPrice); this.Controls.Add(this.textBoxName); this.Controls.Add(this.labelCost); this.Controls.Add(this.labelName); @@ -206,7 +206,7 @@ private Label labelName; private Label labelCost; private TextBox textBoxName; - private TextBox textBoxCost; + private TextBox textBoxPrice; private GroupBox groupBoxWorkPiece; private Button buttonRef; private Button buttonDel; diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs index 70119b1..1aed36c 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs @@ -49,7 +49,7 @@ namespace BlacksmithWorkshop if(view != null) { textBoxName.Text = view.ManufactureName; - textBoxCost.Text = view.Price.ToString(); + textBoxPrice.Text = view.Price.ToString(); _manufactureWorkPieces = view.ManufactureWorkPieces ?? new Dictionary(); LoadData(); } @@ -77,7 +77,7 @@ namespace BlacksmithWorkshop dataGridView.Rows.Add(new object[] { awp.Key, awp.Value.Item1.WorkPieceName, awp.Value.Item2 }); } - textBoxCost.Text = CalcPrice().ToString(); + textBoxPrice.Text = CalcPrice().ToString(); } } catch(Exception ex) @@ -90,13 +90,16 @@ namespace BlacksmithWorkshop private void ButtonAdd_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormManufactureWorkPiece)); + if (service is FormManufactureWorkPiece form) + { if (form.ShowDialog() == DialogResult.OK) { if (form.WorkPieceModel == null) { return; } + _logger.LogInformation("Добавление новой заготовки:{WorkPieceName} - {Count}", form.WorkPieceModel.WorkPieceName, form.Count); if (_manufactureWorkPieces.ContainsKey(form.Id)) @@ -110,6 +113,7 @@ namespace BlacksmithWorkshop LoadData(); } + } } private void ButtonUpd_Click(object sender, EventArgs e) @@ -131,7 +135,7 @@ namespace BlacksmithWorkshop return; } - _logger.LogInformation("Изменение компонента:{ComponentName} - {Count}", form.WorkPieceModel.WorkPieceName, form.Count); + _logger.LogInformation("Изменение компонента:{WorkPieceName} - {Count}", form.WorkPieceModel.WorkPieceName, form.Count); _manufactureWorkPieces[form.Id] = (form.WorkPieceModel, form.Count); LoadData(); @@ -144,8 +148,7 @@ namespace BlacksmithWorkshop { if (dataGridView.SelectedRows.Count == 1) { - if (MessageBox.Show("Удалить запись?", "Вопрос", - MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { try { @@ -154,8 +157,7 @@ namespace BlacksmithWorkshop } catch (Exception ex) { - MessageBox.Show(ex.Message, "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } LoadData(); @@ -177,7 +179,7 @@ namespace BlacksmithWorkshop return; } - if (string.IsNullOrEmpty(textBoxCost.Text)) + if (string.IsNullOrEmpty(textBoxPrice.Text)) { MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -199,12 +201,11 @@ namespace BlacksmithWorkshop { Id = _id ?? 0, ManufactureName = textBoxName.Text, - Price = Convert.ToDouble(textBoxCost.Text), + Price = Convert.ToDouble(textBoxPrice.Text), ManufactureWorkPieces = _manufactureWorkPieces }; - var operationResult = _id.HasValue ? _logic.Update(model) : - _logic.Create(model); + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); if (!operationResult) { @@ -229,6 +230,7 @@ namespace BlacksmithWorkshop Close(); } + //в конце умножить на 1.1, так как прибавляем к итоговой стоимости некоторый процент (в данном случае 10%) private double CalcPrice() { double price = 0; diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.resx index be598c0..28b295d 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.resx +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.resx @@ -63,4 +63,10 @@ True + + True + + + True + \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactureWorkPiece.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactureWorkPiece.cs index f367911..867351a 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactureWorkPiece.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactureWorkPiece.cs @@ -68,6 +68,7 @@ namespace BlacksmithWorkshop return; } + if (comboBoxWorkPiece.SelectedValue == null) { MessageBox.Show("Выберите заготовку", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs index e0dad9e..cb2c552 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs @@ -46,11 +46,11 @@ namespace BlacksmithWorkshop dataGridView.Columns["ColumnName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } - _logger.LogInformation("Загрузка компонентов"); + _logger.LogInformation("Загрузка изделий"); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки компонентов"); + _logger.LogError(ex, "Ошибка загрузки изделий"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -93,7 +93,7 @@ namespace BlacksmithWorkshop { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Удаление компонента"); + _logger.LogInformation("Удаление изделия"); try { diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPiece.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPiece.Designer.cs index 020f587..c508b2a 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPiece.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPiece.Designer.cs @@ -31,7 +31,7 @@ this.labelName = new System.Windows.Forms.Label(); this.labelPrice = new System.Windows.Forms.Label(); this.textBoxName = new System.Windows.Forms.TextBox(); - this.textBoxPrice = new System.Windows.Forms.TextBox(); + this.textBoxCost = new System.Windows.Forms.TextBox(); this.buttonCancel = new System.Windows.Forms.Button(); this.buttonSave = new System.Windows.Forms.Button(); this.SuspendLayout(); @@ -61,12 +61,12 @@ this.textBoxName.Size = new System.Drawing.Size(293, 27); this.textBoxName.TabIndex = 2; // - // textBoxPrice + // textBoxCost // - this.textBoxPrice.Location = new System.Drawing.Point(127, 62); - this.textBoxPrice.Name = "textBoxPrice"; - this.textBoxPrice.Size = new System.Drawing.Size(179, 27); - this.textBoxPrice.TabIndex = 3; + this.textBoxCost.Location = new System.Drawing.Point(127, 62); + this.textBoxCost.Name = "textBoxCost"; + this.textBoxCost.Size = new System.Drawing.Size(179, 27); + this.textBoxCost.TabIndex = 3; // // buttonCancel // @@ -95,7 +95,7 @@ this.ClientSize = new System.Drawing.Size(464, 153); this.Controls.Add(this.buttonSave); this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.textBoxPrice); + this.Controls.Add(this.textBoxCost); this.Controls.Add(this.textBoxName); this.Controls.Add(this.labelPrice); this.Controls.Add(this.labelName); @@ -112,7 +112,7 @@ private Label labelName; private Label labelPrice; private TextBox textBoxName; - private TextBox textBoxPrice; + private TextBox textBoxCost; private Button buttonCancel; private Button buttonSave; } diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPiece.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPiece.cs index c5a3e7d..94bce93 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPiece.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPiece.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging; namespace BlacksmithWorkshop { // "" - public partial class FormWorkPiece : System.Windows.Forms.Form + public partial class FormWorkPiece : Form { private readonly ILogger _logger; @@ -20,6 +20,7 @@ namespace BlacksmithWorkshop public FormWorkPiece(ILogger logger, IWorkPieceLogic logic) { InitializeComponent(); + _logger = logger; _logic = logic; } @@ -39,7 +40,7 @@ namespace BlacksmithWorkshop if(view != null) { textBoxName.Text = view.WorkPieceName; - textBoxPrice.Text = view.Cost.ToString(); + textBoxCost.Text = view.Cost.ToString(); } } catch(Exception ex) @@ -70,7 +71,7 @@ namespace BlacksmithWorkshop { Id = _id ?? 0, WorkPieceName = textBoxName.Text, - Cost = Convert.ToDouble(textBoxPrice.Text) + Cost = Convert.ToDouble(textBoxCost.Text) }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPieces.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPieces.cs index 8943400..0007c92 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPieces.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPieces.cs @@ -17,9 +17,9 @@ namespace BlacksmithWorkshop { private readonly ILogger _logger; - private readonly IManufactureLogic _logic; + private readonly IWorkPieceLogic _logic; - public FormWorkPieces(ILogger logger, IManufactureLogic logic) + public FormWorkPieces(ILogger logger, IWorkPieceLogic logic) { InitializeComponent(); _logger = logger; @@ -42,14 +42,14 @@ namespace BlacksmithWorkshop { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ManufactureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["WorkPieceName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } - _logger.LogInformation("Загрузка компонентов"); + _logger.LogInformation("Загрузка заготовок"); } catch(Exception ex) { - _logger.LogError(ex, "Ошибка загрузки компонентов"); + _logger.LogError(ex, "Ошибка загрузки заготовок"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -57,9 +57,9 @@ namespace BlacksmithWorkshop private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormWorkPieces)); + var service = Program.ServiceProvider?.GetService(typeof(FormWorkPiece)); - if (service is FormWorkPieces form) + if (service is FormWorkPiece form) { if (form.ShowDialog() == DialogResult.OK) { @@ -99,7 +99,7 @@ namespace BlacksmithWorkshop try { - if (!_logic.Delete(new ManufactureBindingModel + if (!_logic.Delete(new WorkPieceBindingModel { Id = id })) @@ -112,8 +112,7 @@ namespace BlacksmithWorkshop catch (Exception ex) { _logger.LogError(ex, "Ошибка удаления компонента"); - MessageBox.Show(ex.Message, "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } }