edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-11-02 10:08:14 +01:00
parent c398eb7001 63aed0a891
commit 7b360a3124
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/Formulare/KDFormulare/FormulareBaukasten/frmVorauskasse_FremdwaehrungBerechnen.vb
View File

@@ -49,7 +49,7 @@
Dim rg_Umrechnung As Double = 1 Dim rg_Umrechnung As Double = 1
Dim euro As Double = txtWarenwert._value Dim euro As Double = txtWarenwert._value
If cboWaehrung._value <> "EUR" Then If cboWaehrung._value <> "EUR" Then
Dim kurs = CDbl(SQL.getValueTxtBySql("SELECT TOP 1 isnull([fw_kurswert] ,0) FROM [tblZOLL_Wechselkurse] where fw_iso3='" & cboWaehrung._value & "' ORDER BY fw_startdatum DESC", "FMZOLL")) Dim kurs = CDbl(SQL.getValueTxtBySql("SELECT TOP 1 isnull([fw_kurswert] ,0) FROM [tblZOLL_Wechselkurse] where fw_iso3='" & cboWaehrung._value & "' ORDER BY fw_startdatum DESC, fw_importdatum DESC", "FMZOLL"))
If IsNumeric(kurs) AndAlso kurs > 0 Then If IsNumeric(kurs) AndAlso kurs > 0 Then
euro = CDbl(txtWarenwert._value / kurs) euro = CDbl(txtWarenwert._value / kurs)
rg_Umrechnung /= kurs rg_Umrechnung /= kurs
@@ -58,7 +58,7 @@
Dim umrechnung As Double = euro Dim umrechnung As Double = euro
If cboWaehrungUmrechnung._value <> "EUR" Then If cboWaehrungUmrechnung._value <> "EUR" Then
Dim kurs_Umrechnung = CDbl(SQL.getValueTxtBySql("SELECT TOP 1 isnull([fw_kurswert] ,0) FROM [tblZOLL_Wechselkurse] where fw_iso3='" & cboWaehrungUmrechnung._value & "' ORDER BY fw_startdatum DESC", "FMZOLL")) Dim kurs_Umrechnung = CDbl(SQL.getValueTxtBySql("SELECT TOP 1 isnull([fw_kurswert] ,0) FROM [tblZOLL_Wechselkurse] where fw_iso3='" & cboWaehrungUmrechnung._value & "' ORDER BY fw_startdatum DESC, fw_importdatum DESC", "FMZOLL"))
umrechnung = CDbl(euro * kurs_Umrechnung) umrechnung = CDbl(euro * kurs_Umrechnung)
rg_Umrechnung *= kurs_Umrechnung rg_Umrechnung *= kurs_Umrechnung
End If End If

4
VERAG_PROG_ALLGEMEIN/Classes/cFremdwaehrungskurse.vb
View File

@@ -40,7 +40,7 @@ Public Class cFremdwaehrungskurse
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblZOLL_Wechselkurse WITH(updlock,serializable) WHERE fw_id=@fw_id AND fw_startdatum=@fw_startdatum AND fw_enddatum=@fw_enddatum ) " & Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblZOLL_Wechselkurse WITH(updlock,serializable) WHERE fw_iso2=@fw_iso2 AND fw_startdatum=@fw_startdatum AND fw_enddatum=@fw_enddatum AND fw_kurswert=@fw_kurswert) " &
" BEGIN " & getUpdateCmd() & " END " & " BEGIN " & getUpdateCmd() & " END " &
" Else " & " Else " &
" BEGIN " & getInsertCmd() & " END " & " BEGIN " & getInsertCmd() & " END " &
@@ -63,7 +63,7 @@ Public Class cFremdwaehrungskurse
End If End If
Next Next
str = str.Substring(0, str.Length - 1) 'wg. ',' str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE [tblZOLL_Wechselkurse] SET " & str & " WHERE fw_id=@fw_id AND fw_startdatum=@fw_startdatum AND fw_enddatum=@fw_enddatum") Return (" UPDATE [tblZOLL_Wechselkurse] SET " & str & " WHERE fw_iso2=@fw_iso2 AND fw_startdatum=@fw_startdatum AND fw_enddatum=@fw_enddatum AND fw_kurswert=@fw_kurswert")
Catch ex As Exception Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)