From ade18e5e4083c5ae464e3a258e063e2310888d3a Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Tue, 16 May 2023 18:02:32 +0300 Subject: [PATCH] Extend missing product information on table fill --- RhSolutions.AddIn/Services/ExcelReader.cs | 5 ++++- RhSolutions.AddIn/Services/ExcelWriter.cs | 14 +++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/RhSolutions.AddIn/Services/ExcelReader.cs b/RhSolutions.AddIn/Services/ExcelReader.cs index 56e0695..a733403 100644 --- a/RhSolutions.AddIn/Services/ExcelReader.cs +++ b/RhSolutions.AddIn/Services/ExcelReader.cs @@ -60,7 +60,10 @@ public class ExcelReader : IReader, IDisposable continue; } - Product product = new(currentSku); + Product product = new(currentSku) + { + Name = $"Распознанный артикул" + }; if (readResult.ContainsKey(product)) { diff --git a/RhSolutions.AddIn/Services/ExcelWriter.cs b/RhSolutions.AddIn/Services/ExcelWriter.cs index ab04c50..3471224 100644 --- a/RhSolutions.AddIn/Services/ExcelWriter.cs +++ b/RhSolutions.AddIn/Services/ExcelWriter.cs @@ -167,6 +167,7 @@ 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] @@ -182,18 +183,13 @@ public class ExcelWriter : IWriter, IDisposable previous.Copy(current); current.ClearContents(); - worksheetCells[row, groupColumn].Value2 = positionAmount.Key.ProductLines.FirstOrDefault() ?? string.Empty; - worksheetCells[row, nameColumn].Value2 = positionAmount.Key.Name; + worksheetCells[row, groupColumn].Value2 = product.ProductLines.FirstOrDefault() ?? string.Empty; + worksheetCells[row, nameColumn].Value2 = $"{product.Name} не найден ({product.ProductSku})"; + worksheetCells[row, skuColumn].Value2 = "???"; if (_oldSkuCell != null) { - worksheetCells[row, skuColumn].Value2 = "Не найден"; - worksheetCells[row, _oldSkuCell.Column].Value2 = positionAmount.Key.ProductSku; - } - - else - { - worksheetCells[row, skuColumn].Value2 = positionAmount.Key.ProductSku; + worksheetCells[row, _oldSkuCell.Column].Value2 = product.ProductSku; } foreach (int column in columns)