From de4b2891b16633b823eacdb9db247ae7d5512b97 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 2 Nov 2023 09:31:51 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Fremdw=C3=A4hrungskurse,=20import=20umgebau?= =?UTF-8?q?t,=20damit=20nicht=20idente=20Kures=20(Kurswert,=20Kursstartdat?= =?UTF-8?q?um,=20Kursendatum=20und=20ISO2Code=20mit=20unterschiedlichen=20?= =?UTF-8?q?IDs)=20importiert=20werden.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERAG_PROG_ALLGEMEIN/Classes/cFremdwaehrungskurse.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cFremdwaehrungskurse.vb b/VERAG_PROG_ALLGEMEIN/Classes/cFremdwaehrungskurse.vb index 6fab3ea0..ba5fca5d 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cFremdwaehrungskurse.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cFremdwaehrungskurse.vb @@ -40,7 +40,7 @@ Public Class cFremdwaehrungskurse 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 " & " Else " & " BEGIN " & getInsertCmd() & " END " & @@ -63,7 +63,7 @@ Public Class cFremdwaehrungskurse End If Next 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 MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) From 4106abe754fdf898dfd5bc000fb04699d913c90b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 2 Nov 2023 09:45:29 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Fremdw=C3=A4hrungsrechner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frmVorauskasse_FremdwaehrungBerechnen.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/frmVorauskasse_FremdwaehrungBerechnen.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/frmVorauskasse_FremdwaehrungBerechnen.vb index 50ab1d19..69fd8de2 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/frmVorauskasse_FremdwaehrungBerechnen.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/frmVorauskasse_FremdwaehrungBerechnen.vb @@ -49,7 +49,7 @@ Dim rg_Umrechnung As Double = 1 Dim euro As Double = txtWarenwert._value 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 euro = CDbl(txtWarenwert._value / kurs) rg_Umrechnung /= kurs @@ -58,7 +58,7 @@ Dim umrechnung As Double = euro 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) rg_Umrechnung *= kurs_Umrechnung End If