This commit is contained in:
2021-03-04 15:47:48 +01:00
parent 3aaf328ce6
commit b4612ab3e0
142 changed files with 24372 additions and 14785 deletions

View File

@@ -402,12 +402,12 @@ 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 & "') Or ([mit_AliasAD_Domain2]='" & Domain & "' AND [mit_AliasAD_Username2]='" & 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 getUstId_ByAD(Domain As String, User As String) As Integer
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Return SQL.getValueTxtBySql("SELECT TOP 1 [mit_id] FROM [tblMitarbeiter] WHERE ([mit_AliasAD_Domain]='" & Domain & "' AND [mit_AliasAD_Username]='" & User & "') Or ([mit_AliasAD_Domain2]='" & Domain & "' AND [mit_AliasAD_Username2]='" & User & "')", "ADMIN",,, "-1")
Return SQL.getValueTxtBySql("SELECT TOP 1 [mit_id] FROM [tblMitarbeiter] WHERE ([mit_AliasAD_Domain]='" & Domain & "' AND [mit_AliasAD_Username]='" & User & "') Or ([mit_AliasAD_Domain2]='" & Domain & "' AND [mit_AliasAD_Username2]='" & User & "' )", "ADMIN",,, "-1")
End Function
Public Function getBezById(id As Integer) As String
@@ -2350,6 +2350,7 @@ Public Class cOptionenDAL
End Function
Public Function setAVISOFromPcName() As Integer
Dim zeilen As Integer = 0
Dim sql = String.Format(
@@ -2428,6 +2429,9 @@ Public Class cStandort
Property eMail_Ankunft_Text As String
Property eMail_Freigabe_Betreff As String
Property eMail_Freigabe_Text As String
Property eMail_Zollbeleg_Betreff As String
Property eMail_Zollbeleg_Text As String
End Class
Public Class cStandorteDAL
@@ -2459,6 +2463,8 @@ Public Class cStandorteDAL
daten.eMail_Ankunft_Text = VarToStr(dr.Item("eMail_Ankunft_Text"))
daten.eMail_Freigabe_Betreff = VarToStr(dr.Item("eMail_Freigabe_Betreff"))
daten.eMail_Freigabe_Text = VarToStr(dr.Item("eMail_Freigabe_Text"))
daten.eMail_Zollbeleg_Betreff = VarToStr(dr.Item("eMail_Zollbeleg_Betreff"))
daten.eMail_Zollbeleg_Text = VarToStr(dr.Item("eMail_Zollbeleg_Text"))
End If
dr.Close()
End Using
@@ -2533,12 +2539,12 @@ Public Class cStandorteDAL
If d.StandortID = 0 Then
'Neuanlage
hAuswahl = "INSERT INTO Standorte " &
"(Standort, Standort_Text, Info, eMail_Ankunft_Betreff, eMail_Ankunft_Text, eMail_Freigabe_Betreff, eMail_Freigabe_Text) VALUES (" &
"@Standort, @Standort_Text, @Info, @eMail_Ankunft_Betreff, @eMail_Ankunft_Text, @eMail_Freigabe_Betreff, @eMail_Freigabe_Text)"
"(Standort, Standort_Text, Info, eMail_Ankunft_Betreff, eMail_Ankunft_Text, eMail_Freigabe_Betreff, eMail_Freigabe_Text,eMail_Zollbeleg_Betreff,eMail_Zollbeleg_Text) VALUES (" &
"@Standort, @Standort_Text, @Info, @eMail_Ankunft_Betreff, @eMail_Ankunft_Text, @eMail_Freigabe_Betreff, @eMail_Freigabe_Text,@eMail_Zollbeleg_Betreff,@eMail_Zollbeleg_Text)"
Else
'Änderung
hAuswahl = String.Format(
"UPDATE Standorte SET Standort = @Standort, Standort_Text=@Standort_Text, Info=@Info, eMail_Ankunft_Betreff=@eMail_Ankunft_Betreff, eMail_Ankunft_Text=@eMail_Ankunft_Text, eMail_Freigabe_Betreff=@eMail_Freigabe_Betreff, eMail_Freigabe_Text=@eMail_Freigabe_Text " &
"UPDATE Standorte SET Standort = @Standort, Standort_Text=@Standort_Text, Info=@Info, eMail_Ankunft_Betreff=@eMail_Ankunft_Betreff, eMail_Ankunft_Text=@eMail_Ankunft_Text, eMail_Freigabe_Betreff=@eMail_Freigabe_Betreff, eMail_Freigabe_Text=@eMail_Freigabe_Text , eMail_Zollbeleg_Betreff=@eMail_Zollbeleg_Betreff , eMail_Zollbeleg_Text=@eMail_Zollbeleg_Text " &
"WHERE StandortID = @StandortID")
End If
Dim sql = hAuswahl
@@ -2551,6 +2557,8 @@ Public Class cStandorteDAL
cmd.Parameters.AddWithValue("@eMail_Ankunft_Text", d.eMail_Ankunft_Text)
cmd.Parameters.AddWithValue("@eMail_Freigabe_Betreff", d.eMail_Freigabe_Betreff)
cmd.Parameters.AddWithValue("@eMail_Freigabe_Text", d.eMail_Freigabe_Text)
cmd.Parameters.AddWithValue("@eMail_Zollbeleg_Betreff", d.eMail_Zollbeleg_Betreff)
cmd.Parameters.AddWithValue("@eMail_Zollbeleg_Text", d.eMail_Zollbeleg_Text)
cmd.Parameters.AddWithValue("@StandortID", d.StandortID)
Try
cmd.ExecuteNonQuery()