Compare commits
5 Commits
05dab8d045
...
34bc0004d2
| Author | SHA1 | Date | |
|---|---|---|---|
|
34bc0004d2 | ||
|
|
7363a8036e | ||
|
|
73bc1517f3 | ||
|
|
dc14c80d59 | ||
|
|
916e12cae7 |
@@ -1,146 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
|
||||||
<PropertyGroup>
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
||||||
<ProjectGuid>{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}</ProjectGuid>
|
|
||||||
<OutputType>Library</OutputType>
|
|
||||||
<RootNamespace>ImporterShared</RootNamespace>
|
|
||||||
<AssemblyName>ImporterShared</AssemblyName>
|
|
||||||
<FileAlignment>512</FileAlignment>
|
|
||||||
<MyType>Windows</MyType>
|
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
|
||||||
<Deterministic>true</Deterministic>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<DefineDebug>true</DefineDebug>
|
|
||||||
<DefineTrace>true</DefineTrace>
|
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
|
||||||
<DocumentationFile>ImporterShared.xml</DocumentationFile>
|
|
||||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<DefineDebug>false</DefineDebug>
|
|
||||||
<DefineTrace>true</DefineTrace>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
|
||||||
<DocumentationFile>ImporterShared.xml</DocumentationFile>
|
|
||||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionExplicit>On</OptionExplicit>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionCompare>Binary</OptionCompare>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionStrict>Off</OptionStrict>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionInfer>On</OptionInfer>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
||||||
<Reference Include="DigitalData.Modules.Database">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Filesystem">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Language">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Logging">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Microsoft.CSharp" />
|
|
||||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System" />
|
|
||||||
<Reference Include="System.Configuration" />
|
|
||||||
<Reference Include="System.Data" />
|
|
||||||
<Reference Include="System.IO.Compression" />
|
|
||||||
<Reference Include="System.Runtime.Serialization" />
|
|
||||||
<Reference Include="System.ServiceModel" />
|
|
||||||
<Reference Include="System.Transactions" />
|
|
||||||
<Reference Include="System.Xml" />
|
|
||||||
<Reference Include="System.Core" />
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
|
||||||
<Reference Include="System.Net.Http" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
|
||||||
<Import Include="System" />
|
|
||||||
<Import Include="System.Collections" />
|
|
||||||
<Import Include="System.Collections.Generic" />
|
|
||||||
<Import Include="System.Data" />
|
|
||||||
<Import Include="System.Diagnostics" />
|
|
||||||
<Import Include="System.Linq" />
|
|
||||||
<Import Include="System.Xml.Linq" />
|
|
||||||
<Import Include="System.Threading.Tasks" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="BaseClass.vb" />
|
|
||||||
<Compile Include="Config.vb" />
|
|
||||||
<Compile Include="Documents\Document.vb" />
|
|
||||||
<Compile Include="Documents\DocumentMatch.vb" />
|
|
||||||
<Compile Include="Documents\DocumentType.vb" />
|
|
||||||
<Compile Include="Documents\DocumentLoader.vb" />
|
|
||||||
<Compile Include="IEnumerableEx.vb" />
|
|
||||||
<Compile Include="My Project\AssemblyInfo.vb" />
|
|
||||||
<Compile Include="My Project\Application.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Application.myapp</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="My Project\Resources.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="My Project\Settings.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Settings.settings</DependentUpon>
|
|
||||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Mapper.vb" />
|
|
||||||
<Compile Include="Schemas\Orders\Input.vb" />
|
|
||||||
<Compile Include="Schemas\Orders\Output.vb" />
|
|
||||||
<Compile Include="Schemas\Orders\ReportSource.vb" />
|
|
||||||
<Compile Include="Serializer.vb" />
|
|
||||||
<Compile Include="Winline\Account.vb" />
|
|
||||||
<Compile Include="Winline\Data.vb" />
|
|
||||||
<Compile Include="Winline\Mandator.vb" />
|
|
||||||
<Compile Include="Winline\WebService.vb" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<EmbeddedResource Include="My Project\Resources.resx">
|
|
||||||
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
|
|
||||||
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
|
|
||||||
<CustomToolNamespace>My.Resources</CustomToolNamespace>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
</EmbeddedResource>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="My Project\Application.myapp">
|
|
||||||
<Generator>MyApplicationCodeGenerator</Generator>
|
|
||||||
<LastGenOutput>Application.Designer.vb</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<None Include="My Project\Settings.settings">
|
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
|
||||||
<CustomToolNamespace>My</CustomToolNamespace>
|
|
||||||
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<None Include="packages.config" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup />
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
|
||||||
</Project>
|
|
||||||
@@ -1,175 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
|
||||||
<PropertyGroup>
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
||||||
<ProjectGuid>{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}</ProjectGuid>
|
|
||||||
<OutputType>Library</OutputType>
|
|
||||||
<RootNamespace>MultiTool.Shared</RootNamespace>
|
|
||||||
<AssemblyName>MultiTool.Shared</AssemblyName>
|
|
||||||
<FileAlignment>512</FileAlignment>
|
|
||||||
<MyType>Windows</MyType>
|
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
|
||||||
<Deterministic>true</Deterministic>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<DefineDebug>true</DefineDebug>
|
|
||||||
<DefineTrace>true</DefineTrace>
|
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
|
||||||
<DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
|
|
||||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<DefineDebug>false</DefineDebug>
|
|
||||||
<DefineTrace>true</DefineTrace>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
|
||||||
<DocumentationFile>MultiTool.Shared.xml</DocumentationFile>
|
|
||||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionExplicit>On</OptionExplicit>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionCompare>Binary</OptionCompare>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionStrict>Off</OptionStrict>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<OptionInfer>On</OptionInfer>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
|
||||||
<Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
||||||
<Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
|
||||||
<Reference Include="DigitalData.Modules.Config">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Database">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Filesystem">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Interfaces">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Language">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="DigitalData.Modules.Logging">
|
|
||||||
<HintPath>..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Microsoft.CSharp" />
|
|
||||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
|
||||||
<HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System" />
|
|
||||||
<Reference Include="System.Configuration" />
|
|
||||||
<Reference Include="System.Data" />
|
|
||||||
<Reference Include="System.IO.Compression" />
|
|
||||||
<Reference Include="System.Runtime.Serialization" />
|
|
||||||
<Reference Include="System.ServiceModel" />
|
|
||||||
<Reference Include="System.Transactions" />
|
|
||||||
<Reference Include="System.Xml" />
|
|
||||||
<Reference Include="System.Core" />
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
|
||||||
<Reference Include="System.Net.Http" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Import Include="Microsoft.VisualBasic" />
|
|
||||||
<Import Include="System" />
|
|
||||||
<Import Include="System.Collections" />
|
|
||||||
<Import Include="System.Collections.Generic" />
|
|
||||||
<Import Include="System.Data" />
|
|
||||||
<Import Include="System.Diagnostics" />
|
|
||||||
<Import Include="System.Linq" />
|
|
||||||
<Import Include="System.Xml.Linq" />
|
|
||||||
<Import Include="System.Threading.Tasks" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="BaseClass.vb" />
|
|
||||||
<Compile Include="Config.vb" />
|
|
||||||
<Compile Include="Constants.vb" />
|
|
||||||
<Compile Include="DataRowEx.vb" />
|
|
||||||
<Compile Include="Documents\Document.vb" />
|
|
||||||
<Compile Include="Documents\DocumentRow.vb" />
|
|
||||||
<Compile Include="Documents\DocumentType.vb" />
|
|
||||||
<Compile Include="Documents\DocumentLoader.vb" />
|
|
||||||
<Compile Include="Exceptions.vb" />
|
|
||||||
<Compile Include="Helpers.vb" />
|
|
||||||
<Compile Include="IDictionaryEx.vb" />
|
|
||||||
<Compile Include="IEnumerableEx.vb" />
|
|
||||||
<Compile Include="Mapper.vb" />
|
|
||||||
<Compile Include="My Project\AssemblyInfo.vb" />
|
|
||||||
<Compile Include="My Project\Application.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Application.myapp</DependentUpon>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="My Project\Resources.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="My Project\Settings.Designer.vb">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Settings.settings</DependentUpon>
|
|
||||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Report\ReportGenerator.vb" />
|
|
||||||
<Compile Include="Templates\GeneralConfig.vb" />
|
|
||||||
<Compile Include="Templates\MandatorConfig.vb" />
|
|
||||||
<Compile Include="Templates\MandatorConfigItem.vb" />
|
|
||||||
<Compile Include="Templates\MappingConfig.vb" />
|
|
||||||
<Compile Include="Templates\MappingConfigItem.vb" />
|
|
||||||
<Compile Include="Report\ReportHead.vb" />
|
|
||||||
<Compile Include="Report\ReportPosition.vb" />
|
|
||||||
<Compile Include="Report\ReportSource.vb" />
|
|
||||||
<Compile Include="Winline\Entities\Response.vb" />
|
|
||||||
<Compile Include="Templates\Template.vb" />
|
|
||||||
<Compile Include="Templates\TemplateLoader.vb" />
|
|
||||||
<Compile Include="Serializer.vb" />
|
|
||||||
<Compile Include="Templates\TemplateConfig.vb" />
|
|
||||||
<Compile Include="Winline\Entities\Account.vb" />
|
|
||||||
<Compile Include="Winline\WinlineData.vb" />
|
|
||||||
<Compile Include="Winline\Entities\Article.vb" />
|
|
||||||
<Compile Include="Winline\Entities\Contact.vb" />
|
|
||||||
<Compile Include="Winline\Entities\DocumentKind.vb" />
|
|
||||||
<Compile Include="Winline\Entities\Mandator.vb" />
|
|
||||||
<Compile Include="Templates\TemplateConfigItem.vb" />
|
|
||||||
<Compile Include="Winline\WebServiceData.vb" />
|
|
||||||
<Compile Include="XmlData.vb" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<EmbeddedResource Include="My Project\Resources.resx">
|
|
||||||
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
|
|
||||||
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
|
|
||||||
<CustomToolNamespace>My.Resources</CustomToolNamespace>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
</EmbeddedResource>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="My Project\Application.myapp">
|
|
||||||
<Generator>MyApplicationCodeGenerator</Generator>
|
|
||||||
<LastGenOutput>Application.Designer.vb</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<None Include="My Project\Settings.settings">
|
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
|
||||||
<CustomToolNamespace>My</CustomToolNamespace>
|
|
||||||
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<None Include="packages.config" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup />
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
|
||||||
</Project>
|
|
||||||
@@ -336,8 +336,6 @@ Namespace Winline
|
|||||||
Logger.Debug("Applying Item Functions")
|
Logger.Debug("Applying Item Functions")
|
||||||
oDoc = ApplyItemFunctionsForExport(pDocument, pTemplate, pMandator, oDoc)
|
oDoc = ApplyItemFunctionsForExport(pDocument, pTemplate, pMandator, oDoc)
|
||||||
|
|
||||||
'TODO: Load filters and apply
|
|
||||||
|
|
||||||
Dim oXml = ConvertDocumentToString(oDoc)
|
Dim oXml = ConvertDocumentToString(oDoc)
|
||||||
|
|
||||||
' Webservice
|
' Webservice
|
||||||
@@ -413,6 +411,7 @@ Namespace Winline
|
|||||||
' we dont throw here, but leave the original value in case of a failure.
|
' we dont throw here, but leave the original value in case of a failure.
|
||||||
' Throw New Exceptions.MissingAttributeException("EAN")
|
' Throw New Exceptions.MissingAttributeException("EAN")
|
||||||
Logger.Warn("EAN could not be retrieved for Node {0}. Skipping.", oNode.Name)
|
Logger.Warn("EAN could not be retrieved for Node {0}. Skipping.", oNode.Name)
|
||||||
|
Continue For
|
||||||
End If
|
End If
|
||||||
|
|
||||||
oNode.InnerText = oEAN
|
oNode.InnerText = oEAN
|
||||||
@@ -443,14 +442,20 @@ Namespace Winline
|
|||||||
Where(Function(filter) oTableNames.Contains(filter.TableName)).
|
Where(Function(filter) oTableNames.Contains(filter.TableName)).
|
||||||
ToList()
|
ToList()
|
||||||
|
|
||||||
|
Logger.Info("Applying [{0}] filters before exporting.", oFilters.Count)
|
||||||
|
|
||||||
For Each oFilter As FilterConfigItem In oFilters
|
For Each oFilter As FilterConfigItem In oFilters
|
||||||
Dim oTableName = oFilter.TableName
|
Dim oTableName = oFilter.TableName
|
||||||
|
|
||||||
|
Logger.Debug("Applying filter for Table [{0}]", oTableName)
|
||||||
|
|
||||||
If String.IsNullOrEmpty(oFilter.SQLCommand) Then
|
If String.IsNullOrEmpty(oFilter.SQLCommand) Then
|
||||||
Logger.Warn("SQL Command for filter is empty. Continuing.")
|
Logger.Warn("SQL Command for filter is empty. Continuing.")
|
||||||
Continue For
|
Continue For
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
Logger.Debug("Executing SQL Command: [{0}]", oFilter.SQLCommand)
|
||||||
|
|
||||||
Dim oSQLResult = Database.GetDatatable(oFilter.SQLCommand)
|
Dim oSQLResult = Database.GetDatatable(oFilter.SQLCommand)
|
||||||
|
|
||||||
If oSQLResult Is Nothing Then
|
If oSQLResult Is Nothing Then
|
||||||
@@ -459,18 +464,34 @@ Namespace Winline
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Dim oResultList = oSQLResult.AsEnumerable.
|
Dim oResultList = oSQLResult.AsEnumerable.
|
||||||
Select(Of String)(Function(row) row.Item(0)).
|
Select(Function(row) row.ItemEx(0, String.Empty).Trim).
|
||||||
ToList()
|
ToList()
|
||||||
|
|
||||||
Dim oNodes = oXMLDocument.SelectNodes($"//{oTableName}")
|
Logger.Debug("Filterlist contains [{0}] items", oResultList.Count)
|
||||||
|
|
||||||
For Each oNode As XmlNode In oNodes
|
Dim oTableNodes = oXMLDocument.SelectNodes($"//{oTableName}")
|
||||||
Dim oSubNode = oNode.SelectSingleNode($"//{oFilter.ColumnName}")
|
|
||||||
|
|
||||||
If oSubNode IsNot Nothing AndAlso oResultList.Contains(oSubNode.InnerText) Then
|
Logger.Debug("Table contains [{0}] elements", oTableNodes.Count)
|
||||||
oNode.ParentNode.RemoveChild(oNode)
|
|
||||||
'oDoc.RemoveChild(oNode)
|
For Each oElementNode As XmlNode In oTableNodes
|
||||||
|
Dim oPath As String = $"./{oFilter.ColumnName}"
|
||||||
|
Dim oSubNode = oElementNode.SelectSingleNode(oPath)
|
||||||
|
|
||||||
|
If oSubNode Is Nothing Then
|
||||||
|
Logger.Warn("Column [{0}] was not found in element.", oFilter.ColumnName)
|
||||||
|
Continue For
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
Dim oNodeValue = oSubNode.InnerText.Trim
|
||||||
|
Logger.Debug("Element Value is [{0}]", oNodeValue)
|
||||||
|
|
||||||
|
If Not oResultList.Contains(oNodeValue) Then
|
||||||
|
Logger.Warn("Element for Column [{0}] was not found in filterlist.", oFilter.ColumnName)
|
||||||
|
Continue For
|
||||||
|
End If
|
||||||
|
|
||||||
|
Logger.Info("Removing node [{0}] containing value [{1}]", oPath, oNodeValue)
|
||||||
|
oElementNode.ParentNode.RemoveChild(oElementNode)
|
||||||
Next
|
Next
|
||||||
Next
|
Next
|
||||||
|
|
||||||
|
|||||||
@@ -572,7 +572,7 @@ Namespace Winline
|
|||||||
FROM [{pMandator.Database}].[dbo].[v021]
|
FROM [{pMandator.Database}].[dbo].[v021]
|
||||||
WHERE [c011] = '{pArticleNumber}'
|
WHERE [c011] = '{pArticleNumber}'
|
||||||
AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
|
AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
|
||||||
Dim oEAN As String = Database.GetScalarValue(oSQL)
|
Dim oEAN As String = Utils.NotNull(Database.GetScalarValue(oSQL), Nothing)
|
||||||
|
|
||||||
' EAN not found in this Mandator, continue to next one
|
' EAN not found in this Mandator, continue to next one
|
||||||
If oEAN Is Nothing Then
|
If oEAN Is Nothing Then
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
|
|||||||
<Assembly: AssemblyCompany("Digital Data")>
|
<Assembly: AssemblyCompany("Digital Data")>
|
||||||
<Assembly: AssemblyProduct("WebService Multitool")>
|
<Assembly: AssemblyProduct("WebService Multitool")>
|
||||||
<Assembly: AssemblyCopyright("Copyright © 2022")>
|
<Assembly: AssemblyCopyright("Copyright © 2022")>
|
||||||
<Assembly: AssemblyTrademark("1.3.9.1")>
|
<Assembly: AssemblyTrademark("1.3.9.3")>
|
||||||
|
|
||||||
<Assembly: ComVisible(False)>
|
<Assembly: ComVisible(False)>
|
||||||
|
|
||||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' indem Sie "*" wie unten gezeigt eingeben:
|
' indem Sie "*" wie unten gezeigt eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.3.9.1")>
|
<Assembly: AssemblyVersion("1.3.9.3")>
|
||||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||||
|
|||||||
Reference in New Issue
Block a user