Compare commits
2 Commits
c1c284223f
...
47a8904c31
| Author | SHA1 | Date | |
|---|---|---|---|
| 47a8904c31 | |||
| 30e5288af8 |
@@ -69,19 +69,19 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
|
||||
</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" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.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" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props" Condition="Exists('..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props')" />
|
||||
<Import Project="..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props')" />
|
||||
<Import Project="..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.props')" />
|
||||
<Import Project="..\packages\cef.redist.x86.75.1.14\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.75.1.14\build\cef.redist.x86.props')" />
|
||||
@@ -171,6 +172,9 @@
|
||||
<Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Confluent.Kafka, Version=2.11.1.0, Culture=neutral, PublicKeyToken=12c514ca49093d1e, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Confluent.Kafka.2.11.1\lib\net462\Confluent.Kafka.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DocumentFormat.OpenXml, Version=2.7.2.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -440,8 +444,8 @@
|
||||
<HintPath>F:\PROGRAMMIERUNG\dll\Spire.PDF\Spire.PdfViewer.Forms.dll</HintPath>
|
||||
</Reference>
|
||||
<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 Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Configuration" />
|
||||
@@ -465,8 +469,8 @@
|
||||
<HintPath>..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
|
||||
<Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
|
||||
@@ -474,16 +478,16 @@
|
||||
<Private>True</Private>
|
||||
</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 Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
|
||||
<Reference Include="System.Security" />
|
||||
@@ -2062,6 +2066,7 @@
|
||||
<Error Condition="!Exists('..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.props'))" />
|
||||
<Error Condition="!Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\librdkafka.redist.2.11.1\build\librdkafka.redist.props'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.75.1.143\build\CefSharp.Common.targets')" />
|
||||
<Import Project="..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.75.1.143\build\CefSharp.WinForms.targets')" />
|
||||
|
||||
@@ -1536,7 +1536,7 @@ Public Class frmSendungsdetailsNEU
|
||||
Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42
|
||||
If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then
|
||||
usrcntl_NCTS.NCTS_GA = New cNCTSGestellungsadressen(SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId)
|
||||
usrcntl_NCTS.setValues()
|
||||
usrcntl_NCTS.setValues(False)
|
||||
End If
|
||||
'trotzdem überschreiben:
|
||||
usrcntl_NCTS.txtT1Verzollungsadresse.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSVerzollungsadresse, "")
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
<package id="CefSharp.WinForms" version="75.1.143" targetFramework="net47" />
|
||||
<package id="Common.Logging" version="3.4.1" targetFramework="net47" />
|
||||
<package id="Common.Logging.Core" version="3.4.1" targetFramework="net47" />
|
||||
<package id="Confluent.Kafka" version="2.11.1" targetFramework="net48" />
|
||||
<package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net47" />
|
||||
<package id="EAGetMail" version="5.3.5" targetFramework="net47" requireReinstallation="true" />
|
||||
<package id="esendex-dotnet-sdk" version="3.8.0" targetFramework="net47" />
|
||||
@@ -14,20 +15,21 @@
|
||||
<package id="GrapeCity.Documents.Pdf" version="2.2.0.315" targetFramework="net461" />
|
||||
<package id="GroupDocs.Viewer" version="19.8.0" targetFramework="net461" />
|
||||
<package id="itext7" version="7.1.11" targetFramework="net47" />
|
||||
<package id="librdkafka.redist" version="2.11.1" targetFramework="net48" />
|
||||
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net47" />
|
||||
<package id="Microsoft.CSharp" version="4.0.1" targetFramework="net47" />
|
||||
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net47" />
|
||||
<package id="Portable.BouncyCastle" version="1.8.5" targetFramework="net47" />
|
||||
<package id="Spire.PDFViewer" version="4.9.5" targetFramework="net47" />
|
||||
<package id="System.Buffers" version="4.5.1" targetFramework="net47" />
|
||||
<package id="System.Buffers" version="4.6.1" targetFramework="net48" />
|
||||
<package id="System.IO" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net47" />
|
||||
<package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" />
|
||||
<package id="System.Memory" version="4.5.5" targetFramework="net47" />
|
||||
<package id="System.Memory" version="4.6.3" targetFramework="net48" />
|
||||
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
|
||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
|
||||
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
|
||||
<package id="System.Runtime" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net47" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
|
||||
<package id="System.Security.Cryptography.Pkcs" version="8.0.0" targetFramework="net47" />
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
End Sub
|
||||
|
||||
|
||||
Public Sub setValues()
|
||||
Public Sub setValues(customsOfficeSet)
|
||||
txtT1Verzollungsadresse.Text = If(NCTS_GA.nga_name, "")
|
||||
txtT1VerzollungsadresseStrasse.Text = If(NCTS_GA.nga_strasse, "")
|
||||
txtT1VerzollungsadressePlz.Text = If(NCTS_GA.nga_plz, "")
|
||||
@@ -34,8 +34,9 @@
|
||||
txtT1VerzollungsadresseEORI.Text = If(NCTS_GA.nga_EORI, "")
|
||||
txtT1VerzollungsadresseEORI_NL.Text = If(NCTS_GA.nga_EORI_NL, "")
|
||||
txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(If(NCTS_GA.nga_bestZollst, ""))
|
||||
txtT1VerzollungsadresseATANr.Text = If(NCTS_GA.nga_ATANr, "")
|
||||
|
||||
'If Not customsOfficeSet Then
|
||||
' txtT1VerzollungsadresseATANr.Text = If(NCTS_GA.nga_ATANr, "")
|
||||
' End If
|
||||
|
||||
lblNGAId.Text = If(NCTS_GA.nga_id > 0, NCTS_GA.nga_id, "-")
|
||||
picDel.Visible = (NCTS_GA.nga_id > 0)
|
||||
@@ -53,7 +54,7 @@
|
||||
NCTS_GA.nga_EORI = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI.Text)
|
||||
NCTS_GA.nga_EORI_NL = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI_NL.Text)
|
||||
NCTS_GA.nga_bestZollst = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseBestimmungszollstelle._value)
|
||||
NCTS_GA.nga_ATANr = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseATANr.Text)
|
||||
' NCTS_GA.nga_ATANr = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseATANr.Text)
|
||||
End Sub
|
||||
|
||||
Private Sub LinkLabel4_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel4.LinkClicked
|
||||
@@ -84,7 +85,7 @@
|
||||
|
||||
Private Sub usrCntlSND_NCTSGestellungsadresse_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
If NCTS_GA Is Nothing Then : NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
|
||||
Else : setValues() : End If
|
||||
Else : setValues(False) : End If
|
||||
|
||||
|
||||
' txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"})
|
||||
@@ -97,7 +98,7 @@
|
||||
|
||||
Sub reset()
|
||||
NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
|
||||
setValues()
|
||||
setValues(False)
|
||||
End Sub
|
||||
|
||||
Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
|
||||
@@ -116,7 +117,7 @@
|
||||
Private Sub txtT1Verzollungsadresse_VALUE_CHANGED() Handles txtT1Verzollungsadresse.VALUE_CHANGED
|
||||
If txtT1Verzollungsadresse._value <> "" Then
|
||||
NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen(txtT1Verzollungsadresse._value)
|
||||
setValues()
|
||||
setValues(True)
|
||||
End If
|
||||
|
||||
End Sub
|
||||
@@ -129,7 +130,7 @@
|
||||
If vbYes = MsgBox("Möchten Sie die NCTS-Gestellungsadresse wirklich löschen?", vbYesNoCancel + MsgBoxStyle.DefaultButton2) Then
|
||||
NCTS_GA.DELETE()
|
||||
NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen
|
||||
setValues()
|
||||
setValues(False)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
Reference in New Issue
Block a user