From ad9ce782310c97c155fec80b88492016518b9aa0 Mon Sep 17 00:00:00 2001 From: aaahsap Date: Fri, 31 Jan 2025 11:19:37 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=204(=D0=BE=D1=82=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectSellPC/Forms/Cheque/ChequeForm.cs | 20 +++++++++---------- .../ProductsOnWarehouseForm.Designer.cs | 4 ---- .../ProductsOnWarehouseSettingsForm.cs | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/ProjectSellPC/ProjectSellPC/Forms/Cheque/ChequeForm.cs b/ProjectSellPC/ProjectSellPC/Forms/Cheque/ChequeForm.cs index ec4b599..623b508 100644 --- a/ProjectSellPC/ProjectSellPC/Forms/Cheque/ChequeForm.cs +++ b/ProjectSellPC/ProjectSellPC/Forms/Cheque/ChequeForm.cs @@ -43,8 +43,11 @@ namespace ProjectSellPC.Forms.Receipt { try { - // Получаем все чеки - var cheques = _ChequeRepository.ReadAll(); + // Получаем все чеки и удаляем дубликаты по ID + var cheques = _ChequeRepository.ReadAll() + .GroupBy(c => c.Id) + .Select(g => g.First()) + .ToList(); // Загружаем информацию о клиентах foreach (var cheque in cheques) @@ -55,14 +58,7 @@ namespace ProjectSellPC.Forms.Receipt foreach (var productInCheque in cheque.Products) { var product = _productRepository.Read(productInCheque.ProductID); - if (product != null) - { - productInCheque.ProductName = product.Name; // Добавляем название товара - } - else - { - productInCheque.ProductName = "Неизвестный товар"; - } + productInCheque.ProductName = product?.Name ?? "Неизвестный товар"; } } @@ -72,7 +68,8 @@ namespace ProjectSellPC.Forms.Receipt Id = c.Id, ClientName = c.Client?.Name ?? "Неизвестно", PurchaseDate = c.PurchaseDate, - Products = string.Join(", ", c.Products.Select(p => p.ProductName)) // Отображаем названия товаров + Products = string.Join(", ", c.Products.Select(p => p.ProductName)), // Названия товаров через запятую + Quantities = string.Join(", ", c.Products.Select(p => p.Count.ToString())) // Количество товаров через запятую }).ToList(); // Настройка столбцов DataGridView @@ -80,6 +77,7 @@ namespace ProjectSellPC.Forms.Receipt ChequesDataGridView.Columns["ClientName"].HeaderText = "Клиент"; ChequesDataGridView.Columns["PurchaseDate"].HeaderText = "Дата покупки"; ChequesDataGridView.Columns["Products"].HeaderText = "Товары"; + ChequesDataGridView.Columns["Quantities"].HeaderText = "Количество"; } catch (Exception ex) { diff --git a/ProjectSellPC/ProjectSellPC/Forms/ProductsOnWarehouse/ProductsOnWarehouseForm.Designer.cs b/ProjectSellPC/ProjectSellPC/Forms/ProductsOnWarehouse/ProductsOnWarehouseForm.Designer.cs index 45a1047..b83da7a 100644 --- a/ProjectSellPC/ProjectSellPC/Forms/ProductsOnWarehouse/ProductsOnWarehouseForm.Designer.cs +++ b/ProjectSellPC/ProjectSellPC/Forms/ProductsOnWarehouse/ProductsOnWarehouseForm.Designer.cs @@ -30,7 +30,6 @@ { addButton = new Button(); productsDataGridView = new DataGridView(); - editButton = new Button(); ((System.ComponentModel.ISupportInitialize)productsDataGridView).BeginInit(); SuspendLayout(); // @@ -54,14 +53,12 @@ productsDataGridView.RowHeadersWidth = 51; productsDataGridView.Size = new Size(851, 400); productsDataGridView.TabIndex = 8; - // // ProductsOnWarehouseForm // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(1064, 450); - Controls.Add(editButton); Controls.Add(addButton); Controls.Add(productsDataGridView); Name = "ProductsOnWarehouseForm"; @@ -76,6 +73,5 @@ private Button addButton; private DataGridView productsDataGridView; - private Button editButton; } } \ No newline at end of file diff --git a/ProjectSellPC/ProjectSellPC/Forms/ProductsOnWarehouse/ProductsOnWarehouseSettingsForm.cs b/ProjectSellPC/ProjectSellPC/Forms/ProductsOnWarehouse/ProductsOnWarehouseSettingsForm.cs index a98b354..cfa2429 100644 --- a/ProjectSellPC/ProjectSellPC/Forms/ProductsOnWarehouse/ProductsOnWarehouseSettingsForm.cs +++ b/ProjectSellPC/ProjectSellPC/Forms/ProductsOnWarehouse/ProductsOnWarehouseSettingsForm.cs @@ -82,7 +82,7 @@ namespace ProjectSellPC.Forms.ProductsOnWarehouse WarehouseCombobox.DataSource = _WarehouseRepository.ReadAll().ToList(); WarehouseCombobox.DisplayMember = "Adress"; - WarehouseCombobox.ValueMember = "Id"; + //WarehouseCombobox.ValueMember = "Id"; } private void saveButton_Click(object sender, EventArgs e)