diff --git a/Workshop/Forms/FormCheque.cs b/Workshop/Forms/FormCheque.cs index 33c126c..a1290ad 100644 --- a/Workshop/Forms/FormCheque.cs +++ b/Workshop/Forms/FormCheque.cs @@ -48,12 +48,12 @@ namespace Workshop.Forms var list = new List(); foreach (DataGridViewRow row in dataGridViewProducts.Rows) { - if (row.Cells["ColumnProductName"].Value == null || row.Cells["ColumnAmount"].Value == null) + if (row.Cells["ColumnProductName"].Value == null || row.Cells["ProductAmount"].Value == null) { continue; } list.Add(ChequeProduct.CreateEntity(Convert.ToInt32(row.Cells["ColumnProductName"].Value), 0, - Convert.ToInt32(row.Cells["ColumnAmount"].Value))); + Convert.ToInt32(row.Cells["ProductAmount"].Value))); } return list; } diff --git a/Workshop/Forms/FormCheques.Designer.cs b/Workshop/Forms/FormCheques.Designer.cs index 30afbce..c2f2961 100644 --- a/Workshop/Forms/FormCheques.Designer.cs +++ b/Workshop/Forms/FormCheques.Designer.cs @@ -82,7 +82,7 @@ Controls.Add(panel); Name = "FormCheques"; StartPosition = FormStartPosition.CenterParent; - Text = "Изделия"; + Text = "Продажи"; Load += FormCheques_Load; panel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridProductCreatings).EndInit(); diff --git a/Workshop/Forms/FormMaster.Designer.cs b/Workshop/Forms/FormMaster.Designer.cs index ceda14a..45123a6 100644 --- a/Workshop/Forms/FormMaster.Designer.cs +++ b/Workshop/Forms/FormMaster.Designer.cs @@ -154,7 +154,7 @@ Controls.Add(labelLastName); Controls.Add(labelName); Name = "FormMaster"; - Text = "FormMaster"; + Text = "Добавление мастера"; ((System.ComponentModel.ISupportInitialize)numericUpDownAge).EndInit(); ResumeLayout(false); PerformLayout(); diff --git a/Workshop/Forms/FormMasters.Designer.cs b/Workshop/Forms/FormMasters.Designer.cs index d0cef8e..a887607 100644 --- a/Workshop/Forms/FormMasters.Designer.cs +++ b/Workshop/Forms/FormMasters.Designer.cs @@ -108,7 +108,7 @@ Controls.Add(panel); Name = "FormMasters"; StartPosition = FormStartPosition.CenterParent; - Text = "Изделия"; + Text = "Мастера"; Load += FormMasters_Load; panel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridViewMasters).EndInit(); diff --git a/Workshop/Forms/FormMaterial.Designer.cs b/Workshop/Forms/FormMaterial.Designer.cs index 5628f7b..1905872 100644 --- a/Workshop/Forms/FormMaterial.Designer.cs +++ b/Workshop/Forms/FormMaterial.Designer.cs @@ -125,7 +125,7 @@ Controls.Add(labelPrice); Controls.Add(labelName); Name = "FormMaterial"; - Text = "FormMaterial"; + Text = "Добавление материала"; ((System.ComponentModel.ISupportInitialize)numericUpDownAmount).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownPrice).EndInit(); ResumeLayout(false); diff --git a/Workshop/Forms/FormMaterials.Designer.cs b/Workshop/Forms/FormMaterials.Designer.cs index acd15cb..6071bb7 100644 --- a/Workshop/Forms/FormMaterials.Designer.cs +++ b/Workshop/Forms/FormMaterials.Designer.cs @@ -108,7 +108,7 @@ Controls.Add(panel); Name = "FormMaterials"; StartPosition = FormStartPosition.CenterParent; - Text = "Изделия"; + Text = "Материалы"; Load += FormMaterials_Load; panel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridViewMaterials).EndInit(); diff --git a/Workshop/Forms/FormProduct.Designer.cs b/Workshop/Forms/FormProduct.Designer.cs index d446178..a2f0915 100644 --- a/Workshop/Forms/FormProduct.Designer.cs +++ b/Workshop/Forms/FormProduct.Designer.cs @@ -191,7 +191,7 @@ Controls.Add(labelName); Name = "FormProduct"; StartPosition = FormStartPosition.CenterParent; - Text = "FormProduct"; + Text = "Добавление изделия"; ((System.ComponentModel.ISupportInitialize)numericUpDownPrice).EndInit(); ((System.ComponentModel.ISupportInitialize)numericUpDownAmount).EndInit(); groupBoxMaterials.ResumeLayout(false); diff --git a/Workshop/Forms/FormProduct.cs b/Workshop/Forms/FormProduct.cs index bcc9822..01468cd 100644 --- a/Workshop/Forms/FormProduct.cs +++ b/Workshop/Forms/FormProduct.cs @@ -36,6 +36,10 @@ namespace Workshop.Forms checkedListBoxCategory.SetItemChecked(checkedListBoxCategory.Items.IndexOf(elem), true); } } + //foreach (ProductMaterial item in product.Materials) + //{ + // dataGridViewMaterials.Rows.Add(materialRepository.ReadMaterialById(item.MaterialId).Name, item.Count); + //} textBoxName.Text = product.Name; numericUpDownPrice.Value = (decimal)product.Price; numericUpDownAmount.Value = product.WarehouseAmount; diff --git a/Workshop/Forms/FormProductCreate.Designer.cs b/Workshop/Forms/FormProductCreate.Designer.cs index 8b21b1c..a3c6ce3 100644 --- a/Workshop/Forms/FormProductCreate.Designer.cs +++ b/Workshop/Forms/FormProductCreate.Designer.cs @@ -125,7 +125,7 @@ Controls.Add(label2); Controls.Add(label1); Name = "FormProductCreate"; - Text = "FormProductCreate"; + Text = "Изготовление продукта"; ResumeLayout(false); PerformLayout(); } diff --git a/Workshop/Forms/FormProductCreate.cs b/Workshop/Forms/FormProductCreate.cs index 0c95927..249693c 100644 --- a/Workshop/Forms/FormProductCreate.cs +++ b/Workshop/Forms/FormProductCreate.cs @@ -26,7 +26,7 @@ namespace Workshop.Forms comboBoxProduct.ValueMember = "Id"; comboBoxMaster.DataSource = masterRepository.ReadMasters(); - comboBoxMaster.DisplayMember = "Name"; + comboBoxMaster.DisplayMember = "LastName"; comboBoxMaster.ValueMember = "Id"; } diff --git a/Workshop/Forms/FormProductCreatings.Designer.cs b/Workshop/Forms/FormProductCreatings.Designer.cs index 7ec2cce..e3e96e8 100644 --- a/Workshop/Forms/FormProductCreatings.Designer.cs +++ b/Workshop/Forms/FormProductCreatings.Designer.cs @@ -95,7 +95,7 @@ Controls.Add(panel); Name = "FormProductCreatings"; StartPosition = FormStartPosition.CenterParent; - Text = "Изделия"; + Text = "История создания изделий"; Load += FormProductCreatings_Load; panel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridProductCreatings).EndInit(); diff --git a/Workshop/Program.cs b/Workshop/Program.cs index abc4cda..f80a494 100644 --- a/Workshop/Program.cs +++ b/Workshop/Program.cs @@ -10,9 +10,9 @@ namespace Workshop { internal static class Program { - //TODO: 1. , sql ? - //TODO: 2. - ? - //TODO: 3. Update + //TODO: 1. Update . + //TODO: FormProduct + //TODO: materials /// /// The main entry point for the application. /// diff --git a/Workshop/Repositories/Implementations/ChequeRepository.cs b/Workshop/Repositories/Implementations/ChequeRepository.cs index 5453fbe..2722fde 100644 --- a/Workshop/Repositories/Implementations/ChequeRepository.cs +++ b/Workshop/Repositories/Implementations/ChequeRepository.cs @@ -33,13 +33,19 @@ JsonConvert.SerializeObject(cheque)); using var connection = new NpgsqlConnection(_connectionString.ConnectionString); connection.Open(); using var transaction = connection.BeginTransaction(); - var queryInsert = @""; + var queryInsert = @" +INSERT INTO CHEQUE (Date, Sum) +VALUES (@Date, @Sum); +SELECT MAX(Id) FROM CHEQUE"; var chequeId = connection.QueryFirst(queryInsert, cheque, transaction); - var querySubInsert = @""; + var querySubInsert = @" +INSERT INTO CHEQUE_PRODUCT (ProductID, ChequeID, Amount) +VALUES (@ProductId, @ChequeID, @Amount)"; foreach (var elem in cheque.ChequeProduct) { connection.Execute(querySubInsert, new {chequeId, elem.ProductId, elem.Amount}); } + transaction.Commit(); } catch (Exception ex) { @@ -54,7 +60,7 @@ JsonConvert.SerializeObject(cheque)); try { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); - var querySelect = ""; + var querySelect = "SELECT * FROM CHEQUE"; var productCreatings = connection.Query(querySelect); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(productCreatings)); return productCreatings; diff --git a/Workshop/Repositories/Implementations/MasterRepository.cs b/Workshop/Repositories/Implementations/MasterRepository.cs index 791c054..7f8196b 100644 --- a/Workshop/Repositories/Implementations/MasterRepository.cs +++ b/Workshop/Repositories/Implementations/MasterRepository.cs @@ -118,7 +118,7 @@ SET LastName=@LastName, Age=@Age, Position=@Position -WHERE [Id]=@Id"; +WHERE Id=@Id"; connection.Execute(queryUpdate, master); } catch (Exception ex) diff --git a/Workshop/Repositories/Implementations/MaterialRepository.cs b/Workshop/Repositories/Implementations/MaterialRepository.cs index ce77517..93e9695 100644 --- a/Workshop/Repositories/Implementations/MaterialRepository.cs +++ b/Workshop/Repositories/Implementations/MaterialRepository.cs @@ -117,7 +117,7 @@ SET Name=@Name, WarehouseAmount=@WarehouseAmount, Price=@Price -WHERE [Id]=@Id"; +WHERE Id=@Id"; connection.Execute(queryUpdate, material); } catch (Exception ex) diff --git a/Workshop/Repositories/Implementations/ProductCreateRepository.cs b/Workshop/Repositories/Implementations/ProductCreateRepository.cs index 95da4e0..32720a1 100644 --- a/Workshop/Repositories/Implementations/ProductCreateRepository.cs +++ b/Workshop/Repositories/Implementations/ProductCreateRepository.cs @@ -31,7 +31,9 @@ JsonConvert.SerializeObject(productCreate)); try { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); - var queryInsert = @""; + var queryInsert = @" +INSERT INTO PRODUCTCREATE (ProductID, MasterID, CreatingDate) +VALUES (@ProductId, @MasterId, @CreatingDate)"; connection.Execute(queryInsert, productCreate); } catch (Exception ex) @@ -48,7 +50,9 @@ JsonConvert.SerializeObject(productCreate)); try { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); - var queryDelete = @""; + var queryDelete = @" +DELETE FROM PRODUCTCREATE +WHERE Id=@id"; connection.Execute(queryDelete, new { id }); } catch (Exception ex) @@ -64,7 +68,7 @@ JsonConvert.SerializeObject(productCreate)); try { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); - var querySelect = ""; + var querySelect = "SELECT * FROM PRODUCTCREATE"; var productCreatings = connection.Query(querySelect); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(productCreatings)); return productCreatings; diff --git a/Workshop/Repositories/Implementations/ProductRepository.cs b/Workshop/Repositories/Implementations/ProductRepository.cs index 5817790..e6b6447 100644 --- a/Workshop/Repositories/Implementations/ProductRepository.cs +++ b/Workshop/Repositories/Implementations/ProductRepository.cs @@ -34,7 +34,7 @@ JsonConvert.SerializeObject(product)); connection.Open(); using var transaction = connection.BeginTransaction(); var queryInsert = @" -INSERT INTO PRODUCT (Name, Price, WarehouseAmount, Type) +INSERT INTO PRODUCT (Name, Price, WarehouseAmount, Category) VALUES (@Name, @Price, @WarehouseAmount, @Category); SELECT MAX(Id) FROM PRODUCT"; var productId = connection.QueryFirst(queryInsert, product, transaction); @@ -43,8 +43,9 @@ INSERT INTO PRODUCT_MATERIAL (ProductID, MaterialID, Count) VALUES (@ProductId, @MaterialId, @Count)"; foreach (var elem in product.Materials) { - connection.Execute(querySubInsert, new { productId, elem.ProductId, elem.Count }); + connection.Execute(querySubInsert, new { productId, elem.MaterialId, elem.Count }); } + transaction.Commit(); } catch (Exception ex) { @@ -128,7 +129,7 @@ SET Price=@Price, WarehouseAmount=@WarehouseAmount, Category=@Category -WHERE [Id]=@Id"; +WHERE Id=@Id"; connection.Execute(queryUpdate, product); } catch (Exception ex)