gesamtsicherheiten, etc.

This commit is contained in:
2026-03-31 14:13:17 +02:00
parent ee2f39d9a8
commit 457265b739
6 changed files with 586 additions and 534 deletions

View File

@@ -195,6 +195,9 @@
<Reference Include="EAGetMail, Version=5.3.5.0, Culture=neutral, PublicKeyToken=e10a0812eb29cf94, processorArchitecture=MSIL"> <Reference Include="EAGetMail, Version=5.3.5.0, Culture=neutral, PublicKeyToken=e10a0812eb29cf94, processorArchitecture=MSIL">
<HintPath>..\packages\EAGetMail.5.3.5\lib\net461\EAGetMail.dll</HintPath> <HintPath>..\packages\EAGetMail.5.3.5\lib\net461\EAGetMail.dll</HintPath>
</Reference> </Reference>
<Reference Include="fiskaltrust.interface, Version=1.3.45.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\fiskaltrust.interface.1.3.45\lib\net461\fiskaltrust.interface.dll</HintPath>
</Reference>
<Reference Include="Gemeinsames"> <Reference Include="Gemeinsames">
<HintPath>..\Gemeinsames\bin\Debug\Gemeinsames.dll</HintPath> <HintPath>..\Gemeinsames\bin\Debug\Gemeinsames.dll</HintPath>
</Reference> </Reference>
@@ -455,6 +458,9 @@
<Reference Include="System.DirectoryServices" /> <Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Drawing.Design" /> <Reference Include="System.Drawing.Design" />
<Reference Include="System.Interactive.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll</HintPath>
</Reference>
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath> <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@@ -468,6 +474,9 @@
<Reference Include="System.IO.Packaging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.IO.Packaging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll</HintPath> <HintPath>..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Linq.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll</HintPath>
</Reference>
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> <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> <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
@@ -489,6 +498,7 @@
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <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> <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Formatters.Soap" /> <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -514,6 +524,8 @@
<Private>True</Private> <Private>True</Private>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath> <HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
</Reference> </Reference>

File diff suppressed because it is too large Load Diff

View File

@@ -241,7 +241,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYBJREFUOE9jYKAAyLnI 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYBJREFUOE9jYKAAyLnI
BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow
@@ -298,7 +298,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYBJREFUOE9jYKAAyLnI 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDAAACwwBP0AiyAAAAYBJREFUOE9jYKAAyLnI
BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb BQX2BrZJSkqiS5EGGFkYmUP2hCyLvxT/H4QdpzqmcUlyMaGrIxoE7wyeDzMMhmMuxOSzC7CzoqslCqAb
Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u Bjf0fEwYulqCIGhb0D10g+Iuxr0X1Rc1QVdLELjMcNmBxbAVyn7KUuhqCQKzSrNJ6IZFHY/aph2nzY+u
lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow lihgVoFqYNCWoMt80nzoyogDGhEa2ciGxZyN+YmuBgMo+yrHxV6InS7nIieMLC5pKemK7lWj6UY8yGow

View File

@@ -730,7 +730,7 @@ Public Class frmGesamtsicherheitenNEU
End Select End Select
End Sub End Sub
Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosTime.KeyPress, txtSicherheitTime.KeyPress, txtUhrzeitaendern.KeyPress Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosTime.KeyPress, txtSicherheitTime.KeyPress, txtUhrzeitaendern.KeyPress, txtAnzahl.KeyPress
Select Case Asc(e.KeyChar) Select Case Asc(e.KeyChar)
Case 48 To 57, 8, 44, 46, 58 Case 48 To 57, 8, 44, 46, 58
'Case 48 To 57, 8, 44, 46, 58, 160, 188, 110, 111, 190, 226 'Case 48 To 57, 8, 44, 46, 58, 160, 188, 110, 111, 190, 226
@@ -802,12 +802,15 @@ Public Class frmGesamtsicherheitenNEU
attachPosNrToExistingATB = False attachPosNrToExistingATB = False
Dim warenwert As Double Dim warenwert As Double
Dim sicherheitsbetrag As Double Dim sicherheitsbetrag As Double
Dim AnzahlEH As Integer
If count > 1 Then If count > 1 Then
warenwert = 0 warenwert = 0
sicherheitsbetrag = 0 sicherheitsbetrag = 0
AnzahlEH = 0
Else Else
warenwert = Double.Parse(txtSicherheitWarenwert.Text) warenwert = Double.Parse(txtSicherheitWarenwert.Text)
sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text) sicherheitsbetrag = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
AnzahlEH = Integer.Parse(setNullToZero(txtAnzahl.Text))
End If End If
Dim OPEN As New cSicherheiten() Dim OPEN As New cSicherheiten()
@@ -829,6 +832,7 @@ Public Class frmGesamtsicherheitenNEU
.gs_atr = setNullToZero(cboSicherheitATR.SelectedItem) .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
.gs_zollsatz = Me.Zollsatz .gs_zollsatz = Me.Zollsatz
.gs_avisoId = Me.avisoID .gs_avisoId = Me.avisoID
.gs_EH_Anzahl = AnzahlEH
setEnviromentDataToObject(OPEN, Me) setEnviromentDataToObject(OPEN, Me)
End With End With
@@ -934,6 +938,7 @@ Public Class frmGesamtsicherheitenNEU
.gs_atr = setNullToZero(cboSicherheitATR.SelectedItem) .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
.gs_zollsatz = Me.Zollsatz .gs_zollsatz = Me.Zollsatz
.gs_avisoId = Me.avisoID .gs_avisoId = Me.avisoID
.gs_EH_Anzahl = Integer.Parse(setNullToZero(txtAnzahl.Text))
setEnviromentDataToObject(OPEN, Me) setEnviromentDataToObject(OPEN, Me)
End With End With
@@ -1119,6 +1124,7 @@ Public Class frmGesamtsicherheitenNEU
cboSicherheitATR.SelectedItem = Sicherh.gs_atr cboSicherheitATR.SelectedItem = Sicherh.gs_atr
txtSicherheitDat.Text = Sicherh.gs_datum.ToString("dd.MM.yyyy") txtSicherheitDat.Text = Sicherh.gs_datum.ToString("dd.MM.yyyy")
txtSicherheitTime.Text = Sicherh.gs_datum.ToString("HH:mm") txtSicherheitTime.Text = Sicherh.gs_datum.ToString("HH:mm")
txtAnzahl.Text = Sicherh.gs_EH_Anzahl
currentSicherheit = Sicherh currentSicherheit = Sicherh
txtAnzahlPos.Enabled = False txtAnzahlPos.Enabled = False
@@ -1160,7 +1166,7 @@ Public Class frmGesamtsicherheitenNEU
.gs_gsNr = Me.gessicherheitID .gs_gsNr = Me.gessicherheitID
'.MakeDate = Me.MakeDate '.MakeDate = Me.MakeDate
.gs_freitext = Me.txtSicherheitFreitext.Text .gs_freitext = Me.txtSicherheitFreitext.Text
'.saldo = currentGesSichRef.Saldo .gs_EH_Anzahl = Integer.Parse(setNullToZero(txtAnzahl.Text))
.gs_atr = setNullToZero(cboSicherheitATR.SelectedItem) .gs_atr = setNullToZero(cboSicherheitATR.SelectedItem)
End With End With

