From 6890cc10050415b85ac77d73b3abdec012d8b40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?= =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Thu, 21 Sep 2023 13:50:23 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlannedTrajectoryImportService.cs | 6 +++++- .../Trajectory/PlannedTrajectoryTemplate.xlsx | Bin 11387 -> 11279 bytes 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs index 802de787..6ea64efb 100644 --- a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs +++ b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryImportService.cs @@ -167,7 +167,11 @@ namespace AsbCloudInfrastructure.Services.Trajectory { parseErrors.Add(ex.Message); } - }; + } + + if (parseErrors.Any()) + throw new FileFormatException(string.Join("\r\n", parseErrors)); + return trajectoryRows; } diff --git a/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryTemplate.xlsx b/AsbCloudInfrastructure/Services/Trajectory/PlannedTrajectoryTemplate.xlsx index 20080ac44fcb3671ec2fd39dfd03c44dc8014f38..8d01c25bb7dd02cd541c93b6977d580584b77b78 100644 GIT binary patch delta 4405 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 G{P91|8;3&x