diff --git a/ExportDXF/ExportDXF.csproj b/ExportDXF/ExportDXF.csproj index 9961b1d..ddc7536 100644 --- a/ExportDXF/ExportDXF.csproj +++ b/ExportDXF/ExportDXF.csproj @@ -12,10 +12,10 @@ v4.0 512 false - publish\ + \\SERVER4\Data\Software\ExportDXF\ true - Disk - false + Unc + true Foreground 7 Days @@ -23,8 +23,8 @@ false true Rogers Engineering - 3 - 1.0.2.%2a + 6 + 1.0.3.%2a false true true diff --git a/ExportDXF/Forms/MainForm.cs b/ExportDXF/Forms/MainForm.cs index 02aa9bd..9d9af8a 100644 --- a/ExportDXF/Forms/MainForm.cs +++ b/ExportDXF/Forms/MainForm.cs @@ -584,6 +584,7 @@ namespace ExportDXF.Forms partsSheet.Cells[row, col++].Value = item.Quantity; partsSheet.Cells[row, col++].Value = item.Description; partsSheet.Cells[row, col++].Value = item.PartName; + partsSheet.Cells[row, col++].Value = item.Configuration; if (item.Thickness > 0) partsSheet.Cells[row, col].Value = item.Thickness; diff --git a/ExportDXF/Item.cs b/ExportDXF/Item.cs index 4f6090a..605cba1 100644 --- a/ExportDXF/Item.cs +++ b/ExportDXF/Item.cs @@ -10,6 +10,8 @@ namespace ExportDXF public string PartName { get; set; } + public string Configuration { get; set; } + public int Quantity { get; set; } public string Description { get; set; } diff --git a/ExportDXF/ItemExtractor.cs b/ExportDXF/ItemExtractor.cs index b019f3f..a11760f 100644 --- a/ExportDXF/ItemExtractor.cs +++ b/ExportDXF/ItemExtractor.cs @@ -81,6 +81,7 @@ namespace ExportDXF } item.Component = GetComponent(rowIndex); + item.Configuration = item.Component.ReferencedConfiguration; return item; } @@ -185,7 +186,8 @@ namespace ExportDXF { PartName = name, Quantity = group.Count(), - Component = component + Component = component, + Configuration = component.ReferencedConfiguration }); } diff --git a/ExportDXF/Templates/BomTemplate.xlsx b/ExportDXF/Templates/BomTemplate.xlsx index 54e1806..ede1380 100644 Binary files a/ExportDXF/Templates/BomTemplate.xlsx and b/ExportDXF/Templates/BomTemplate.xlsx differ