RhSolutions.AddIn/AddIn/RhSolutionsFunction.cs

@@ -161,7 +161,7 @@ public class RhSolutionsFunction
                     .GetResult()
                     .FirstOrDefault();
 
-                DateTime date = dateField == 0 ? DateTime.Today : DateTime.FromOADate(dateField);
+                DateTime date = dateField == 0 ? DateTime.Now : DateTime.FromOADate(dateField);
                 var exchangeRate = currencyClient.GetCurrencyCourse(date)
                     .GetAwaiter()
                     .GetResult();
@@ -193,7 +193,7 @@ public class RhSolutionsFunction
 
         if (ExcelAsyncUtil.Run("Database request", dateField, delegate
         {
-            DateTime date = dateField == 0 ? DateTime.Today : DateTime.FromOADate(dateField);
+            DateTime date = dateField == 0 ? DateTime.Now : DateTime.FromOADate(dateField);
             var exchangeRate = currencyClient.GetCurrencyCourse(date)
                 .GetAwaiter()
                 .GetResult();

RhSolutions.AddIn/Controllers/RibbonController.cs

@@ -84,7 +84,7 @@ public class RibbonController : ExcelRibbon
 
     public bool GetConvertEnabled(IRibbonControl control) => _workbookIsValid;
     public bool GetDxfEnabled(IRibbonControl control) => _workbookIsValid;
-    public bool GetGuessEnabled(IRibbonControl control) => RhSolutionsAddIn.Excel.ActiveWorkbook != null && !_workbookIsValid;
+    public bool GetGuessEnabled(IRibbonControl control) => RhSolutionsAddIn.Excel.ActiveWorkbook == null ? false : !_workbookIsValid;
 
     public bool GetExportEnabled(IRibbonControl control)
     {

RhSolutions.AddIn/Services/GuessReader.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using Microsoft.Office.Interop.Excel;
+using System.IO;
 
 namespace RhSolutions.Services;
 
@@ -46,21 +47,19 @@ public class GuessReader : IReader
             }
             if (currentIndex > productColumnIndex)
             {
-                if (IsAmountColumn(range.Columns[currentIndex]))
+                if (IsAmountColumn(range.Columns[currentIndex++]))
                 {
-                    amountColumnIndex = currentIndex;
+                    amountColumnIndex = currentIndex - 1;
                     break;
                 }
-                else currentIndex++;
             }
             else
             {
-                if (IsAmountColumn(range.Columns[currentIndex]))
+                if (IsAmountColumn(range.Columns[currentIndex--]))
                 {
-                    amountColumnIndex = currentIndex;
+                    amountColumnIndex = currentIndex + 1;
                     break;
                 }
-                else currentIndex--;
             }
         }
 
@@ -94,7 +93,7 @@ public class GuessReader : IReader
                 continue;
             }
 
-            if (ProductSku.TryParse(currentCell.ToString(), out _))
+            if (ProductSku.TryParse(currentCell.ToString(), out IEnumerable<ProductSku> skus))
             {
                 successCounter++;
             }
@@ -112,43 +111,39 @@ public class GuessReader : IReader
     {
         int successCounter = 0;
         var cells = column.Value2;
-        double maxValue = 30000;
 
         if (cells == null)
         {
             return false;
         }
 
-        if (column.Rows.Count == 1)
+        for (int row = 1; row < column.Rows.Count + 1; row++)
         {
-            double? value = cells as double?;
+            object currentCell = column.Rows.Count == 1 ? cells : cells[row, 1];
-
+            if (currentCell == null)
-            return value != null
-                && value != 0
-                && value < maxValue;
-        }
-
-        else
-        {
-            for (int row = 1; row < column.Rows.Count + 1; row++)
             {
-                object currentCell = cells[row, 1];
+                continue;
-                double? value = currentCell as double?;
+            }
 
-                if (value == null 
+            double? value = currentCell as double?; 
-                    || value == 0 
-                    || value > maxValue)
-                {
-                    continue;
-                }
 
-                if (++successCounter > 3)
+            if (value == null || value == 0)
-                {
+            {
-                    return true;
+                continue;
-                }
+            }
+
+            if (value > 30000)
+            {
+                return false;
+            }
+            
+            if (++successCounter > 3)
+            {
+                return true;
             }
         }
-        return successCounter > 1;
+
+        return successCounter > 0;
     }
 
     private Dictionary<Product, double> GetDictionaryFromColumns(Range productColumn, Range amountColumn)

RhSolutions.AddIn/Services/ReaderFactory.cs

@@ -15,7 +15,7 @@ public class ReaderFactory
         {
             "Guess" => (IReader)_serviceProvider.GetService(typeof(GuessReader)),
             "Excel" => (IReader)_serviceProvider.GetService(typeof(ExcelReader)),
-            _ => throw new ArgumentException($"Незвестный интерфейс {nameof(IReader)}: {readerName}")
+            _ => (IReader)_serviceProvider.GetService(typeof(ExcelReader))
         };
     }
 }

