diff options
| -rw-r--r-- | RhSolutions.AddIn/RhSolutions-AddIn.dna | 2 | ||||
| -rw-r--r-- | RhSolutions.AddIn/RhSolutions.AddIn.csproj | 2 | ||||
| -rw-r--r-- | RhSolutions.AddIn/Services/DatabaseClient.cs | 1 | ||||
| -rw-r--r-- | RhSolutions.AddIn/Services/ExcelReader.cs | 9 | ||||
| -rw-r--r-- | RhSolutions.AddIn/Services/ExcelWriter.cs | 8 |
5 files changed, 10 insertions, 12 deletions
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 @@ <Reference Path="Microsoft.Extensions.Primitives.dll" Pack="true" /> <Reference Path="Newtonsoft.Json.dll" Pack="true" /> <Reference Path="netDxf.dll" Pack="true" /> - <Reference Path="RhSolutions.Sku.dll" Pack="true" /> + <Reference Path="RhSolutions.ProductSku.dll" Pack="true" /> <Reference Path="System.Buffers.dll" Pack="true" /> <Reference Path="System.Diagnostics.DiagnosticSource.dll" Pack="true" /> <Reference Path="System.Memory.dll" Pack="true" /> 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 @@ <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" /> <PackageReference Include="netDxf" Version="2022.11.2" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> - <PackageReference Include="RhSolutions.Sku" Version="0.1.8" /> + <PackageReference Include="RhSolutions.ProductSku" Version="1.0.2" /> <PackageReference Include="System.Buffers" Version="4.5.1" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" /> </ItemGroup> 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<IEnumerable<Product>>(json) ?? Enumerable.Empty<Product>(); } - 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<string>() { 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) |