Compare commits
No commits in common. "1c655f1ab5ac8a80f31b017173ce1f48c04fd79d" and "1e64511ae10deefdbc02a5240a56849075941d3f" have entirely different histories.
1c655f1ab5
...
1e64511ae1
@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.8.1.0")]
|
||||
[assembly: AssemblyFileVersion("1.8.1.0")]
|
||||
[assembly: AssemblyVersion("1.8.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.8.0.0")]
|
||||
|
@ -149,18 +149,19 @@ public class GuessReader : IReader
|
||||
private Dictionary<Product, double> GetDictionaryFromColumns(Range productColumn, Range amountColumn)
|
||||
{
|
||||
Dictionary<Product, double> result = new();
|
||||
var firstRowIndex = 1;
|
||||
|
||||
var lastRowIndex = amountColumn.Worksheet
|
||||
.Cells[amountColumn.Worksheet.Rows.Count, amountColumn.Column]
|
||||
.Cells[amountColumn.Rows.Count, amountColumn.Column]
|
||||
.End[XlDirection.xlUp].Row;
|
||||
_progressBar = new("Заполняю словарь значений...", lastRowIndex);
|
||||
Worksheet worksheet = amountColumn.Worksheet;
|
||||
|
||||
for (int row = firstRowIndex; row < lastRowIndex + 1; row++)
|
||||
for (int row = 1; row < lastRowIndex + 1; row++)
|
||||
{
|
||||
_progressBar.Update();
|
||||
object currentAmountCell = worksheet.Cells[row, amountColumn.Column].Value2;
|
||||
object currentProductCell = worksheet.Cells[row, productColumn.Column].Value2;
|
||||
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];
|
||||
double? amountValue = currentAmountCell as double?;
|
||||
|
||||
if (amountValue == null || amountValue == 0 || currentProductCell == null)
|
||||
|
Loading…
x
Reference in New Issue
Block a user