diff --git a/RhSolutions.AddIn/RhSolutions-AddIn.dna b/RhSolutions.AddIn/RhSolutions-AddIn.dna
index 47e1e3b..feb0454 100644
--- a/RhSolutions.AddIn/RhSolutions-AddIn.dna
+++ b/RhSolutions.AddIn/RhSolutions-AddIn.dna
@@ -12,7 +12,7 @@
-
+
diff --git a/RhSolutions.AddIn/RhSolutions.AddIn.csproj b/RhSolutions.AddIn/RhSolutions.AddIn.csproj
index 9e85751..34dc5f4 100644
--- a/RhSolutions.AddIn/RhSolutions.AddIn.csproj
+++ b/RhSolutions.AddIn/RhSolutions.AddIn.csproj
@@ -36,7 +36,7 @@
-
+
diff --git a/RhSolutions.AddIn/Services/DatabaseClient.cs b/RhSolutions.AddIn/Services/DatabaseClient.cs
index 2e73304..ac3aff9 100644
--- a/RhSolutions.AddIn/Services/DatabaseClient.cs
+++ b/RhSolutions.AddIn/Services/DatabaseClient.cs
@@ -38,7 +38,6 @@ public class DatabaseClient : IDatabaseClient
string json = await response.Content.ReadAsStringAsync();
return JsonConvert.DeserializeObject>(json) ?? Enumerable.Empty();
}
-
catch
{
StatusCode = response.StatusCode;
diff --git a/RhSolutions.AddIn/Services/ExcelReader.cs b/RhSolutions.AddIn/Services/ExcelReader.cs
index 0403d7f..e124c24 100644
--- a/RhSolutions.AddIn/Services/ExcelReader.cs
+++ b/RhSolutions.AddIn/Services/ExcelReader.cs
@@ -60,7 +60,7 @@ public class ExcelReader : IReader, IDisposable
continue;
}
- Product product = new() { ProductSku = new(currentSku) };
+ Product product = new(currentSku);
if (readResult.ContainsKey(product))
{
@@ -124,10 +124,9 @@ public class ExcelReader : IReader, IDisposable
if (!ProductSku.TryParse(sku.ToString(), out _))
continue;
- Product p = new()
- {
- ProductSku = new (sku.ToString()),
- ProductLine = productLine.ToString(),
+ Product p = new(sku.ToString())
+ {
+ ProductLines = new List() { productLine.ToString() },
Name = name.ToString(),
ProductMeasure = productMeasure
};
diff --git a/RhSolutions.AddIn/Services/ExcelWriter.cs b/RhSolutions.AddIn/Services/ExcelWriter.cs
index 7685eac..ed4e2e0 100644
--- a/RhSolutions.AddIn/Services/ExcelWriter.cs
+++ b/RhSolutions.AddIn/Services/ExcelWriter.cs
@@ -110,7 +110,7 @@ public class ExcelWriter : IWriter, IDisposable
Range worksheetCells = _worksheet.Cells;
Range skuColumn = _skuCell.EntireColumn;
- int? row = GetPositionRow(skuColumn, positionAmount.Key.ProductSku.ToString(), positionAmount.Key.ProductLine);
+ int? row = GetPositionRow(skuColumn, positionAmount.Key.ProductSku.ToString(), positionAmount.Key.ProductLines.First());
if (row != null)
{
@@ -126,7 +126,7 @@ public class ExcelWriter : IWriter, IDisposable
if (_oldSkuCell != null)
{
- row = GetPositionRow(_oldSkuCell.EntireColumn, positionAmount.Key.ProductSku.ToString(), positionAmount.Key.ProductLine);
+ row = GetPositionRow(_oldSkuCell.EntireColumn, positionAmount.Key.ProductSku.ToString(), positionAmount.Key.ProductLines.First());
if (row != null)
{
@@ -142,7 +142,7 @@ public class ExcelWriter : IWriter, IDisposable
}
string sku = positionAmount.Key.ProductSku.Article;
- row = GetPositionRow(skuColumn, sku, positionAmount.Key.ProductLine);
+ row = GetPositionRow(skuColumn, sku, positionAmount.Key.ProductLines.First());
if (row != null)
{
@@ -182,7 +182,7 @@ public class ExcelWriter : IWriter, IDisposable
previous.Copy(current);
current.ClearContents();
- worksheetCells[row, groupColumn].Value2 = positionAmount.Key.ProductLine;
+ worksheetCells[row, groupColumn].Value2 = positionAmount.Key.ProductLines.First();
worksheetCells[row, nameColumn].Value2 = positionAmount.Key.Name;
if (_oldSkuCell != null)