This commit is contained in:
2020-06-22 13:33:07 +02:00
parent f4e823ec69
commit 9b52ab1b61
43 changed files with 1985 additions and 250 deletions

View File

@@ -298,6 +298,14 @@ Public Class cADMIN
Return SQL.getValueTxtBySql("SELECT mit_pwd FROM tblMitarbeiter where mit_username='" & user & "' COLLATE Latin1_General_CS_AS AND (mit_firma='" & firma & "' OR mit_firma='ALL' ) ", "ADMIN")
End Function
Public Function getPwdFromUsrId(ByVal userId As String) As String
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Return SQL.getValueTxtBySql("SELECT mit_pwd FROM tblMitarbeiter where mit_id='" & userId & "' ", "ADMIN")
End Function
Public Function getUnameFromUsrId(ByVal userId As String) As String
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Return SQL.getValueTxtBySql("SELECT mit_username FROM tblMitarbeiter where mit_id='" & userId & "' ", "ADMIN")
End Function
Public Function checkLogin(ByVal user As String, ByVal pwd As String, ByVal firma As String) As Boolean
@@ -392,6 +400,11 @@ Public Class cADMIN
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")
End Function
Public Function getBezById(id As Integer) As String
Dim sql As String = "SELECT Firma_Bez FROM tblFirma WHERE Firma_ID=@id "
@@ -911,19 +924,22 @@ Public Class cAviso
End Function
Shared Function getAVISO_List(Optional Standort = "SUB", Optional FIRMA = "VERAG") As DataTable
Shared Function getAVISO_List(Optional Standort = "SUB") As DataTable 'Optional FIRMA = "VERAG") As DataTable
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Select Case FIRMA
Case "VERAG" : FIRMA = " AND ( FIRMA='VERAG' OR CLUSTER='FRONTOFFICE' )"
Case Else : FIRMA = " AND ( FIRMA='" & FIRMA & "') "
Dim sqlWhere = ""
Select Case Standort
Case "SUB" : sqlWhere = " AND ( FIRMA='VERAG' OR CLUSTER='FRONTOFFICE' ) AND ImEx IN ('IMPORT','') AND Grenzstelle = '" & Standort & "' "
Case "ATILLA" : sqlWhere = " AND ( FIRMA='ATILLA') "
Case "IMEX" : sqlWhere = " AND ( FIRMA='IMEX') "
Case "UNISPED" : sqlWhere = " AND ( FIRMA='UNISPED') "
Case Else : sqlWhere = " AND FIRMA='VERAG' AND ( Grenzstelle='" & Standort & "') "
End Select
Standort = " AND Grenzstelle = '" & Standort & "' "
' Standort = ""
Dim dt = SQL.loadDgvBySql("SELECT TOP 1000 AvisoID, Status, LKW_Nr, Auftraggeber, Frächter,VoraussichtlichesEintreffen, AvisoEingang, Ankunft, Dauer, Grenzstelle,letzterMitarbeiter, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], Datum, Vorbereitet, Vorgeschrieben, Freigabe, Telefonisch, Info,Handling,AvisoTVHinweis,DATEDIFF(DAY,getdate(),[VoraussichtlichesEintreffen]) TageBisEintreffen
FROM Aviso
WHERE 1=1 " & FIRMA & Standort & " AND Status = 3 ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC", "AVISO")
WHERE 1=1 " & sqlWhere & " AND Status = 3 ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC", "AVISO")
Return dt
End Function