Merge

2023-09-01 11:12:00 +02:00
parent d64fe1c04e 6cdca15d8f
commit 0e57aa03f5
8 changed files with 425 additions and 329 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
@@ -62,6 +62,32 @@ Public Class SQL
        End If


+    End Function
+
+
+
+    Public Shared Function GetAsfinagConnectionString() As String
+        'Properties.Settings.Default.
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+            Try
+                Return My.MySettings.Default.AsfinagConnectionString
+            Catch ex As Exception
+                'Return "Data Source=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;"
+                Return "Data Source=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
+            End Try
+
+
+        Else
+            Try
+                Return My.MySettings.Default.AsfinagConnectionString 'nach Prod-Start austauschen!
+            Catch ex As Exception
+                ' Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
+                Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
+            End Try
+        End If
+
+
    End Function
    Public Shared Function GetWEBConnectionString() As String
        'Properties.Settings.Default.
@@ -90,6 +116,19 @@ Public Class SQL
        End If
    End Function

+    Public Shared Function GetAsfinagConnectionString(TESTSYSTEM) As String
+        If TESTSYSTEM Then
+            Return My.MySettings.Default.AsfinagConnectionString()
+        Else
+            Try
+                Return My.MySettings.Default.FMZOLL_PRODConnectionString
+            Catch ex As Exception
+                '   Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
+                Return "Data Source=192.168.0.91\Asfinag;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
+            End Try
+        End If
+    End Function
+
    Public Shared Function GetFDConnectionString() As String
        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
            Return My.MySettings.Default.FDConnectionString
@@ -226,6 +265,19 @@ Public Class SQL
        End Try
        Return Nothing

+    End Function
+
+    Public Shared Function GetNewOpenConnectionAsfinag(Optional pooling As Boolean = True) As SqlConnection
+        Dim cn As New SqlConnection()
+        Try
+            cn.ConnectionString = GetAsfinagConnectionString() & IIf(pooling, "", ";pooling=false")
+            cn.Open()
+            Return cn
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return Nothing
+
    End Function
    Public Shared Function GetNewOpenConnectionPARKZEIT(Optional pooling As Boolean = True) As SqlConnection
        Dim cn As New SqlConnection()
@@ -263,6 +315,19 @@ Public Class SQL
        End Try
        Return Nothing

+    End Function
+
+    Public Shared Function GetNewOpenConnectionFAsfinag_SYSTEM(TESTSYSTEM As Boolean, Optional pooling As Boolean = True) As SqlConnection
+        Dim cn As New SqlConnection()
+        Try
+            cn.ConnectionString = GetAsfinagConnectionString(TESTSYSTEM) & IIf(pooling, "", ";pooling=false")
+            cn.Open()
+            Return cn
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return Nothing
+
    End Function
    Public Shared Function GetNewOpenConnectionSCANCANON(Optional pooling As Boolean = True) As SqlConnection
        Dim cn As New SqlConnection()
@@ -449,6 +514,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "DISPO" : conn = GetNewOpenConnectionDISPO()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
@@ -460,6 +526,7 @@ Public Class SQL
                Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA()
                Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT()

+
                Case "AVISO_ATILLA"
                    conn.ConnectionString = "Data Source=172.16.0.98;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"
                    conn.Open()
@@ -493,6 +560,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "DISPO" : conn = GetNewOpenConnectionDISPO()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
@@ -529,6 +597,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
                Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
@@ -596,6 +665,7 @@ Public Class SQL
                    Case "SDL" : conn = GetNewOpenConnectionSDL()
                    Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                    Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                    Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                    Case "DISPO" : conn = GetNewOpenConnectionDISPO()
                    Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                    Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
@@ -648,6 +718,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "DISPO" : conn = GetNewOpenConnectionDISPO()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
@@ -692,6 +763,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
                Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
@@ -733,6 +805,7 @@ Public Class SQL
            Case "SDL" : conn = GetNewOpenConnectionSDL()
            Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
            Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+            Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
            Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
            Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
            Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
@@ -768,6 +841,7 @@ Public Class SQL
            Case "SDL" : conn = GetNewOpenConnectionSDL()
            Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
            Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+            Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
            Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
            Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
            Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
@@ -832,6 +906,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
                Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
@@ -1208,14 +1283,14 @@ Public Class SQL
                      " FROM veoadr WHERE basman_nr='" & basman_nr & "' And basman_nl='" & basman_nl & "' And veoant_beznr='" & veoant_beznr & "' " &
                      " And veoant_lfdnr=" & intLfdNr & " And veopos_posnr=" & intPosNr & " And veoadr_typ=" & lngTyp & " " &
                      " ORDER BY basman_nr, basman_nl, veoant_beznr, veoant_lfdnr, veopos_posnr, veoadr_typ ", conn)
-                Dim dr As SqlDataReader = cmd.ExecuteReader()
-                If dr.HasRows Then
-                    dr.Read()
-                    s = Left(Trim(dr.Item("veoadr_name1")) & Trim(", " & dr.Item("baslnd_alpha")) & Trim(", " & dr.Item("veoadr_plz")) & Trim(", " & dr.Item("veoadr_ort")), 50)
-                End If
-                dr.Close()
-            End Using
-            conn.Close()
+                    Dim dr As SqlDataReader = cmd.ExecuteReader()
+                    If dr.HasRows Then
+                        dr.Read()
+                        s = Left(Trim(dr.Item("veoadr_name1")) & Trim(", " & dr.Item("baslnd_alpha")) & Trim(", " & dr.Item("veoadr_plz")) & Trim(", " & dr.Item("veoadr_ort")), 50)
+                    End If
+                    dr.Close()
+                End Using
+                conn.Close()

            End If
            Return s