From 4a2ca16d8b4aa34041adb558b2db91709908aff5 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 26 Jan 2022 17:41:46 +0300 Subject: Watch only current sheets in files --- src/PriceListTools/CombineTool.cs | 61 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 31 deletions(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index cf02059..59259ac 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -7,7 +7,7 @@ namespace RehauSku.PriceListTools { public override void FillPriceList() { - PriceListSheet offer = NewPriceList.OfferSheet; + PriceListSheet offer = NewPriceList.Sheet; offer.Sheet.Activate(); int exportedValues = 0; @@ -15,45 +15,44 @@ namespace RehauSku.PriceListTools foreach (var priceList in sourcePriceLists) { - foreach (var sheet in priceList.Sheets) - { - if (sheet.SkuAmount.Count == 0) - continue; + PriceListSheet sheet = priceList.Sheet; - offer.Sheet.Columns[offer.amountColumnNumber] - .EntireColumn - .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow); + if (sheet.SkuAmount.Count == 0) + continue; - exportedLists++; + offer.Sheet.Columns[offer.amountColumnNumber] + .EntireColumn + .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow); - foreach (var kvp in sheet.SkuAmount) - { - Range cell = offer.Sheet.Columns[offer.skuColumnNumber].Find(kvp.Key); + exportedLists++; - if (cell == null) - { - System.Windows.Forms.MessageBox.Show - ($"Артикул {kvp.Key} отсутствует в таблице заказов {RegistryUtil.PriceListPath}", - "Отсутствует позиция в конечной таблице заказов", - System.Windows.Forms.MessageBoxButtons.OK, - System.Windows.Forms.MessageBoxIcon.Information); - } + foreach (var kvp in sheet.SkuAmount) + { + Range cell = offer.Sheet.Columns[offer.skuColumnNumber].Find(kvp.Key); - else - { - offer.Sheet.Cells[cell.Row, offer.amountColumnNumber].Value2 = kvp.Value; - Range sumCell = offer.Sheet.Cells[cell.Row, offer.amountColumnNumber + exportedLists]; + if (cell == null) + { + System.Windows.Forms.MessageBox.Show + ($"Артикул {kvp.Key} отсутствует в таблице заказов {RegistryUtil.PriceListPath}", + "Отсутствует позиция в конечной таблице заказов", + System.Windows.Forms.MessageBoxButtons.OK, + System.Windows.Forms.MessageBoxIcon.Information); + } - if (sumCell.Value2 == null) - sumCell.Value2 = kvp.Value; - else - sumCell.Value2 += kvp.Value; + else + { + offer.Sheet.Cells[cell.Row, offer.amountColumnNumber].Value2 = kvp.Value; + Range sumCell = offer.Sheet.Cells[cell.Row, offer.amountColumnNumber + exportedLists]; - exportedValues++; - } + if (sumCell.Value2 == null) + sumCell.Value2 = kvp.Value; + else + sumCell.Value2 += kvp.Value; - offer.Sheet.Cells[offer.headerRowNumber, offer.amountColumnNumber].Value2 = $"{priceList.Name}\n{sheet.Name}"; + exportedValues++; } + + offer.Sheet.Cells[offer.headerRowNumber, offer.amountColumnNumber].Value2 = $"{priceList.Name}\n{sheet.Name}"; } } -- cgit v1.2.3 From c0139ca228bdca91df0a66201f59f8074c6a0db6 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 26 Jan 2022 17:50:07 +0300 Subject: Remove unnecessary fields --- src/PriceListTools/CombineTool.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index 59259ac..d285ab0 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -20,7 +20,7 @@ namespace RehauSku.PriceListTools if (sheet.SkuAmount.Count == 0) continue; - offer.Sheet.Columns[offer.amountColumnNumber] + offer.Sheet.Columns[offer.amountCell.Column] .EntireColumn .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow); @@ -28,7 +28,7 @@ namespace RehauSku.PriceListTools foreach (var kvp in sheet.SkuAmount) { - Range cell = offer.Sheet.Columns[offer.skuColumnNumber].Find(kvp.Key); + Range cell = offer.Sheet.Columns[offer.skuCell.Column].Find(kvp.Key); if (cell == null) { @@ -41,8 +41,8 @@ namespace RehauSku.PriceListTools else { - offer.Sheet.Cells[cell.Row, offer.amountColumnNumber].Value2 = kvp.Value; - Range sumCell = offer.Sheet.Cells[cell.Row, offer.amountColumnNumber + exportedLists]; + offer.Sheet.Cells[cell.Row, offer.amountCell.Column].Value2 = kvp.Value; + Range sumCell = offer.Sheet.Cells[cell.Row, offer.amountCell.Column + exportedLists]; if (sumCell.Value2 == null) sumCell.Value2 = kvp.Value; @@ -52,14 +52,14 @@ namespace RehauSku.PriceListTools exportedValues++; } - offer.Sheet.Cells[offer.headerRowNumber, offer.amountColumnNumber].Value2 = $"{priceList.Name}\n{sheet.Name}"; + offer.Sheet.Cells[offer.amountCell.Row, offer.amountCell.Column].Value2 = $"{priceList.Name}\n{sheet.Name}"; } } AutoFilter filter = offer.Sheet.AutoFilter; int firstFilterColumn = filter.Range.Column; - filter.Range.AutoFilter(offer.amountColumnNumber - firstFilterColumn + 1 + exportedLists, "<>"); + filter.Range.AutoFilter(offer.amountCell.Column - firstFilterColumn + 1 + exportedLists, "<>"); offer.Sheet.Range["A1"].Activate(); AddIn.Excel.StatusBar = $"Экспортировано {exportedValues} строк из {sourcePriceLists.Count} файлов"; -- cgit v1.2.3 From 55bbd801a5593512921ccd4671a50069896affa0 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 26 Jan 2022 18:17:44 +0300 Subject: Remove PriceList class --- src/PriceListTools/CombineTool.cs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index d285ab0..a9c02a9 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -7,16 +7,13 @@ namespace RehauSku.PriceListTools { public override void FillPriceList() { - PriceListSheet offer = NewPriceList.Sheet; + PriceList offer = NewPriceList; offer.Sheet.Activate(); int exportedValues = 0; - int exportedLists = 0; - foreach (var priceList in sourcePriceLists) + foreach (var sheet in sourcePriceLists) { - PriceListSheet sheet = priceList.Sheet; - if (sheet.SkuAmount.Count == 0) continue; @@ -24,8 +21,6 @@ namespace RehauSku.PriceListTools .EntireColumn .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow); - exportedLists++; - foreach (var kvp in sheet.SkuAmount) { Range cell = offer.Sheet.Columns[offer.skuCell.Column].Find(kvp.Key); @@ -41,8 +36,8 @@ namespace RehauSku.PriceListTools else { - offer.Sheet.Cells[cell.Row, offer.amountCell.Column].Value2 = kvp.Value; - Range sumCell = offer.Sheet.Cells[cell.Row, offer.amountCell.Column + exportedLists]; + offer.Sheet.Cells[cell.Row, offer.amountCell.Column - 1].Value2 = kvp.Value; + Range sumCell = offer.Sheet.Cells[cell.Row, offer.amountCell.Column]; if (sumCell.Value2 == null) sumCell.Value2 = kvp.Value; @@ -52,14 +47,13 @@ namespace RehauSku.PriceListTools exportedValues++; } - offer.Sheet.Cells[offer.amountCell.Row, offer.amountCell.Column].Value2 = $"{priceList.Name}\n{sheet.Name}"; + offer.Sheet.Cells[offer.amountCell.Row, offer.amountCell.Column - 1].Value2 = $"{sheet.Name}"; } } AutoFilter filter = offer.Sheet.AutoFilter; - int firstFilterColumn = filter.Range.Column; - filter.Range.AutoFilter(offer.amountCell.Column - firstFilterColumn + 1 + exportedLists, "<>"); + filter.Range.AutoFilter(offer.amountCell.Column, "<>"); offer.Sheet.Range["A1"].Activate(); AddIn.Excel.StatusBar = $"Экспортировано {exportedValues} строк из {sourcePriceLists.Count} файлов"; -- cgit v1.2.3 From 94e0c84ce1e62826d963c0809be1c4d242694444 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 26 Jan 2022 18:37:24 +0300 Subject: Move Autofilter method to abstract class --- src/PriceListTools/CombineTool.cs | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index a9c02a9..2e5995c 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -7,9 +7,6 @@ namespace RehauSku.PriceListTools { public override void FillPriceList() { - PriceList offer = NewPriceList; - offer.Sheet.Activate(); - int exportedValues = 0; foreach (var sheet in sourcePriceLists) @@ -17,13 +14,13 @@ namespace RehauSku.PriceListTools if (sheet.SkuAmount.Count == 0) continue; - offer.Sheet.Columns[offer.amountCell.Column] + NewPriceList.Sheet.Columns[NewPriceList.amountCell.Column] .EntireColumn .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow); foreach (var kvp in sheet.SkuAmount) { - Range cell = offer.Sheet.Columns[offer.skuCell.Column].Find(kvp.Key); + Range cell = NewPriceList.Sheet.Columns[NewPriceList.skuCell.Column].Find(kvp.Key); if (cell == null) { @@ -36,8 +33,8 @@ namespace RehauSku.PriceListTools else { - offer.Sheet.Cells[cell.Row, offer.amountCell.Column - 1].Value2 = kvp.Value; - Range sumCell = offer.Sheet.Cells[cell.Row, offer.amountCell.Column]; + NewPriceList.Sheet.Cells[cell.Row, NewPriceList.amountCell.Column - 1].Value2 = kvp.Value; + Range sumCell = NewPriceList.Sheet.Cells[cell.Row, NewPriceList.amountCell.Column]; if (sumCell.Value2 == null) sumCell.Value2 = kvp.Value; @@ -47,17 +44,12 @@ namespace RehauSku.PriceListTools exportedValues++; } - offer.Sheet.Cells[offer.amountCell.Row, offer.amountCell.Column - 1].Value2 = $"{sheet.Name}"; + NewPriceList.Sheet.Cells[NewPriceList.amountCell.Row, NewPriceList.amountCell.Column - 1].Value2 = $"{sheet.Name}"; } } - AutoFilter filter = offer.Sheet.AutoFilter; - - filter.Range.AutoFilter(offer.amountCell.Column, "<>"); - offer.Sheet.Range["A1"].Activate(); - + FilterByAmount(); AddIn.Excel.StatusBar = $"Экспортировано {exportedValues} строк из {sourcePriceLists.Count} файлов"; - Forms.Dialog.SaveWorkbookAs(); } -- cgit v1.2.3 From 72ac236b15603e84f18ec346749186b6cb2c2bdf Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Thu, 27 Jan 2022 10:22:30 +0300 Subject: Refactoring tolls classes --- src/PriceListTools/CombineTool.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index 2e5995c..39d3b98 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -3,9 +3,9 @@ using System; namespace RehauSku.PriceListTools { - internal class CombineTool : AbstractPriceListTool, IDisposable + internal class CombineTool : PriceListTool { - public override void FillPriceList() + public override void FillTarget() { int exportedValues = 0; @@ -52,10 +52,5 @@ namespace RehauSku.PriceListTools AddIn.Excel.StatusBar = $"Экспортировано {exportedValues} строк из {sourcePriceLists.Count} файлов"; Forms.Dialog.SaveWorkbookAs(); } - - public void Dispose() - { - GC.SuppressFinalize(this); - } } } -- cgit v1.2.3 From 935d48fc5fe264218b39b335e1fc5232af5dae61 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Thu, 27 Jan 2022 17:34:03 +0300 Subject: Complete tools refactoring --- src/PriceListTools/CombineTool.cs | 52 ++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 28 deletions(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index 39d3b98..f6eac8a 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -1,56 +1,52 @@ using Microsoft.Office.Interop.Excel; -using System; +using System.Collections.Generic; +using System.Linq; namespace RehauSku.PriceListTools { internal class CombineTool : PriceListTool { - public override void FillTarget() + public List SourceFiles; + + public void FillTarget() { - int exportedValues = 0; + ExcelApp.ScreenUpdating = false; + FillAmountColumn(SourceFiles.Select(x => x.SkuAmount).ToArray()); + AddAndFillSourceColumns(); + FilterByAmount(); + ExcelApp.ScreenUpdating = true; - foreach (var sheet in sourcePriceLists) + Forms.Dialog.SaveWorkbookAs(); + } + + private void AddAndFillSourceColumns() + { + foreach (var source in SourceFiles) { - if (sheet.SkuAmount.Count == 0) + if (source.SkuAmount.Count == 0) continue; - NewPriceList.Sheet.Columns[NewPriceList.amountCell.Column] + TargetFile.Sheet.Columns[TargetFile.amountCell.Column] .EntireColumn .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow); - foreach (var kvp in sheet.SkuAmount) + TargetFile.Sheet.Cells[TargetFile.amountCell.Row, TargetFile.amountCell.Column - 1].Value2 = $"{source.Name}"; + + foreach (var kvp in source.SkuAmount) { - Range cell = NewPriceList.Sheet.Columns[NewPriceList.skuCell.Column].Find(kvp.Key); + Range cell = TargetFile.Sheet.Columns[TargetFile.skuCell.Column].Find(kvp.Key); if (cell == null) { - System.Windows.Forms.MessageBox.Show - ($"Артикул {kvp.Key} отсутствует в таблице заказов {RegistryUtil.PriceListPath}", - "Отсутствует позиция в конечной таблице заказов", - System.Windows.Forms.MessageBoxButtons.OK, - System.Windows.Forms.MessageBoxIcon.Information); + continue; } else { - NewPriceList.Sheet.Cells[cell.Row, NewPriceList.amountCell.Column - 1].Value2 = kvp.Value; - Range sumCell = NewPriceList.Sheet.Cells[cell.Row, NewPriceList.amountCell.Column]; - - if (sumCell.Value2 == null) - sumCell.Value2 = kvp.Value; - else - sumCell.Value2 += kvp.Value; - - exportedValues++; + TargetFile.Sheet.Cells[cell.Row, TargetFile.amountCell.Column - 1].Value2 = kvp.Value; } - - NewPriceList.Sheet.Cells[NewPriceList.amountCell.Row, NewPriceList.amountCell.Column - 1].Value2 = $"{sheet.Name}"; } } - - FilterByAmount(); - AddIn.Excel.StatusBar = $"Экспортировано {exportedValues} строк из {sourcePriceLists.Count} файлов"; - Forms.Dialog.SaveWorkbookAs(); } } } -- cgit v1.2.3 From 7bb0a82ffbd5c5123bfdbff6ba29f463ab9d1b46 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Thu, 27 Jan 2022 20:43:19 +0300 Subject: Add FillColumn method --- src/PriceListTools/CombineTool.cs | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index f6eac8a..c634309 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -11,42 +11,23 @@ namespace RehauSku.PriceListTools public void FillTarget() { ExcelApp.ScreenUpdating = false; - FillAmountColumn(SourceFiles.Select(x => x.SkuAmount).ToArray()); - AddAndFillSourceColumns(); - FilterByAmount(); - ExcelApp.ScreenUpdating = true; - - Forms.Dialog.SaveWorkbookAs(); - } - private void AddAndFillSourceColumns() - { - foreach (var source in SourceFiles) + foreach (Source source in SourceFiles) { - if (source.SkuAmount.Count == 0) - continue; - TargetFile.Sheet.Columns[TargetFile.amountCell.Column] .EntireColumn .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow); TargetFile.Sheet.Cells[TargetFile.amountCell.Row, TargetFile.amountCell.Column - 1].Value2 = $"{source.Name}"; - foreach (var kvp in source.SkuAmount) - { - Range cell = TargetFile.Sheet.Columns[TargetFile.skuCell.Column].Find(kvp.Key); + FillColumn(source.SkuAmount, TargetFile.amountCell.Column - 1); + FillColumn(source.SkuAmount, TargetFile.amountCell.Column); + } - if (cell == null) - { - continue; - } + FilterByAmount(); + ExcelApp.ScreenUpdating = true; - else - { - TargetFile.Sheet.Cells[cell.Row, TargetFile.amountCell.Column - 1].Value2 = kvp.Value; - } - } - } + Forms.Dialog.SaveWorkbookAs(); } } } -- cgit v1.2.3 From 711cc313e0eaed646c5058ef294de6d89770e352 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 28 Jan 2022 11:41:35 +0300 Subject: Add complete position class --- src/PriceListTools/CombineTool.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index c634309..6550179 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -20,8 +20,8 @@ namespace RehauSku.PriceListTools TargetFile.Sheet.Cells[TargetFile.amountCell.Row, TargetFile.amountCell.Column - 1].Value2 = $"{source.Name}"; - FillColumn(source.SkuAmount, TargetFile.amountCell.Column - 1); - FillColumn(source.SkuAmount, TargetFile.amountCell.Column); + FillColumn(source.PositionAmount, TargetFile.amountCell.Column - 1); + FillColumn(source.PositionAmount, TargetFile.amountCell.Column); } FilterByAmount(); -- cgit v1.2.3 From bb6cee1fe08befe918c0e85fa9f4a52b554b741d Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 28 Jan 2022 12:37:02 +0300 Subject: Wrap new column header text --- src/PriceListTools/CombineTool.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index 6550179..a5864b7 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -18,7 +18,9 @@ namespace RehauSku.PriceListTools .EntireColumn .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow); - TargetFile.Sheet.Cells[TargetFile.amountCell.Row, TargetFile.amountCell.Column - 1].Value2 = $"{source.Name}"; + Range newColumnHeader = TargetFile.Sheet.Cells[TargetFile.amountCell.Row, TargetFile.amountCell.Column - 1]; + newColumnHeader.Value2 = $"{source.Name}"; + newColumnHeader.WrapText = true; FillColumn(source.PositionAmount, TargetFile.amountCell.Column - 1); FillColumn(source.PositionAmount, TargetFile.amountCell.Column); -- cgit v1.2.3 From b4763bd03c410433e3f8b885e5db6704337318d5 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 28 Jan 2022 15:11:39 +0300 Subject: Change column parameter to parameters array --- src/PriceListTools/CombineTool.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index a5864b7..474fd99 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -1,6 +1,5 @@ using Microsoft.Office.Interop.Excel; using System.Collections.Generic; -using System.Linq; namespace RehauSku.PriceListTools { @@ -22,8 +21,8 @@ namespace RehauSku.PriceListTools newColumnHeader.Value2 = $"{source.Name}"; newColumnHeader.WrapText = true; - FillColumn(source.PositionAmount, TargetFile.amountCell.Column - 1); - FillColumn(source.PositionAmount, TargetFile.amountCell.Column); + FillColumn(source.PositionAmount, TargetFile.amountCell.Column - 1, TargetFile.amountCell.Column); + //FillColumn(source.PositionAmount, ); } FilterByAmount(); -- cgit v1.2.3 From b48de1429091cea31994f9c78d8b352edf9143c4 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 28 Jan 2022 15:45:13 +0300 Subject: Refactoring --- src/PriceListTools/CombineTool.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index 474fd99..a654a92 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -22,7 +22,6 @@ namespace RehauSku.PriceListTools newColumnHeader.WrapText = true; FillColumn(source.PositionAmount, TargetFile.amountCell.Column - 1, TargetFile.amountCell.Column); - //FillColumn(source.PositionAmount, ); } FilterByAmount(); -- cgit v1.2.3 From 60006126b97131e383a8fee137cf89a13672f042 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 28 Jan 2022 18:15:13 +0300 Subject: Add not found positions to target file --- src/PriceListTools/CombineTool.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/PriceListTools/CombineTool.cs') diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index a654a92..dc0f2af 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -21,7 +21,7 @@ namespace RehauSku.PriceListTools newColumnHeader.Value2 = $"{source.Name}"; newColumnHeader.WrapText = true; - FillColumn(source.PositionAmount, TargetFile.amountCell.Column - 1, TargetFile.amountCell.Column); + FillColumnsWithDictionary(source.PositionAmount, TargetFile.amountCell.Column - 1, TargetFile.amountCell.Column); } FilterByAmount(); -- cgit v1.2.3