diff --git a/RhSolutions.AddIn/Services/ExcelWriterBase.cs b/RhSolutions.AddIn/Services/ExcelWriterBase.cs index 3376563..2a98b21 100644 --- a/RhSolutions.AddIn/Services/ExcelWriterBase.cs +++ b/RhSolutions.AddIn/Services/ExcelWriterBase.cs @@ -38,6 +38,8 @@ namespace RhSolutions.Services $"Целевой файл {_application.ActiveWorkbook.Name} не является прайс-листом."); } + ShowFilteredData(); + _amountCell = _worksheet.Cells.Find(_headers["Amount"]); _skuCell = _worksheet.Cells.Find(_headers["Sku"]); _programLineCell = _worksheet.Cells.Find(_headers["ProductLine"]); @@ -187,12 +189,24 @@ namespace RhSolutions.Services private void FilterByAmount() { + if (_worksheet.AutoFilterMode) + { AutoFilter filter = _worksheet.AutoFilter; int startColumn = filter.Range.Column; filter.Range.AutoFilter(_amountCell.Column - startColumn + 1, "<>0", XlAutoFilterOperator.xlAnd, "<>"); _worksheet.Range["A1"].Activate(); } + } + + private void ShowFilteredData() + { + if (_worksheet.AutoFilterMode) + { + AutoFilter filter = _worksheet.AutoFilter; + filter.ShowAllData(); + } + } private int? GetPositionRow(Range range, ProductSku sku, string productLine, bool justArticle = false) {