This commit is contained in:
2020-01-08 14:52:43 +01:00
parent bea8632eb5
commit f4c1a74870
136 changed files with 11561 additions and 1072 deletions

View File

@@ -34,7 +34,7 @@ Public Class cKundenKontakteList
Public Sub LOAD_LIST(kkd_KundenNr, Optional firma = "")
Try
LIST.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
Using cmd As New SqlCommand("SELECT * FROM [tblKundenKontakt] WHERE kkd_KundenNr=@kkd_KundenNr " & If(firma <> "", " AND kkd_firma=@firma", ""), conn)
cmd.Parameters.AddWithValue("@kkd_KundenNr", kkd_KundenNr)
cmd.Parameters.AddWithValue("@firma", firma)
@@ -248,15 +248,23 @@ Public Class cKundenKontakte
If KMail = "" Then Return -1
If Not KMail.Contains("@") Then Return -1
Dim whereFiliale = ""
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then
whereFiliale = " AND [FilialenNr]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "' "
Else
'SQLstr &= " AND isnull([FilialenNr],0)<>'5501' "
whereFiliale = " AND isnull([FilialenNr],0) NOT IN ('5501','5601','5701','5801') "
End If
Dim SQL As New SQL
getKdNrFromMailAdress = SQL.getValueTxtBySql("SELECT TOP 1 [kkd_KundenNr] FROM [tblKundenKontakt] where kkd_Email LIKE ('%" & KMail & "%') AND kkd_kkaBez='OUTLOOK_AVISO_Eingang'", "FMZOLL",,, -1)
getKdNrFromMailAdress = SQL.getValueTxtBySql("SELECT TOP 1 [kkd_KundenNr] FROM [tblKundenKontakt] INNER JOIN Kunden ON KundenNr=kkd_KundenNr where kkd_Email LIKE ('%" & KMail & "%') AND kkd_kkaBez='OUTLOOK_AVISO_Eingang' " & whereFiliale, "FMZOLL",,, -1)
If serchInKd AndAlso getKdNrFromMailAdress < 0 Then
getKdNrFromMailAdress = SQL.getValueTxtBySql("SELECT TOP 1 AdressenNr FROM Adressen WHERE [E-Mail] LIKE ('%" & KMail & "%') ", "FMZOLL",,, -1)
getKdNrFromMailAdress = SQL.getValueTxtBySql("SELECT TOP 1 AdressenNr FROM Adressen INNER JOIN Kunden ON KundenNr=AdressenNr WHERE [E-Mail] LIKE ('%" & KMail & "%') " & whereFiliale, "FMZOLL",,, -1)
If getKdNrFromMailAdress < 0 Then
Dim sp = KMail.Split("@")
getKdNrFromMailAdress = SQL.getValueTxtBySql("SELECT TOP 1 AdressenNr FROM Adressen WHERE [E-Mail] LIKE ('%" & sp(1) & "%') ", "FMZOLL",,, -1)
getKdNrFromMailAdress = SQL.getValueTxtBySql("SELECT TOP 1 AdressenNr FROM Adressen INNER JOIN Kunden ON KundenNr=AdressenNr WHERE [E-Mail] LIKE ('%" & sp(1) & "%') " & whereFiliale, "FMZOLL",,, -1)
End If
End If
End Function