RhSolutions.AddIn/Services/ExcelReader.cs

@@ -60,10 +60,7 @@ public class ExcelReader : IReader, IDisposable
                 continue;
             }
 
-            Product product = new(currentSku)
+            Product product = new(currentSku);
-            {
-                Name = $"Распознанный артикул"
-            };
 
             if (readResult.ContainsKey(product))
             {
@@ -113,7 +110,7 @@ public class ExcelReader : IReader, IDisposable
                     object name = worksheet.Cells[row, NameCell.Column].Value2;
                     object sku = worksheet.Cells[row, SkuCell.Column].Value2;
                     object measure = worksheet.Cells[row, MeasureCell.Column].Value2;
-                    var productMeasure = measure?.ToString() switch
+                    var productMeasure = measure.ToString() switch
                     {
                         "м" => Measure.M,
                         "шт" => Measure.P,

RhSolutions.AddIn/Services/ExcelWriter.cs

@@ -167,7 +167,6 @@ public class ExcelWriter : IWriter, IDisposable
         int skuColumn = _skuCell.Column;
         int groupColumn = _programLineCell.Column;
         int nameColumn = _nameCell.Column;
-        Product product = positionAmount.Key;
 
         int row = worksheetCells[worksheetRows.Count, skuColumn]
             .End[XlDirection.xlUp]
@@ -183,13 +182,18 @@ public class ExcelWriter : IWriter, IDisposable
         previous.Copy(current);
         current.ClearContents();
 
-        worksheetCells[row, groupColumn].Value2 = product.ProductLines.FirstOrDefault() ?? string.Empty;
+        worksheetCells[row, groupColumn].Value2 = positionAmount.Key.ProductLines.First();
-        worksheetCells[row, nameColumn].Value2 = $"{product.Name} не найден ({product.ProductSku})";
+        worksheetCells[row, nameColumn].Value2 = positionAmount.Key.Name;
 
-        worksheetCells[row, skuColumn].Value2 = "???";
         if (_oldSkuCell != null)
         {
-            worksheetCells[row, _oldSkuCell.Column].Value2 = product.ProductSku;
+            worksheetCells[row, skuColumn].Value2 = "Не найден";
+            worksheetCells[row, _oldSkuCell.Column].Value2 = positionAmount.Key.ProductSku;
+        }
+
+        else
+        {
+            worksheetCells[row, skuColumn].Value2 = positionAmount.Key.ProductSku;
         }
 
         foreach (int column in columns)

RhSolutions.Tests/CanReadProducts.cs

@@ -45,17 +45,14 @@ public class CanReadProducts : IDisposable
         Assert.Equal(3, products.Count());
     }
 
-    [ExcelFact(Workbook = @"TestWorkbooks\TestSpecificaion.xlsx")]
+    [ExcelFact(Workbook = @"TestWorkbooks\Specifications\HeatingFloor.xlsx")]
     public void CanReadWorkbook()
     {
         Worksheet worksheet = Util.Workbook.Worksheets[1];
-        var result = _reader.ReadProducts(new[] { worksheet });
+        var products = _reader.ReadProducts(new[] { worksheet });
-        Assert.NotNull(result);
+
-        Assert.NotEmpty(result);
+        Assert.NotNull(products);
-        Assert.Equal("TestSpecificaion", result.First().Item1);
+        Assert.NotEmpty(products);
-        var products = result.First().Item2;
-        Assert.Equal(46, products.Count());
-        Assert.Equal(29266, products.Sum(p => p.Value));
     }
 
     public void Dispose()

RhSolutions.Tests/RhSolutions.Tests.csproj

@@ -27,7 +27,7 @@
 	  <None Update="TestWorkbooks\ExcelTableTest.xlsx">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </None>
-	  <None Update="TestWorkbooks\TestSpecificaion.xlsx">
+	  <None Update="TestWorkbooks\Specifications\HeatingFloor.xlsx">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </None>
 	</ItemGroup>