From 48528305d7a0474e2d29e9ded12011e81e470f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=9A=D1=83=D0=B4=D1=80=D0=B8?= =?UTF-8?q?=D0=BD=D1=81=D0=BA=D0=B8=D0=B9?= Date: Fri, 20 Dec 2024 14:17:56 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B5=D0=B3=D0=BA=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectWorkshop/ProjectWorkshop/Reports/DocReport.cs | 2 +- ProjectWorkshop/ProjectWorkshop/Reports/TableReport.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ProjectWorkshop/ProjectWorkshop/Reports/DocReport.cs b/ProjectWorkshop/ProjectWorkshop/Reports/DocReport.cs index 16c3659..a8776cd 100644 --- a/ProjectWorkshop/ProjectWorkshop/Reports/DocReport.cs +++ b/ProjectWorkshop/ProjectWorkshop/Reports/DocReport.cs @@ -57,7 +57,7 @@ internal class DocReport ["Название изделия", "Стоимость", "Дата сборки"], .. _productRepository .ReadProducts() - .Select(x => new string[] { x.ProductName, x.Price.ToString(), x.ProductType.ToString()}), // Добавьте пустую строку для "Дата сборки" или заполните реальным значением + .Select(x => new string[] { x.ProductName, x.Price.ToString(), x.ProductType.ToString()}), ]; } diff --git a/ProjectWorkshop/ProjectWorkshop/Reports/TableReport.cs b/ProjectWorkshop/ProjectWorkshop/Reports/TableReport.cs index a745a4a..1b8e919 100644 --- a/ProjectWorkshop/ProjectWorkshop/Reports/TableReport.cs +++ b/ProjectWorkshop/ProjectWorkshop/Reports/TableReport.cs @@ -58,7 +58,7 @@ namespace ProjectWorkshop.Reports var shiftData = _assemblerShiftRepository .ReadAssemblerShifts() .Where(x => x.AssemblerShiftDate >= startDate && x.AssemblerShiftDate <= endDate && x.AssemblerID_Assembler == assemblerID) - .OrderBy(x => x.AssemblerShiftDate) + .OrderBy(x => x.AssemblerShiftDate) .ToList(); var result = new List @@ -121,3 +121,4 @@ namespace ProjectWorkshop.Reports } } +