Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

This commit is contained in:
2026-01-07 15:46:52 +01:00
12 changed files with 450 additions and 112 deletions

View File

@@ -60,8 +60,8 @@ Public Class cAdressen
End If
End Sub
Sub New(UIDNr As String, woellKdNr As Integer)
LOADUIDNr(UIDNr, woellKdNr)
Sub New(UIDNr As String, woellKdNr As Integer, isWoelflKundenNr As Boolean)
LOADUIDNr(UIDNr, woellKdNr, isWoelflKundenNr)
End Sub
Public Function FullName() As String
Return (If(Name_1, "") & " " & If(Name_2, "")).ToString.Replace(" ", " ")
@@ -308,13 +308,13 @@ Public Class cAdressen
' Return Nothing
End Sub
Public Sub LOADUIDNr(UIDNr As String, woelflKdNr As Integer)
Public Sub LOADUIDNr(UIDNr As String, woelflKdNr As Integer, isWoelfKdNr As Boolean)
Dim test = ""
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE (UstIdKz + UstIdNr='" & UIDNr & "' or Steuernummer ='" & UIDNr & "') AND WölflKundenNr = " & woelflKdNr & " OR weitereWölflKundenNr = " & woelflKdNr, conn)
Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE (UstIdKz + UstIdNr='" & UIDNr & "' or Steuernummer ='" & UIDNr & "') AND (WölflKundenNr = " & woelflKdNr & " OR weitereWölflKundenNr = " & woelflKdNr & ") " & IIf(isWoelfKdNr, " AND AdressenNr LIKE '15%'", ""), conn)
Dim dr = cmd.ExecuteReader()
If dr.Read Then