From e841730166cb52fb9cb7a11e1366686eebdb348c Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Mon, 2 Dec 2024 15:20:07 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=20?= =?UTF-8?q?=D0=BA=20=D1=81=D0=B4=D0=B0=D1=87=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Forms/FormStorageDetail.Designer.cs | 44 +++++++++--- .../Forms/FormStorageDetail.cs | 68 +------------------ .../Forms/FormStorageDetails.Designer.cs | 5 +- 3 files changed, 41 insertions(+), 76 deletions(-) diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.Designer.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.Designer.cs index 3d547e3..1a4a782 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.Designer.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.Designer.cs @@ -35,7 +35,9 @@ label3 = new Label(); numericUpDown1 = new NumericUpDown(); dateTimePicker1 = new DateTimePicker(); - textBox1 = new TextBox(); + comboBoxAddress = new ComboBox(); + label4 = new Label(); + comboBoxDetail = new ComboBox(); ((System.ComponentModel.ISupportInitialize)numericUpDown1).BeginInit(); SuspendLayout(); // @@ -100,19 +102,41 @@ dateTimePicker1.Size = new Size(187, 25); dateTimePicker1.TabIndex = 6; // - // textBox1 + // comboBoxAddress // - textBox1.Location = new Point(127, 15); - textBox1.Name = "textBox1"; - textBox1.Size = new Size(175, 25); - textBox1.TabIndex = 7; + comboBoxAddress.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxAddress.FormattingEnabled = true; + comboBoxAddress.Location = new Point(119, 148); + comboBoxAddress.Name = "comboBoxAddress"; + comboBoxAddress.Size = new Size(183, 25); + comboBoxAddress.TabIndex = 8; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(15, 151); + label4.Name = "label4"; + label4.Size = new Size(91, 17); + label4.TabIndex = 9; + label4.Text = "Адрес склада:"; + // + // comboBoxDetail + // + comboBoxDetail.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxDetail.FormattingEnabled = true; + comboBoxDetail.Location = new Point(119, 23); + comboBoxDetail.Name = "comboBoxDetail"; + comboBoxDetail.Size = new Size(183, 25); + comboBoxDetail.TabIndex = 10; // // FormStorageDetail // AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(393, 435); - Controls.Add(textBox1); + ClientSize = new Size(393, 283); + Controls.Add(comboBoxDetail); + Controls.Add(label4); + Controls.Add(comboBoxAddress); Controls.Add(dateTimePicker1); Controls.Add(numericUpDown1); Controls.Add(label3); @@ -136,6 +160,8 @@ private Label label3; private NumericUpDown numericUpDown1; private DateTimePicker dateTimePicker1; - private TextBox textBox1; + private ComboBox comboBoxAddress; + private Label label4; + private ComboBox comboBoxDetail; } } \ No newline at end of file diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.cs index abb6499..ef33882 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.cs @@ -16,16 +16,6 @@ namespace ProjectRepairCompany.Forms { private readonly IStorageDetailRepository _storageDetailRepository; private readonly IDetailRepository _detailRepository; - private int? _storageId; // ID записи для редактирования - - public int Id - { - set - { - _storageId = value; - LoadData(); - } - } public FormStorageDetail(IStorageDetailRepository storageDetailRepository, IDetailRepository detailRepository) { @@ -34,67 +24,15 @@ namespace ProjectRepairCompany.Forms _detailRepository = detailRepository ?? throw new ArgumentNullException(nameof(detailRepository)); } - private void FormStorageDetailAdd_Load(object sender, EventArgs e) - { - if (_storageId.HasValue) - { - LoadData(); - } - } - - private void LoadData() - { - try - { - if (!_storageId.HasValue) - { - return; - } - - var storageDetail = _storageDetailRepository.ReadStorageDetails() - .FirstOrDefault(x => x.StorageId == _storageId.Value); - if (storageDetail == null) - { - throw new Exception("Запись не найдена."); - } - - textBox1.Text = _detailRepository.ReadDetailById(storageDetail.DetailId)?.NameDetail; - numericUpDown1.Value = storageDetail.DetailCount; - dateTimePicker1.Value = storageDetail.SupplyDate; - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка загрузки данных", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void ButtonSave_Click(object sender, EventArgs e) { try { - // Проверка на заполненность данных - if (string.IsNullOrWhiteSpace(textBox1.Text) || numericUpDown1.Value <= 0) + if (comboBoxDetail.SelectedIndex < 0 || comboBoxAddress.SelectedIndex < 0 || Convert.ToInt32(numericUpDown1.Value) == 0) { - throw new Exception("Необходимо заполнить все поля."); + throw new Exception("Заполни все поля"); } - - // Получение данных из формы - var detail = _detailRepository.ReadDetails() - .FirstOrDefault(d => d.NameDetail == textBox1.Text); - - if (detail == null) - { - throw new Exception("Деталь с указанным названием не найдена."); - } - - var storageDetail = StorageDetail.CreateOperation( - storageId: _storageId ?? 0, - detailId: detail.Id, - detailCount: (int)numericUpDown1.Value, - supplyDate: dateTimePicker1.Value - ); - - _storageDetailRepository.CreateStorageDetail(storageDetail); + _storageDetailRepository.CreateStorageDetail(StorageDetail.CreateOperation((int)comboBoxAddress.SelectedValue!, (int)comboBoxDetail.SelectedValue!, Convert.ToInt32(numericUpDown1.Value), dateTimePicker1.Value)); Close(); } catch (Exception ex) diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.Designer.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.Designer.cs index 32b0488..0b5c85d 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.Designer.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.Designer.cs @@ -73,15 +73,16 @@ dataGridView.Size = new Size(607, 450); dataGridView.TabIndex = 4; // - // FormStorageDetail + // FormStorageDetails // AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 450); Controls.Add(dataGridView); Controls.Add(panel1); - Name = "FormStorageDetail"; + Name = "FormStorageDetails"; Text = "Пополнение деталей"; + Load += FormStorageDetail_Load; panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); -- 2.25.1 From a8a2fd350e9f37cf332dbed84adb75f8575c8bb7 Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Sun, 15 Dec 2024 15:41:14 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=BD=D0=B5=D0=BF=D0=BE=D0=BB=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81=20=D0=B4=D0=BB=D1=8F=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=BD=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRepairCompany/Entities/Order.cs | 24 +++++-------------- .../Entities/OrderDetail.cs | 6 ++--- .../Entities/StorageDetail.cs | 2 +- .../Implementations/OrderRepository.cs | 2 +- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/ProjectRepairCompany/ProjectRepairCompany/Entities/Order.cs b/ProjectRepairCompany/ProjectRepairCompany/Entities/Order.cs index ecf0341..221a475 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Entities/Order.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Entities/Order.cs @@ -14,34 +14,22 @@ public class Order public DateTime DateIssue { get; private set; } public int FullPrice { get; private set; } public int MasterId { get; private set; } - public List OrderDetails { get; private set; } + public IEnumerable OrderDetails { get; private set; } = []; - private Order() + public static Order CreateOperation(int id, int fullPrice, int masterId, DateTime dateCompletion, + DateTime dateIssue, IEnumerable orderDetails) { - OrderDetails = new List(); - } - public static Order CreateOperation(int id, int fullPrice, int masterId, DateTime dateCompletion, DateTime dateIssue) - { - if (dateCompletion > DateTime.Now || dateIssue > DateTime.Now) - { - throw new ArgumentException("Дата начала работы и дата завершения не могут быть в будущем."); - } return new Order { Id = id, - OrderDate = DateTime.Now, // Автоматически задается текущая дата + OrderDate = DateTime.Now, DateCompletion = dateCompletion, DateIssue = dateIssue, FullPrice = fullPrice, - MasterId = masterId + MasterId = masterId, + OrderDetails = orderDetails }; } - - public void AddOrderDetail(int detailId, int detailPrice, int detailCount) - { - var orderDetail = OrderDetail.CreateOperation(this.Id, detailId, detailPrice, detailCount); - OrderDetails.Add(orderDetail); - } } diff --git a/ProjectRepairCompany/ProjectRepairCompany/Entities/OrderDetail.cs b/ProjectRepairCompany/ProjectRepairCompany/Entities/OrderDetail.cs index d240c09..00073f2 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Entities/OrderDetail.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Entities/OrderDetail.cs @@ -10,16 +10,14 @@ public class OrderDetail { public int OrderId { get; private set; } public int DetailId { get; private set; } - public int DetailPrice { get; private set; } - public int DetailCount { get; private set; } + public int DetailCount { get; private set; } - public static OrderDetail CreateOperation(int orderId, int detailId, int detailPrice, int detailCount) + public static OrderDetail CreateOperation(int orderId, int detailId, int detailCount) { return new OrderDetail { OrderId = orderId, DetailId = detailId, - DetailPrice = detailPrice, DetailCount = detailCount }; } diff --git a/ProjectRepairCompany/ProjectRepairCompany/Entities/StorageDetail.cs b/ProjectRepairCompany/ProjectRepairCompany/Entities/StorageDetail.cs index bdec3fe..bbed691 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Entities/StorageDetail.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Entities/StorageDetail.cs @@ -10,7 +10,7 @@ public class StorageDetail { public int StorageId { get; private set; } public int DetailId { get; private set; } - public int DetailCount { get; private set; } + public int DetailCount { get; private set; } public DateTime SupplyDate { get; private set; } // Дата поступления деталей public static StorageDetail CreateOperation(int storageId, int detailId, int detailCount, DateTime supplyDate) diff --git a/ProjectRepairCompany/ProjectRepairCompany/Repositories/Implementations/OrderRepository.cs b/ProjectRepairCompany/ProjectRepairCompany/Repositories/Implementations/OrderRepository.cs index deaa6c7..ddb770a 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Repositories/Implementations/OrderRepository.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Repositories/Implementations/OrderRepository.cs @@ -20,7 +20,7 @@ public class OrderRepository : IOrderRepository public Order ReadOrderById(int id) { - return Order.CreateOperation(0, 0, 0, DateTime.MinValue, DateTime.MinValue); + return Order.CreateOperation(0, 0, 0, DateTime.MinValue, DateTime.MinValue, Enumerable.Empty()); } public IEnumerable ReadOrders() -- 2.25.1 From 8a60aa872a41a856f4a6bfac0d8655c6be4374fe Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Sun, 15 Dec 2024 16:20:27 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Forms/FormOrder.Designer.cs | 49 +++++----- .../ProjectRepairCompany/Forms/FormOrder.cs | 97 ++++++++++++++----- .../ProjectRepairCompany/Forms/FormOrders.cs | 26 ++--- .../Forms/FormStorageDetail.Designer.cs | 36 +++---- .../Forms/FormStorageDetail.cs | 4 +- .../Forms/FormStorageDetails.Designer.cs | 2 +- .../Forms/FormStorageDetails.cs | 2 +- 7 files changed, 132 insertions(+), 84 deletions(-) diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrder.Designer.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrder.Designer.cs index 6ce1a5d..3d1fa63 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrder.Designer.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrder.Designer.cs @@ -32,7 +32,7 @@ ButtonCancel = new Button(); label1 = new Label(); label2 = new Label(); - dateTimePicker1 = new DateTimePicker(); + dateTimePickerOrderDate = new DateTimePicker(); dateTimeCompletion = new DateTimePicker(); dateTimeIssue = new DateTimePicker(); label3 = new Label(); @@ -40,12 +40,12 @@ numericUpDownFullPrice = new NumericUpDown(); label5 = new Label(); comboBoxMaster = new ComboBox(); - groupBox1 = new GroupBox(); + groupBoxDetail = new GroupBox(); dataGridView = new DataGridView(); Detail = new DataGridViewComboBoxColumn(); DetailCount = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)numericUpDownFullPrice).BeginInit(); - groupBox1.SuspendLayout(); + groupBoxDetail.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // @@ -89,13 +89,13 @@ label2.TabIndex = 3; label2.Text = "Дата начала работы:"; // - // dateTimePicker1 + // dateTimePickerOrderDate // - dateTimePicker1.Enabled = false; - dateTimePicker1.Location = new Point(190, 12); - dateTimePicker1.Name = "dateTimePicker1"; - dateTimePicker1.Size = new Size(188, 25); - dateTimePicker1.TabIndex = 4; + dateTimePickerOrderDate.Enabled = false; + dateTimePickerOrderDate.Location = new Point(190, 12); + dateTimePickerOrderDate.Name = "dateTimePickerOrderDate"; + dateTimePickerOrderDate.Size = new Size(188, 25); + dateTimePickerOrderDate.TabIndex = 4; // // dateTimeCompletion // @@ -156,28 +156,31 @@ comboBoxMaster.Size = new Size(182, 25); comboBoxMaster.TabIndex = 11; // - // groupBox1 + // groupBoxDetail // - groupBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - groupBox1.Controls.Add(dataGridView); - groupBox1.Location = new Point(30, 234); - groupBox1.Name = "groupBox1"; - groupBox1.Size = new Size(401, 224); - groupBox1.TabIndex = 12; - groupBox1.TabStop = false; - groupBox1.Text = "groupBox1"; + groupBoxDetail.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + groupBoxDetail.Controls.Add(dataGridView); + groupBoxDetail.Location = new Point(30, 234); + groupBoxDetail.Name = "groupBoxDetail"; + groupBoxDetail.RightToLeft = RightToLeft.No; + groupBoxDetail.Size = new Size(401, 224); + groupBoxDetail.TabIndex = 12; + groupBoxDetail.TabStop = false; + groupBoxDetail.Text = "Детали"; // // dataGridView // dataGridView.AllowUserToDeleteRows = false; dataGridView.AllowUserToResizeColumns = false; dataGridView.AllowUserToResizeRows = false; + dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Columns.AddRange(new DataGridViewColumn[] { Detail, DetailCount }); dataGridView.Location = new Point(3, 21); dataGridView.MultiSelect = false; dataGridView.Name = "dataGridView"; dataGridView.RowHeadersVisible = false; + dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.DisableResizing; dataGridView.Size = new Size(395, 200); dataGridView.TabIndex = 0; // @@ -196,7 +199,7 @@ AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(461, 532); - Controls.Add(groupBox1); + Controls.Add(groupBoxDetail); Controls.Add(comboBoxMaster); Controls.Add(label5); Controls.Add(numericUpDownFullPrice); @@ -204,7 +207,7 @@ Controls.Add(label3); Controls.Add(dateTimeIssue); Controls.Add(dateTimeCompletion); - Controls.Add(dateTimePicker1); + Controls.Add(dateTimePickerOrderDate); Controls.Add(label2); Controls.Add(label1); Controls.Add(ButtonCancel); @@ -213,7 +216,7 @@ StartPosition = FormStartPosition.CenterParent; Text = "Заказ"; ((System.ComponentModel.ISupportInitialize)numericUpDownFullPrice).EndInit(); - groupBox1.ResumeLayout(false); + groupBoxDetail.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); PerformLayout(); @@ -225,7 +228,7 @@ private Button ButtonCancel; private Label label1; private Label label2; - private DateTimePicker dateTimePicker1; + private DateTimePicker dateTimePickerOrderDate; private DateTimePicker dateTimeCompletion; private DateTimePicker dateTimeIssue; private Label label3; @@ -233,7 +236,7 @@ private NumericUpDown numericUpDownFullPrice; private Label label5; private ComboBox comboBoxMaster; - private GroupBox groupBox1; + private GroupBox groupBoxDetail; private DataGridView dataGridView; private DataGridViewComboBoxColumn Detail; private DataGridViewTextBoxColumn DetailCount; diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrder.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrder.cs index 8d70b23..86064bb 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrder.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrder.cs @@ -12,15 +12,48 @@ namespace ProjectRepairCompany.Forms public partial class FormOrder : Form { private readonly IOrderRepository _orderRepository; - private readonly IDetailRepository _detailRepository; + private int? _orderId; + public int Id + { + set + { + try + { + var order = _orderRepository.ReadOrderById(value); + if (order == null) + { + throw new InvalidOperationException(nameof(order)); + } + + comboBoxMaster.SelectedValue = order.MasterId; + numericUpDownFullPrice.Value = (decimal)order.FullPrice; + dateTimeCompletion.Value = order.DateCompletion; + dateTimeIssue.Value = order.DateIssue; + + foreach (var detail in order.OrderDetails) + { + dataGridView.Rows.Add(detail.DetailId, detail.DetailCount); + } + + _orderId = value; + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + } + } public FormOrder(IOrderRepository orderRepository, IMasterRepository masterRepository, IDetailRepository detailRepository) { InitializeComponent(); + _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository)); + comboBoxMaster.DataSource = masterRepository.ReadMasters(); - comboBoxMaster.DisplayMember = "Name"; + comboBoxMaster.DisplayMember = "MasterName"; comboBoxMaster.ValueMember = "Id"; Detail.DataSource = detailRepository.ReadDetails(); @@ -37,29 +70,16 @@ namespace ProjectRepairCompany.Forms throw new Exception("Имеются незаполненные поля."); } - var order = Order.CreateOperation( - id: 0, - fullPrice: (int)numericUpDownFullPrice.Value, - masterId: (int)comboBoxMaster.SelectedValue!, - dateCompletion: dateTimeCompletion.Value, - dateIssue: dateTimeIssue.Value); - - foreach (DataGridViewRow row in dataGridView.Rows) + var order = CreateOrder(); + if (_orderId.HasValue) { - if (row.Cells["Detail"].Value == null || row.Cells["DetailCount"].Value == null) - { - continue; - } - - int detailId = (int)row.Cells["Detail"].Value; - int detailCount = int.Parse(row.Cells["DetailCount"].Value.ToString() ?? "0"); - var detailPrice = (int)_detailRepository.ReadDetailById(detailId).PriceDetail; - - order.AddOrderDetail(detailId, detailPrice, detailCount); + _orderRepository.UpdateOrder(order); } - - _orderRepository.CreateOrder(order); - + else + { + _orderRepository.CreateOrder(order); + } + DialogResult = DialogResult.OK; Close(); } catch (Exception ex) @@ -69,5 +89,36 @@ namespace ProjectRepairCompany.Forms } private void ButtonCancel_Click(object sender, EventArgs e) => Close(); + + private List CreateListOrderDetailsFromDataGrid() + { + var list = new List(); + foreach (DataGridViewRow row in dataGridView.Rows) + { + if (row.Cells["Detail"].Value == null || + row.Cells["DetailCount"].Value == null) + { + continue; + } + list.Add(OrderDetail.CreateOperation(0, + Convert.ToInt32(row.Cells["Detail"].Value), + Convert.ToInt32(row.Cells["DetailCount"].Value))); + } + return list; + } + private Order CreateOrder() + { + var orderDetails = CreateListOrderDetailsFromDataGrid(); + + return Order.CreateOperation( + _orderId ?? 0, + Convert.ToInt32(numericUpDownFullPrice.Value), + (int)comboBoxMaster.SelectedValue, + dateTimeCompletion.Value, + dateTimeIssue.Value, + orderDetails + ); + } + } } diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrders.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrders.cs index 929168a..5121f64 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrders.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormOrders.cs @@ -1,4 +1,5 @@ using ProjectRepairCompany.Repositories; +using ProjectRepairCompany.Entities; using System; using System.Collections.Generic; using System.ComponentModel; @@ -53,16 +54,19 @@ namespace ProjectRepairCompany.Forms private void ButtonUp_Click(object sender, EventArgs e) { - if (!TryGetIdentifierFromSelectRow(out int findId)) + if (!TryGetIdentifierFromSelectRow(out var findId)) { return; } try { - var form = _container.Resolve(); + var form = _container.Resolve(); form.Id = findId; - form.ShowDialog(); - LoadList(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadList(); + dataGridView.Refresh(); + } } catch (Exception ex) { @@ -72,7 +76,7 @@ namespace ProjectRepairCompany.Forms private void ButtonDel_Click(object sender, EventArgs e) { - if (!TryGetIdentifierFromSelectRow(out int findId)) + if (!TryGetIdentifierFromSelectRow(out var findId)) { return; } @@ -91,17 +95,7 @@ namespace ProjectRepairCompany.Forms } } - private void LoadList() - { - try - { - dataGridView.DataSource = _orderRepository.ReadOrders(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка загрузки данных", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } + private void LoadList() => dataGridView.DataSource = _orderRepository.ReadOrders(); private bool TryGetIdentifierFromSelectRow(out int id) { diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.Designer.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.Designer.cs index 1a4a782..3b04e42 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.Designer.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.Designer.cs @@ -33,12 +33,12 @@ label1 = new Label(); label2 = new Label(); label3 = new Label(); - numericUpDown1 = new NumericUpDown(); - dateTimePicker1 = new DateTimePicker(); + numericUpDownCount = new NumericUpDown(); + dateTimePickerDate = new DateTimePicker(); comboBoxAddress = new ComboBox(); label4 = new Label(); comboBoxDetail = new ComboBox(); - ((System.ComponentModel.ISupportInitialize)numericUpDown1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownCount).BeginInit(); SuspendLayout(); // // ButtonSave @@ -88,19 +88,19 @@ label3.TabIndex = 4; label3.Text = "Дата"; // - // numericUpDown1 + // numericUpDownCount // - numericUpDown1.Location = new Point(128, 62); - numericUpDown1.Name = "numericUpDown1"; - numericUpDown1.Size = new Size(154, 25); - numericUpDown1.TabIndex = 5; + numericUpDownCount.Location = new Point(128, 62); + numericUpDownCount.Name = "numericUpDownCount"; + numericUpDownCount.Size = new Size(154, 25); + numericUpDownCount.TabIndex = 5; // - // dateTimePicker1 + // dateTimePickerDate // - dateTimePicker1.Location = new Point(119, 104); - dateTimePicker1.Name = "dateTimePicker1"; - dateTimePicker1.Size = new Size(187, 25); - dateTimePicker1.TabIndex = 6; + dateTimePickerDate.Location = new Point(119, 104); + dateTimePickerDate.Name = "dateTimePickerDate"; + dateTimePickerDate.Size = new Size(187, 25); + dateTimePickerDate.TabIndex = 6; // // comboBoxAddress // @@ -137,8 +137,8 @@ Controls.Add(comboBoxDetail); Controls.Add(label4); Controls.Add(comboBoxAddress); - Controls.Add(dateTimePicker1); - Controls.Add(numericUpDown1); + Controls.Add(dateTimePickerDate); + Controls.Add(numericUpDownCount); Controls.Add(label3); Controls.Add(label2); Controls.Add(label1); @@ -146,7 +146,7 @@ Controls.Add(ButtonSave); Name = "FormStorageDetail"; Text = "FormStorageDetail"; - ((System.ComponentModel.ISupportInitialize)numericUpDown1).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownCount).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -158,8 +158,8 @@ private Label label1; private Label label2; private Label label3; - private NumericUpDown numericUpDown1; - private DateTimePicker dateTimePicker1; + private NumericUpDown numericUpDownCount; + private DateTimePicker dateTimePickerDate; private ComboBox comboBoxAddress; private Label label4; private ComboBox comboBoxDetail; diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.cs index ef33882..3cf2ab7 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetail.cs @@ -28,11 +28,11 @@ namespace ProjectRepairCompany.Forms { try { - if (comboBoxDetail.SelectedIndex < 0 || comboBoxAddress.SelectedIndex < 0 || Convert.ToInt32(numericUpDown1.Value) == 0) + if (comboBoxDetail.SelectedIndex < 0 || comboBoxAddress.SelectedIndex < 0 || Convert.ToInt32(numericUpDownCount.Value) == 0) { throw new Exception("Заполни все поля"); } - _storageDetailRepository.CreateStorageDetail(StorageDetail.CreateOperation((int)comboBoxAddress.SelectedValue!, (int)comboBoxDetail.SelectedValue!, Convert.ToInt32(numericUpDown1.Value), dateTimePicker1.Value)); + _storageDetailRepository.CreateStorageDetail(StorageDetail.CreateOperation((int)comboBoxAddress.SelectedValue!, (int)comboBoxDetail.SelectedValue!, Convert.ToInt32(numericUpDownCount.Value), dateTimePickerDate.Value)); Close(); } catch (Exception ex) diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.Designer.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.Designer.cs index 0b5c85d..ca5bc67 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.Designer.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.Designer.cs @@ -81,7 +81,7 @@ Controls.Add(dataGridView); Controls.Add(panel1); Name = "FormStorageDetails"; - Text = "Пополнение деталей"; + Text = "Пополнение складов"; Load += FormStorageDetail_Load; panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); diff --git a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.cs b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.cs index c486851..6455361 100644 --- a/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.cs +++ b/ProjectRepairCompany/ProjectRepairCompany/Forms/FormStorageDetails.cs @@ -34,7 +34,7 @@ namespace ProjectRepairCompany.Forms { try { - _container.Resolve().ShowDialog(); // Форма добавления StorageDetail + _container.Resolve().ShowDialog(); LoadList(); } catch (Exception ex) -- 2.25.1