This commit is contained in:
2021-11-25 14:09:59 +01:00
parent 98378dd496
commit 2572bd5a26
15 changed files with 285 additions and 39 deletions

View File

@@ -117,8 +117,8 @@ Global
{2007DD34-7BB4-4A31-A6B9-BCE62BF0AFDA}.Release|x64.Build.0 = Release|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU
{A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|Any CPU

View File

@@ -329,6 +329,7 @@ Public Class cZOLL_IMPORT
Select Case filiale
Case "5501" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX"
Case "4801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" : Return False 'Keine Atoerfassung
Case "5801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE"
End Select
Dim abfertigungsnummer = getAbfertigungsnummer(LRN)

View File

@@ -1,6 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -1,6 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -80,19 +80,92 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="ClosedXML">
<HintPath>..\..\..\dll\closedxml\ClosedXML.dll</HintPath>
<Reference Include="BouncyCastle.Crypto, Version=1.8.4.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="ClosedXML, Version=0.68.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\dll\ClosedXML.dll</HintPath>
</Reference>
<Reference Include="FastColoredTextBox">
<HintPath>..\..\..\dll\FastColoredTextBox.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Chart.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
<Reference Include="GrapeCity.ActiveReports.Diagnostics.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
<Reference Include="GrapeCity.ActiveReports.Document.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
<Reference Include="GrapeCity.ActiveReports.Export.Pdf.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL" />
<Reference Include="GrapeCity.ActiveReports.Extensibility.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
<Reference Include="GrapeCity.ActiveReports.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff" />
<Reference Include="GrapeCity.ActiveReports.Viewer.Win.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL" />
<Reference Include="Gcef.Data.DataEngine, Version=3.0.2.0, Culture=neutral, PublicKeyToken=0b5e1563d2869208, processorArchitecture=MSIL">
<HintPath>..\packages\Gcef.Data.DataEngine.3.0.2\lib\net40\Gcef.Data.DataEngine.dll</HintPath>
</Reference>
<Reference Include="Gcef.Data.ExpressionInfo, Version=3.0.2.0, Culture=neutral, PublicKeyToken=0b5e1563d2869208, processorArchitecture=MSIL">
<HintPath>..\packages\Gcef.Data.ExpressionInfo.3.0.2\lib\net40\Gcef.Data.ExpressionInfo.dll</HintPath>
</Reference>
<Reference Include="Gcef.Data.VBFunctionLib, Version=3.0.2.0, Culture=neutral, PublicKeyToken=0b5e1563d2869208, processorArchitecture=MSIL">
<HintPath>..\packages\Gcef.Data.VBFunctionLib.3.0.2\lib\net40\Gcef.Data.VBFunctionLib.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports, Version=15.2.4.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.15.2.4\lib\net462\GrapeCity.ActiveReports.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Chart, Version=15.2.2.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Chart.15.2.2\lib\net462\GrapeCity.ActiveReports.Chart.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.DataProviders, Version=2.0.7.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Core.DataProviders.2.0.7\lib\net462\GrapeCity.ActiveReports.Core.DataProviders.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.Document, Version=2.1.4.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Core.Document.2.1.4\lib\net462\GrapeCity.ActiveReports.Core.Document.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.Document.Drawing.Gc, Version=2.1.4.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Core.Document.Drawing.Gc.2.1.4\lib\net462\GrapeCity.ActiveReports.Core.Document.Drawing.Gc.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.Document.Drawing.Gdi, Version=2.1.4.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Core.Document.Drawing.Gdi.2.1.4\lib\net462\GrapeCity.ActiveReports.Core.Document.Drawing.Gdi.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.Drawing.Gc, Version=2.3.5.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Core.Drawing.Gc.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Drawing.Gc.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.Drawing.Gdi, Version=2.3.5.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Core.Drawing.Gdi.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Drawing.Gdi.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.Export.Pdf.Section">
<HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Core.Export.Pdf.Section.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.Rdl, Version=2.3.5.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Core.Rdl.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Rdl.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.Rendering, Version=2.3.5.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Core.Rendering.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Rendering.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Core.Scripting, Version=2.3.5.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Core.Scripting.2.3.5\lib\net462\GrapeCity.ActiveReports.Core.Scripting.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Document, Version=15.2.4.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.Document.15.2.4\lib\net462\GrapeCity.ActiveReports.Document.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Export.Pdf">
<HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Export.Pdf.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Viewer.Common">
<HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Common.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Viewer.Win">
<HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.Viewer.Win.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.ActiveReports.Win, Version=15.2.4.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.ActiveReports.15.2.4\lib\net462\GrapeCity.ActiveReports.Win.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.DataVisualization.Chart, Version=0.4.23.0, Culture=neutral, PublicKeyToken=8dbeb54e07a9de91, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.DataVisualization.Chart.0.4.23\lib\net462\GrapeCity.DataVisualization.Chart.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.Documents.Common, Version=4.2.0.722, Culture=neutral, PublicKeyToken=d55d733d2bfd5065, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.Documents.Common.4.2.0.722\lib\net461\GrapeCity.Documents.Common.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.Documents.Common.Windows, Version=4.2.0.722, Culture=neutral, PublicKeyToken=d55d733d2bfd5065, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.Documents.Common.Windows.4.2.0.722\lib\net461\GrapeCity.Documents.Common.Windows.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.Documents.DX.Windows, Version=4.2.0.722, Culture=neutral, PublicKeyToken=d55d733d2bfd5065, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.Documents.DX.Windows.4.2.0.722\lib\net461\GrapeCity.Documents.DX.Windows.dll</HintPath>
</Reference>
<Reference Include="GrapeCity.Documents.Imaging, Version=4.2.0.722, Culture=neutral, PublicKeyToken=d55d733d2bfd5065, processorArchitecture=MSIL">
<HintPath>..\packages\GrapeCity.Documents.Imaging.4.2.0.722\lib\net461\GrapeCity.Documents.Imaging.dll</HintPath>
</Reference>
<Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.5\lib\net40-client\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
<Private>True</Private>
@@ -103,6 +176,10 @@
<Reference Include="itextsharp.pdfa">
<HintPath>..\..\..\dll\itextsharp.pdfa.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Office.Interop.Excel1">
<HintPath>C:\Program Files (x86)\Microsoft Visual Studio 12.0\Visual Studio Tools for Office\PIA\Office15\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
@@ -131,6 +208,9 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
@@ -138,8 +218,31 @@
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Security" />
<Reference Include="System.Text.Encodings.Web, Version=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.5.0.1\lib\net461\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
@@ -552,6 +655,7 @@
<EmbeddedResource Include="frmPrintLayout.resx">
<DependentUpon>frmPrintLayout.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="My Project\licenses.licx" />
<EmbeddedResource Include="Programme\frmBenutzerBerGruppen.resx">
<DependentUpon>frmBenutzerBerGruppen.vb</DependentUpon>
</EmbeddedResource>
@@ -597,7 +701,6 @@
<EmbeddedResource Include="Homepage\usrCntlHomepage.resx">
<DependentUpon>usrCntlHomepage.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="My Project\licenses.licx" />
<EmbeddedResource Include="My Project\Resources.resx">
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
<CustomToolNamespace>My.Resources</CustomToolNamespace>

View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="ADMIN.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="ADMIN.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<connectionStrings>
<add name="ADMIN.My.MySettings.connToUID" connectionString="Data Source=DEVELOPER\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956" providerName="System.Data.SqlClient"/>
<add name="ADMIN.My.MySettings.connToAdminDEV" connectionString="Data Source=DEVELOPER\DEVSQL;Initial Catalog=ADMIN;Persist Security Info=True;User ID=sa;Password=BmWr501956" providerName="System.Data.SqlClient"/>
<add name="ADMIN.My.MySettings.connToUID" connectionString="Data Source=DEVELOPER\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956" providerName="System.Data.SqlClient" />
<add name="ADMIN.My.MySettings.connToAdminDEV" connectionString="Data Source=DEVELOPER\DEVSQL;Initial Catalog=ADMIN;Persist Security Info=True;User ID=sa;Password=BmWr501956" providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
</startup>
<userSettings>
<ADMIN.My.MySettings>
@@ -20,4 +20,43 @@
</ADMIN.My.MySettings>
</userSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -316,6 +316,15 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
'''</summary>
Friend ReadOnly Property fähggh3j2gh6j2gh62jgh6j2hg6jghjghj() As String
Get
Return ResourceManager.GetString("fähggh3j2gh6j2gh62jgh6j2hg6jghjghj", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

View File

@@ -301,4 +301,7 @@
<data name="personGray_w" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="fähggh3j2gh6j2gh62jgh6j2hg6jghjghj" xml:space="preserve">
<value />
</data>
</root>

View File

@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase

View File

@@ -7,7 +7,7 @@
</Setting>
<Setting Name="connToUID" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=DEVELOPER\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
@@ -15,7 +15,7 @@
</Setting>
<Setting Name="connToAdminDEV" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=DEVELOPER\DEVSQL;Initial Catalog=ADMIN;Persist Security Info=True;User ID=sa;Password=BmWr501956&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>

View File

@@ -1,4 +0,0 @@
GrapeCity.ActiveReports.Export.Excel.Section.XlsExport, GrapeCity.ActiveReports.Export.Excel.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport, GrapeCity.ActiveReports.Export.Pdf.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12, Version=12.2.13986.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff

View File

@@ -1,4 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Gcef.Data.DataEngine" version="3.0.2" targetFramework="net47" />
<package id="Gcef.Data.ExpressionInfo" version="3.0.2" targetFramework="net47" />
<package id="Gcef.Data.VBFunctionLib" version="3.0.2" targetFramework="net47" />
<package id="GrapeCity.ActiveReports" version="15.2.4" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Chart" version="15.2.2" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Core.DataProviders" version="2.0.7" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Core.Document" version="2.1.4" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Core.Document.Drawing.Gc" version="2.1.4" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Core.Document.Drawing.Gdi" version="2.1.4" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Core.Drawing.Gc" version="2.3.5" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Core.Drawing.Gdi" version="2.3.5" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Core.Rdl" version="2.3.5" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Core.Rendering" version="2.3.5" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Core.Scripting" version="2.3.5" targetFramework="net47" />
<package id="GrapeCity.ActiveReports.Document" version="15.2.4" targetFramework="net47" />
<package id="GrapeCity.DataVisualization.Chart" version="0.4.23" targetFramework="net47" />
<package id="GrapeCity.Documents.Common" version="4.2.0.722" targetFramework="net47" />
<package id="GrapeCity.Documents.Common.Windows" version="4.2.0.722" targetFramework="net47" />
<package id="GrapeCity.Documents.DX.Windows" version="4.2.0.722" targetFramework="net47" />
<package id="GrapeCity.Documents.Imaging" version="4.2.0.722" targetFramework="net47" />
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net40-Client" requireReinstallation="True" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net47" />
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net47" />
<package id="System.Buffers" version="4.5.1" targetFramework="net47" />
<package id="System.Memory" version="4.5.4" targetFramework="net47" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net47" />
<package id="System.Text.Encodings.Web" version="5.0.1" targetFramework="net47" />
<package id="System.Text.Json" version="5.0.2" targetFramework="net47" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net47" />
</packages>

View File

@@ -108,6 +108,7 @@ Partial Class usrctlProcedures
Me.CheckBox5 = New System.Windows.Forms.CheckBox()
Me.Button29 = New System.Windows.Forms.Button()
Me.Button28 = New System.Windows.Forms.Button()
Me.Button30 = New System.Windows.Forms.Button()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -913,10 +914,20 @@ Partial Class usrctlProcedures
Me.Button28.Text = "SYSKA OP"
Me.Button28.UseVisualStyleBackColor = True
'
'Button30
'
Me.Button30.Location = New System.Drawing.Point(579, 179)
Me.Button30.Name = "Button30"
Me.Button30.Size = New System.Drawing.Size(145, 49)
Me.Button30.TabIndex = 60
Me.Button30.Text = "GOOGLE"
Me.Button30.UseVisualStyleBackColor = True
'
'usrctlProcedures
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.Button30)
Me.Controls.Add(Me.Button28)
Me.Controls.Add(Me.Label15)
Me.Controls.Add(Me.CheckBox5)
@@ -1064,4 +1075,5 @@ Partial Class usrctlProcedures
Friend WithEvents CheckBox5 As CheckBox
Friend WithEvents Button29 As Button
Friend WithEvents Button28 As Button
Friend WithEvents Button30 As Button
End Class

View File

@@ -3255,6 +3255,10 @@ Public Class usrctlProcedures
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
End Sub
Private Sub Button30_Click(sender As Object, e As EventArgs) Handles Button30.Click
VERAG_PROG_ALLGEMEIN.cGoogleAPI.test()
End Sub
'Private Sub Button26_Click(sender As Object, e As EventArgs)
' For Each d In System.IO.Directory.GetDirectories("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019")
' Dim fi As New FileInfo(d)

View File

@@ -275,7 +275,7 @@ Public Class frmStartOptions
For Each row In dt.Rows
Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"))
If Not cDHF_Anhaenge.hasEntry Then
If Not cDHF_Anhaenge.hasEntry Then 'WENN NEU::
cDHF_Anhaenge.AnmID = row("AnmID")
cDHF_Anhaenge.LizenzNr = row("LizenzNr")
@@ -318,11 +318,16 @@ Public Class frmStartOptions
cDHF_Anhaenge.SAVE()
Select Case row("MsgTyp")
Case "EZ922" : DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA")
Case "TR109" : DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS")
Case "EZ922"
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA") 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
sql.doSQL("Update Speditionsbuch SET [DokumentId_Steuerbeleg]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_Steuerbeleg] is null", "FMZOLL")
Case "TR109"
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS") 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
sql.doSQL("Update Speditionsbuch SET [DokumentId_VBD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_VBD] is null", "FMZOLL")
' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME
cVERAG_out_ncts.copyFileFTP_VERAGncts_EZOLL(cDHF_Anhaenge.AnmID)
Case "EZ923" 'Ergänzung STB - Mitteilung
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA") 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
sql.doSQL("Update Speditionsbuch SET DokumentId_Mitteilung='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_Mitteilung is null", "FMZOLL")
End Select
@@ -362,11 +367,11 @@ Public Class frmStartOptions
If dy_SendungsId IsNot Nothing AndAlso CInt(dy_SendungsId) > 0 Then
Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(dy_SendungsId)
Dim list As New List(Of Integer)
sendMailZollbeleg(pfad, SND.tblSnd_EmpfaengerKdNr, art, list, BezugsNr, SND)
sendMailZollbeleg(pfad, SND.tblSnd_AbsenderKdNr, art, list, BezugsNr, SND)
sendMailZollbeleg(pfad, SND.tblSnd_FrachtfuehrerKdNr, art, list, BezugsNr, SND)
sendMailZollbeleg(pfad, SND.tblSnd_AvisiererKdNr, art, list, BezugsNr, SND)
sendMailZollbeleg(pfad, SND.tblSnd_AuftraggeberKdNr, art, list, BezugsNr, SND)
sendMailZollbeleg(pfad, SND.tblSnd_EmpfaengerKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("EMPFAENGER"))
sendMailZollbeleg(pfad, SND.tblSnd_AbsenderKdNr, art, list, BezugsNr, SND, "")
sendMailZollbeleg(pfad, SND.tblSnd_FrachtfuehrerKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("FRAECHTER"))
sendMailZollbeleg(pfad, SND.tblSnd_AvisiererKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("AVISIERER"))
sendMailZollbeleg(pfad, SND.tblSnd_AuftraggeberKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("AUFTRAGGEBER"))
End If
Catch ex As Exception
@@ -374,6 +379,10 @@ Public Class frmStartOptions
End Try
End Sub
'Sub doMailZollbelegTC(pfad, art, tc_id)
' Try
@@ -395,7 +404,7 @@ Public Class frmStartOptions
' End Try
'End Sub
Sub sendMailZollbeleg(pfad As String, KundenNr As Integer, art As String, ByRef list As List(Of Integer), BezugsNr As String, SND As VERAG_PROG_ALLGEMEIN.cSendungen)
Sub sendMailZollbeleg(pfad As String, KundenNr As Integer, art As String, ByRef list As List(Of Integer), BezugsNr As String, SND As VERAG_PROG_ALLGEMEIN.cSendungen, KdAtrNr As Object)
Try
If KundenNr > 0 Then
If Not list.Exists(Function(x) x = KundenNr) Then 'nicht bereits verarbeitet
@@ -440,6 +449,7 @@ Public Class frmStartOptions
betreff = betreff.Replace("%LKW%", "")
betreff = betreff.Replace("%Standort%", "")
betreff = betreff.Replace("%Uhrzeit%", "")
betreff = betreff.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, ""))
Dim body = cStandort.eMail_Zollbeleg_Text
@@ -950,7 +960,6 @@ Public Class frmStartOptions
Else ' STB !!!!
betreff = sp(0).Trim