From 1220999bf067f630369848ed6135f83df23aa08f Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 26 May 2023 07:50:23 +0300 Subject: [PATCH] Fix row indeces --- RhSolutions.AddIn/Services/GuessReader.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/RhSolutions.AddIn/Services/GuessReader.cs b/RhSolutions.AddIn/Services/GuessReader.cs index 6ad8d46..3824950 100644 --- a/RhSolutions.AddIn/Services/GuessReader.cs +++ b/RhSolutions.AddIn/Services/GuessReader.cs @@ -149,19 +149,18 @@ public class GuessReader : IReader private Dictionary GetDictionaryFromColumns(Range productColumn, Range amountColumn) { Dictionary result = new(); - + var firstRowIndex = 1; var lastRowIndex = amountColumn.Worksheet - .Cells[amountColumn.Rows.Count, amountColumn.Column] + .Cells[amountColumn.Worksheet.Rows.Count, amountColumn.Column] .End[XlDirection.xlUp].Row; _progressBar = new("Заполняю словарь значений...", lastRowIndex); + Worksheet worksheet = amountColumn.Worksheet; - for (int row = 1; row < lastRowIndex + 1; row++) + for (int row = firstRowIndex; row < lastRowIndex + 1; row++) { _progressBar.Update(); - var amountCells = amountColumn.Value2; - object currentAmountCell = productColumn.Rows.Count == 1 ? amountCells : amountCells[row, 1]; - var productCells = productColumn.Value2; - object currentProductCell = productColumn.Rows.Count == 1 ? productCells : productCells[row, 1]; + object currentAmountCell = worksheet.Cells[row, amountColumn.Column].Value2; + object currentProductCell = worksheet.Cells[row, productColumn.Column].Value2; double? amountValue = currentAmountCell as double?; if (amountValue == null || amountValue == 0 || currentProductCell == null)