View File

@@ -10,6 +10,7 @@
<package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net47" /> <package id="DocumentFormat.OpenXml" version="2.7.2" targetFramework="net47" />
<package id="EAGetMail" version="5.3.5" targetFramework="net47" requireReinstallation="true" /> <package id="EAGetMail" version="5.3.5" targetFramework="net47" requireReinstallation="true" />
<package id="esendex-dotnet-sdk" version="3.8.0" targetFramework="net47" /> <package id="esendex-dotnet-sdk" version="3.8.0" targetFramework="net47" />
<package id="fiskaltrust.interface" version="1.3.45" targetFramework="net48" />
<package id="GrapeCity.Documents.Common" version="2.2.0.315" targetFramework="net461" /> <package id="GrapeCity.Documents.Common" version="2.2.0.315" targetFramework="net461" />
<package id="GrapeCity.Documents.Imaging" version="2.2.0.315" targetFramework="net461" /> <package id="GrapeCity.Documents.Imaging" version="2.2.0.315" targetFramework="net461" />
<package id="GrapeCity.Documents.Pdf" version="2.2.0.315" targetFramework="net461" /> <package id="GrapeCity.Documents.Pdf" version="2.2.0.315" targetFramework="net461" />
@@ -22,9 +23,11 @@
<package id="Portable.BouncyCastle" version="1.8.5" targetFramework="net47" /> <package id="Portable.BouncyCastle" version="1.8.5" targetFramework="net47" />
<package id="Spire.PDFViewer" version="4.9.5" targetFramework="net47" /> <package id="Spire.PDFViewer" version="4.9.5" targetFramework="net47" />
<package id="System.Buffers" version="4.6.1" targetFramework="net48" /> <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
<package id="System.Interactive.Async" version="4.0.0" targetFramework="net48" />
<package id="System.IO" version="4.3.0" 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.FileSystem.Primitives" version="4.0.1" targetFramework="net47" />
<package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" /> <package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" />
<package id="System.Linq.Async" version="4.0.0" targetFramework="net48" />
<package id="System.Memory" version="4.6.3" targetFramework="net48" /> <package id="System.Memory" version="4.6.3" targetFramework="net48" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net48" /> <package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" /> <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />

View File

@@ -47,8 +47,14 @@ Public Class usrCntlSND_ATBGestellung
If (SND.tblSnd_WarenwertWaehrung) Is Nothing Then MsgBox("Währungseinheit angeben!") : Exit Sub If (SND.tblSnd_WarenwertWaehrung) Is Nothing Then MsgBox("Währungseinheit angeben!") : Exit Sub
If SND.tblSnd_WarenwertWaehrung <> "EUR" Then If SND.tblSnd_WarenwertWaehrung <> "EUR" Then
Dim kurs As New cEZB_Waehrungskurse(SND.tblSnd_WarenwertWaehrung) Dim kurs As New cFremdwaehrungskurse(SND.tblSnd_WarenwertWaehrung)
If kurs.hasEntry Then
WarenwertEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(SND.tblSnd_Warenwert, SND.tblSnd_WarenwertWaehrung, CDate(Today)), 2) WarenwertEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(SND.tblSnd_Warenwert, SND.tblSnd_WarenwertWaehrung, CDate(Today)), 2)
Else
MsgBox("Umrechnungskurs kann nicht ermittelt werden, bitte EUR-Betrag eingeben!")
Exit Sub
End If
Else Else
WarenwertEUR = SND.tblSnd_Warenwert WarenwertEUR = SND.tblSnd_Warenwert
End If End If