diff --git a/ProjectPublishing/ProjectPublishing/Entities/Order.cs b/ProjectPublishing/ProjectPublishing/Entities/Order.cs index b2c4072..e35107b 100644 --- a/ProjectPublishing/ProjectPublishing/Entities/Order.cs +++ b/ProjectPublishing/ProjectPublishing/Entities/Order.cs @@ -24,9 +24,9 @@ namespace ProjectPublishing.Entities public int PrintingId { get; private set; } - public List Materials { get; private set; } + public List Materials { get; private set; } - public static Order CreateOrder(int id, string description, ProductType productType, int amount, OrderStatus status, int customerId, int printingId, List materials) + public static Order CreateOrder(int id, string description, ProductType productType, int amount, OrderStatus status, int customerId, int printingId, List materials) { return new Order { ProductType = productType, Id = id, Amount = amount, Status = status, CustomerId = customerId, PrintingId = printingId, Materials = materials, OrderDate = DateTime.Now, Description = description ?? string.Empty }; } diff --git a/ProjectPublishing/ProjectPublishing/Entities/OrderMaterials.cs b/ProjectPublishing/ProjectPublishing/Entities/OrderMaterials.cs new file mode 100644 index 0000000..f989e3b --- /dev/null +++ b/ProjectPublishing/ProjectPublishing/Entities/OrderMaterials.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectPublishing.Entities +{ + public class OrderMaterials + { + public int OrderId { get; private set; } + + public int MaterialsId { get; private set; } + + public int Amount { get; private set; } + + public static OrderMaterials Create(int orderId, int materials, int amount) + { + return new OrderMaterials + { + MaterialsId = materials, + OrderId = orderId, + Amount = amount + }; + } + } +} diff --git a/ProjectPublishing/ProjectPublishing/Forms/FormOrder.Designer.cs b/ProjectPublishing/ProjectPublishing/Forms/FormOrder.Designer.cs index b84766a..d8417fc 100644 --- a/ProjectPublishing/ProjectPublishing/Forms/FormOrder.Designer.cs +++ b/ProjectPublishing/ProjectPublishing/Forms/FormOrder.Designer.cs @@ -44,8 +44,8 @@ comboBoxPrintingUD = new ComboBox(); groupBox1 = new GroupBox(); dataGridViewMaterials = new DataGridView(); - columnMaterial = new DataGridViewTextBoxColumn(); columnMaterialType = new DataGridViewComboBoxColumn(); + columnMaterial = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)numericUpDownAmount).BeginInit(); groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridViewMaterials).BeginInit(); @@ -192,7 +192,7 @@ // dataGridViewMaterials // dataGridViewMaterials.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewMaterials.Columns.AddRange(new DataGridViewColumn[] { columnMaterial, columnMaterialType }); + dataGridViewMaterials.Columns.AddRange(new DataGridViewColumn[] { columnMaterialType, columnMaterial }); dataGridViewMaterials.Dock = DockStyle.Fill; dataGridViewMaterials.Location = new Point(3, 23); dataGridViewMaterials.Name = "dataGridViewMaterials"; @@ -200,20 +200,20 @@ dataGridViewMaterials.Size = new Size(352, 166); dataGridViewMaterials.TabIndex = 0; // - // columnMaterial - // - columnMaterial.HeaderText = "Материал"; - columnMaterial.MinimumWidth = 6; - columnMaterial.Name = "columnMaterial"; - columnMaterial.Width = 125; - // // columnMaterialType // - columnMaterialType.HeaderText = "Тип"; + columnMaterialType.HeaderText = "Материал"; columnMaterialType.MinimumWidth = 6; columnMaterialType.Name = "columnMaterialType"; columnMaterialType.Width = 125; // + // columnMaterial + // + columnMaterial.HeaderText = "Количество"; + columnMaterial.MinimumWidth = 6; + columnMaterial.Name = "columnMaterial"; + columnMaterial.Width = 125; + // // FormOrder // AutoScaleDimensions = new SizeF(8F, 20F); @@ -262,7 +262,7 @@ private ComboBox comboBoxPrintingUD; private GroupBox groupBox1; private DataGridView dataGridViewMaterials; - private DataGridViewTextBoxColumn columnMaterial; private DataGridViewComboBoxColumn columnMaterialType; + private DataGridViewTextBoxColumn columnMaterial; } } \ No newline at end of file diff --git a/ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs b/ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs index 6614295..6d47165 100644 --- a/ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs +++ b/ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs @@ -104,16 +104,16 @@ namespace ProjectPublishing.Forms // (int)comboBoxMaterialsID.SelectedValue! // ); - private List CreateListFromDataGrid() + private List CreateListFromDataGrid() { - var list = new List(); + var list = new List(); foreach (DataGridViewRow row in dataGridViewMaterials.Rows) { if (row.Cells["columnMaterial"].Value == null || row.Cells["columnMaterialType"].Value == null) { continue; } - list.Add(Material.CreateMaterial(0, (string)row.Cells["columnMaterial"].Value, (MaterialType)row.Cells["columnMaterialType"].Value)); + list.Add(OrderMaterials.Create(0, Convert.ToInt32(row.Cells["columnMaterial"].Value), Convert.ToInt32(row.Cells["columnMaterialType"].Value))); } return list; } diff --git a/ProjectPublishing/ProjectPublishing/Forms/FormOrder.resx b/ProjectPublishing/ProjectPublishing/Forms/FormOrder.resx index f6a9f4c..02f7fab 100644 --- a/ProjectPublishing/ProjectPublishing/Forms/FormOrder.resx +++ b/ProjectPublishing/ProjectPublishing/Forms/FormOrder.resx @@ -117,16 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - True True - - True - \ No newline at end of file