chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 16 Wiki Activity

Fix Export Tool to use Price List Tool base methods

Browse Source
This commit is contained in:
Sergey Chebotar 2022-01-31 17:54:18 +03:00
parent 913de67a02
commit cfb15d1279
3 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/PriceListTools/ExportTool.cs
View File

@ -7,7 +7,7 @@ namespace RehauSku.PriceListTools
{ {
internal class ExportTool : PriceListTool internal class ExportTool : PriceListTool
{ {
private Dictionary<string, double> SkuAmount { get; set; } private Dictionary<Position, double> PositionAmount;
private Range Selection; private Range Selection;
public void TryGetSelection() public void TryGetSelection()
@ -19,62 +19,23 @@ namespace RehauSku.PriceListTools
throw new Exception("Неверный диапазон"); throw new Exception("Неверный диапазон");
} }
} }
public void FillTarget() public void FillTarget()
{ {
ExcelApp.ScreenUpdating = false; ExcelApp.ScreenUpdating = false;
GetSelected(); GetSelected();
FillColumn(SkuAmount, TargetFile.amountCell.Column); FillColumnsWithDictionary(PositionAmount, TargetFile.amountCell.Column);
FilterByAmount(); FilterByAmount();
ExcelApp.ScreenUpdating = true; ExcelApp.ScreenUpdating = true;
Forms.Dialog.SaveWorkbookAs(); Forms.Dialog.SaveWorkbookAs();
} }
private void FillColumn(IEnumerable<KeyValuePair<string, double>> dictionary, int column)
{
List<KeyValuePair<string, double>> missing = new List<KeyValuePair<string, double>>();
foreach (var kvp in dictionary)
{
Range cell = TargetFile.skuCell.EntireColumn.Find(kvp.Key);
if (cell == null)
{
missing.Add(kvp);
}
else
{
Range sumCell = TargetFile.Sheet.Cells[cell.Row, column];
if (sumCell.Value2 == null)
{
sumCell.Value2 = kvp.Value;
}
else
{
sumCell.Value2 += kvp.Value;
}
}
}
if (missing.Count > 0)
{
System.Windows.Forms.MessageBox.Show
($"{missing.Count} артикулов отсутствует в таблице заказов {RegistryUtil.PriceListPath} Попробовать найти новый вариант?",
"Отсутствует позиция в конечной таблице заказов",
System.Windows.Forms.MessageBoxButtons.YesNo,
System.Windows.Forms.MessageBoxIcon.Information);
}
}
private void GetSelected() private void GetSelected()
{ {
object[,] cells = Selection.Value2; object[,] cells = Selection.Value2;
SkuAmount = new Dictionary<string, double>(); Dictionary<string, double> SkuAmount = new Dictionary<string, double>();
PositionAmount = new Dictionary<Position, double>();
int rowsCount = Selection.Rows.Count; int rowsCount = Selection.Rows.Count;
for (int row = 1; row <= rowsCount; row++) for (int row = 1; row <= rowsCount; row++)
@ -115,11 +76,17 @@ namespace RehauSku.PriceListTools
{ {
SkuAmount[sku] += amount.Value; SkuAmount[sku] += amount.Value;
} }
else else
{ {
SkuAmount.Add(sku, amount.Value); SkuAmount.Add(sku, amount.Value);
} }
} }
foreach (var kvp in SkuAmount)
{
PositionAmount.Add(new Position(null, kvp.Key, null), kvp.Value);
}
} }
} }
} }

1
src/PriceListTools/Position.cs
View File

@ -14,4 +14,3 @@
} }
} }
} }

4
src/PriceListTools/PriceListTool.cs
View File

@ -89,6 +89,8 @@ namespace RehauSku.PriceListTools
while (foundCell != null && foundCellGroup != positionAmount.Key.Group) while (foundCell != null && foundCellGroup != positionAmount.Key.Group)
{ {
if (positionAmount.Key.Group == null) break;
foundCell = TargetFile.skuCell.EntireColumn.FindNext(foundCell); foundCell = TargetFile.skuCell.EntireColumn.FindNext(foundCell);
foundCellGroup = TargetFile.Sheet.Cells[foundCell.Row, TargetFile.groupCell.Column].Value2.ToString(); foundCellGroup = TargetFile.Sheet.Cells[foundCell.Row, TargetFile.groupCell.Column].Value2.ToString();
} }
@ -132,6 +134,8 @@ namespace RehauSku.PriceListTools
while (foundCell != null && foundCellGroup != positionAmount.Key.Group) while (foundCell != null && foundCellGroup != positionAmount.Key.Group)
{ {
if (positionAmount.Key.Group == null) break;
foundCell = TargetFile.skuCell.EntireColumn.FindNext(foundCell); foundCell = TargetFile.skuCell.EntireColumn.FindNext(foundCell);
foundCellGroup = TargetFile.Sheet.Cells[foundCell.Row, TargetFile.groupCell.Column].Value2.ToString(); foundCellGroup = TargetFile.Sheet.Cells[foundCell.Row, TargetFile.groupCell.Column].Value2.ToString();
} }