This commit is contained in:
2020-05-31 22:25:35 +02:00
parent 4a358d43fd
commit 083e666fbc
214 changed files with 14292 additions and 4117 deletions

View File

@@ -389,7 +389,7 @@ Public Class cADMIN
Public Function getUstName_ByAD(Domain As String, User As String) As String
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Return SQL.getValueTxtBySql("SELECT TOP 1 [mit_username] FROM [tblMitarbeiter] WHERE [mit_AliasAD_Domain]='" & Domain & "' AND [mit_AliasAD_Username]='" & User & "'", "ADMIN")
Return SQL.getValueTxtBySql("SELECT TOP 1 [mit_username] FROM [tblMitarbeiter] WHERE ([mit_AliasAD_Domain]='" & Domain & "' AND [mit_AliasAD_Username]='" & User & "') Or ([mit_AliasAD_Domain2]='" & Domain & "' AND [mit_AliasAD_Username2]='" & User & "')", "ADMIN")
End Function
Public Function getBezById(id As Integer) As String
@@ -901,6 +901,7 @@ Public Class cAviso
Property KdAuftragsNr_Frachtfuehrer As Object = Nothing
Property FreigabeFiliale As Object = Nothing
Property VoraussichtlichesEintreffen As Object = Nothing
Property VORSYSTEM As Object = Nothing
@@ -1022,6 +1023,7 @@ Public Class cAvisoDAL
daten.KdAuftragsNr_Avisierer = If(dr.Item("KdAuftragsNr_Avisierer") Is DBNull.Value, Nothing, dr.Item("KdAuftragsNr_Avisierer"))
daten.FreigabeFiliale = If(dr.Item("FreigabeFiliale") Is DBNull.Value, Nothing, dr.Item("FreigabeFiliale"))
daten.VoraussichtlichesEintreffen = If(dr.Item("VoraussichtlichesEintreffen") Is DBNull.Value, Nothing, dr.Item("VoraussichtlichesEintreffen"))
daten.VORSYSTEM = If(dr.Item("VORSYSTEM") Is DBNull.Value, Nothing, dr.Item("VORSYSTEM"))