diff --git a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb index d2860fdc..62c9cedc 100644 --- a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb +++ b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb @@ -1,6 +1,4 @@ -Imports System.IO - -Public Class usrCntlAuswertungenEV_Veranlagungen +Public Class usrCntlAuswertungenEV_Veranlagungen @@ -156,10 +154,13 @@ Public Class usrCntlAuswertungenEV_Veranlagungen End If 'Handelsrechnungen + Dim dtRg = SQL.DLookupArray("distinct(DRef)", "[zsAnmGdsItemDocCerts] As DOC inner join zsAnmRefs As ANM On ANM.LizenzNr=DOC.LizenzNr And ANM.OperatorID=DOC.OperatorID And ANM.AnmID=DOC.AnmID", "(LRN = '" & BezugsNr & "') and DocCd IN ('N380','N325')", EZOLL_SQLSRV, "DRef") - For Each rg In dtRg - handelsrechnungen &= semi & rg : semi = "," - Next + For Each rg In dtRg + handelsrechnungen &= semi & rg : semi = "," + Next + + End Select diff --git a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb index 651d6f57..ecd25ee8 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb @@ -691,7 +691,10 @@ Public Class SQL If dt IsNot Nothing Then For Each r As DataRow In dt.Rows - list.Add(r(srchFieldClearName)) + If Not IsDBNull(r(srchFieldClearName)) Then + list.Add(r(srchFieldClearName)) + End If + Next End If Return list diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 092b4dca..51b4fd13 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -81,7 +81,6 @@ Public Class cMDMFunctionsAllgemein Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - Return False End Try diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index 7660c098..30b60385 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -105,7 +105,7 @@ Public Class cMSEAPI rest.AddHeader("X-API-Key", jwt) - rest.IdleTimeoutMs = 1000000 + rest.IdleTimeoutMs = 30000 Dim responseJson As String = rest.FullRequestNoBody("GET", "/v1/transactions/new") If (rest.LastMethodSuccess <> True) Then