From f41c40a72dc52db60e8ec94cca515a7ba3e88ad9 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 23 Oct 2024 16:08:22 +0200 Subject: [PATCH] Bugfic Veranlagungen --- SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb | 3 ++- VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb index 62c9cedc..7edb94ce 100644 --- a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb +++ b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb @@ -131,8 +131,9 @@ Select Case r("FilialenNr") Case "5501" 'EUST + Dim where = " and telnam_aktuellsteNachricht = 1" 'only latest status Dim dtEUST = SQL.loadDgvBySql(" select sum(base) Base,sum(Amnt)Amnt FROM tblTelotec_Anmeldung as TC inner join tblTelotec_PositionsdatenAbgaben as AGB on AGB.telposAbg_telanmId=TC.telanm_id - where Ty IN ('5EV') and tc.telanm_BezugsNr LIKE '" & BezugsNr & "' AND telanm_Status between 50 and 60", "FMZOLL") + where Ty IN ('5EV') and tc.telanm_BezugsNr LIKE '" & BezugsNr & "' AND telanm_Status between 50 and 60 " & where, "FMZOLL") If dtEUST IsNot Nothing AndAlso dtEUST.Rows.Count >= 0 Then If dtEUST(0)("Base") IsNot DBNull.Value Then EUST_Basis = dtEUST(0)("Base") If dtEUST(0)("Amnt") IsNot DBNull.Value Then EUST_5EV = dtEUST(0)("Amnt") diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index 30b60385..6b2ab604 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -58,8 +58,8 @@ Public Class cMSEAPI Dim curDateTime As Integer = jwt.GenNumericDate(0) ' Set the timestamp defining an expiration time (end time) for the token - ' to be now + 1 hour (3600 seconds) - success = claims.AddIntAt(-1, "exp", curDateTime + 1000) + ' to be now + 10 MIN (600 seconds) + success = claims.AddIntAt(-1, "exp", curDateTime + 600) jwt.AutoCompact = True @@ -105,7 +105,7 @@ Public Class cMSEAPI rest.AddHeader("X-API-Key", jwt) - rest.IdleTimeoutMs = 30000 + rest.IdleTimeoutMs = 1000000 Dim responseJson As String = rest.FullRequestNoBody("GET", "/v1/transactions/new") If (rest.LastMethodSuccess <> True) Then