RhSolutions.AddIn/Services/WriterFactory.cs

@@ -15,7 +15,7 @@ public class WriterFactory
         {
             "Excel" => (IWriter)_serviceProvider.GetService(typeof(ExcelWriter)),
             "Dxf" => (IWriter)_serviceProvider.GetService(typeof(DxfWriter)),
-            _ => throw new ArgumentException($"Незвестный интерфейс {nameof(IWriter)}: {writerName}")
+            _ => (IWriter)_serviceProvider.GetService(typeof(ExcelWriter))
         };
     }
 }

RhSolutions.AddIn/Tools/ToolFactory.cs

@@ -11,7 +11,7 @@ internal class ToolFactory
             "merge" => new MergeTool(RhSolutionsAddIn.ServiceProvider),
             "dxfexport" => new DxfTool(RhSolutionsAddIn.ServiceProvider),
             "Guessexport" => new GuessTool(RhSolutionsAddIn.ServiceProvider),            
-            _ => throw new Exception($"Неизвестный инструмент {toolName}"),
+            _ => throw new Exception("Неизвестный инструмент"),
         };
         return tool;
     }

RhSolutions.Tests/CanDoGuess.cs

@@ -8,15 +8,13 @@ namespace RhSolutions.Tests;
 public class CanDoGuess : IDisposable
 {
     private RhSolutionsAddIn _addIn;
-    private IReader _guessReader;
     private IReader _reader;
 
     public CanDoGuess()
     {
         _addIn = new();
         _addIn.AutoOpen();
-        _guessReader = new GuessReader(Util.Application);
+        _reader = new GuessReader(Util.Application);
-        _reader = new ExcelReader(Util.Application, RhSolutionsAddIn.Configuration);
     }
 
     [ExcelFact(Workbook = @"..\..\..\TestWorkbooks\TestSpecificationGuess.xlsx")]
@@ -24,7 +22,7 @@ public class CanDoGuess : IDisposable
     {
         Worksheet sourceSheet = Util.Workbook.Worksheets[1];
         RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\TargetSpecificationGuess.xlsx"));
-        var products = _guessReader.ReadProducts(new[] { sourceSheet });
+        var products = _reader.ReadProducts(new[] { sourceSheet });
         var _writer = new ExcelWriter(Util.Application, RhSolutionsAddIn.Configuration);
         _writer.WriteProducts(products);
         Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;
@@ -41,7 +39,7 @@ public class CanDoGuess : IDisposable
     {
         Worksheet sourceSheet = Util.Workbook.Worksheets[1];
         RhSolutionsAddIn.Configuration.SetPriceListPath(Path.GetFullPath(@"..\..\..\TestWorkbooks\TargetSpecificationGuessOneRow.xlsx"));
-        var products = _guessReader.ReadProducts(new[] { sourceSheet });
+        var products = _reader.ReadProducts(new[] { sourceSheet });
         var _writer = new ExcelWriter(Util.Application, RhSolutionsAddIn.Configuration);
         _writer.WriteProducts(products);
         Worksheet targetSheet = Util.Application.ActiveWindow.ActiveSheet;