chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 16 Wiki Activity

Fix exception on guessing single row

Browse Source
This commit is contained in:
Sergey Chebotar 2023-05-23 15:02:14 +03:00
parent 9d2f386a74
commit 7f8455d868
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
RhSolutions.AddIn/Services/GuessReader.cs
View File

@ -14,7 +14,7 @@ public class GuessReader : IReader
public Dictionary<Product, double> ReadProducts(Range range) public Dictionary<Product, double> ReadProducts(Range range)
{ {
_progressBar = new("Ищу колонки со значениями", range.Columns.Count); _progressBar = new("Поиск возможных пар артикул-количество...", range.Columns.Count);
int? productColumnIndex = null; int? productColumnIndex = null;
List<int> amountColumnIndeces = new(); List<int> amountColumnIndeces = new();
@ -74,7 +74,7 @@ public class GuessReader : IReader
private bool IsProductColumn(Range column) private bool IsProductColumn(Range column)
{ {
int successCounter = 0; int successCounter = 0;
object[,] cells = column.Value2; var cells = column.Value2;
if (cells == null) if (cells == null)
{ {
@ -82,8 +82,8 @@ public class GuessReader : IReader
} }
for (int row = 1; row < column.Rows.Count + 1; row++) for (int row = 1; row < column.Rows.Count + 1; row++)
{ {
object currentCell = cells[row, 1]; object currentCell = column.Rows.Count == 1 ? cells : cells[row, 1];
if (currentCell == null) if (currentCell == null)
{ {
continue; continue;
@ -106,7 +106,7 @@ public class GuessReader : IReader
private bool IsAmountColumn(Range column) private bool IsAmountColumn(Range column)
{ {
int successCounter = 0; int successCounter = 0;
object[,] cells = column.Value2; var cells = column.Value2;
if (cells == null) if (cells == null)
{ {
@ -115,7 +115,7 @@ public class GuessReader : IReader
for (int row = 1; row < column.Rows.Count + 1; row++) for (int row = 1; row < column.Rows.Count + 1; row++)
{ {
object currentCell = cells[row, 1]; object currentCell = column.Rows.Count == 1 ? cells : cells[row, 1];
if (currentCell == null) if (currentCell == null)
{ {
continue; continue;
@ -144,22 +144,29 @@ public class GuessReader : IReader
} }
successCounter++; successCounter++;
if (successCounter > 5)
{
return true;
}
} }
return successCounter > 1; return successCounter > 0;
} }
private Dictionary<Product, double> GetDictionaryFromColumns(Range productColumn, Range amountColumn) private Dictionary<Product, double> GetDictionaryFromColumns(Range productColumn, Range amountColumn)
{ {
Dictionary<Product, double> result = new(); Dictionary<Product, double> result = new();
_progressBar = new("Заполняю словарь значений...", productColumn.Rows.Count);
for (int row = 1; row < productColumn.Rows.Count + 1; row++) for (int row = 1; row < productColumn.Rows.Count + 1; row++)
{ {
object[,] amountCells = amountColumn.Value2; _progressBar.Update();
object currentAmountCell = amountCells[row, 1]; var amountCells = amountColumn.Value2;
object currentAmountCell = productColumn.Rows.Count == 1 ? amountCells : amountCells[row, 1];
object[,] productCells = productColumn.Value2; var productCells = productColumn.Value2;
object currentProductCell = productCells[row, 1]; object currentProductCell = productColumn.Rows.Count == 1 ? productCells : productCells[row, 1];
double amountValue = 0.0; double amountValue = 0.0;