Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL
This commit is contained in:
@@ -318,7 +318,7 @@ Public Class cADMIN
|
||||
|
||||
'falls ID mitgegeben, dann diese laden, ansonsten den anderen Wert suchen
|
||||
'Dim sql As String = "SELECT mit_vname,mit_nname,mit_berechtigung FROM tblUser where mit_username=@mit_username COLLATE Latin1_General_CS_AS and mit_pwd=@mit_pwd COLLATE Latin1_General_CS_AS "
|
||||
Dim sql As String = "SELECT mit_id,mit_vname,mit_nname,mit_niederlassung,mit_username,mit_pwd,mit_info,mit_abteilung,mit_standartFiliale,mit_FMZollPersID,mit_firmaFMZoll,mit_TESTonly,mit_abweichenderAnzeigename FROM " &
|
||||
Dim sql As String = "SELECT mit_id,mit_vname,mit_nname,mit_niederlassung,mit_username, case WHEN isnull(mit_abweichenderAnzeigename,'')='' THEN mit_username ELSE mit_abweichenderAnzeigename END mit_usernameDisplay,mit_pwd,mit_info,mit_abteilung,mit_standartFiliale,mit_FMZollPersID,mit_firmaFMZoll,mit_TESTonly,mit_abweichenderAnzeigename FROM " &
|
||||
" tblMitarbeiter,tblBerProg where mit_username=@mit_username and mit_pwd=@mit_pwd COLLATE Latin1_General_CS_AS AND (mit_firma=@mit_firma OR mit_firma='ALL' ) AND bepr_programm=@bepr_programm AND bepr_userId=mit_id "
|
||||
|
||||
|
||||
@@ -345,7 +345,8 @@ Public Class cADMIN
|
||||
' If cMitarbeiterAVISO.Grenzstelle = "Nickelsdorf" Then cMitarbeiterAVISO.Grenzstelle = "NKD"
|
||||
' If cMitarbeiterAVISO.Grenzstelle = "Salzburg" Then cMitarbeiterAVISO.Grenzstelle = "SBG"
|
||||
' If cMitarbeiterAVISO.Grenzstelle = "" Then cMitarbeiterAVISO.Grenzstelle = "???"
|
||||
cMitarbeiterAVISO.Mitarbeiter = If(CStr(dr.Item("mit_abweichenderAnzeigename")) <> "", CStr(dr.Item("mit_abweichenderAnzeigename")), CStr(dr.Item("mit_username")))
|
||||
cMitarbeiterAVISO.Mitarbeiter = CStr(dr.Item("mit_usernameDisplay"))
|
||||
'cMitarbeiterAVISO.Mitarbeiter = If(CStr(dr.Item("mit_abweichenderAnzeigename")) <> "", CStr(dr.Item("mit_abweichenderAnzeigename")), CStr(dr.Item("mit_username")))
|
||||
cMitarbeiterAVISO.Mitarbeitername = CStr(dr.Item("mit_vname")) & " " & CStr(dr.Item("mit_nname"))
|
||||
cMitarbeiterAVISO.KW = CStr(dr.Item("mit_pwd"))
|
||||
' cMitarbeiterAVISO.Sicherheitsstufe = CInt(dr.Item("ber_sicherheitsstufe"))
|
||||
@@ -363,6 +364,7 @@ Public Class cADMIN
|
||||
' VERAG_PROG_ALLGEMEIN.cAllgemein.USR_NNAME = CStr(dr.Item("mit_nname"))
|
||||
'VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME = CStr(dr.Item("mit_vname")) & " " & CStr(dr.Item("mit_nname"))
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = CStr(dr.Item("mit_username"))
|
||||
' VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = CStr(dr.Item("mit_usernameDisplay"))
|
||||
If dr.Item("mit_firmaFMZoll") Is DBNull.Value Then
|
||||
MsgBox("Benutzer muss einer Firma zugeordnet sein!")
|
||||
Return False
|
||||
|
||||
@@ -423,8 +423,8 @@ Public Class cSendungen
|
||||
Me.tblSnd_FrachtkostenGesamt = SQL.checkNullReturnValue(dr.Item("tblSnd_FrachtkostenGesamt"), Nothing)
|
||||
Me.tblSnd_AbfertigungTR = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR"), Nothing)
|
||||
Me.tblSnd_AbfertigungTR_MA = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTR_MA"), Nothing)
|
||||
Me.tblSnd_AbfertigungTRAnzahl = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTRAnzahl"), Nothing)
|
||||
Me.tblSnd_AbfertigungTRAnzahlPos = SQL.checkNullReturnValue(dr.Item("tblSnd_AbfertigungTRAnzahlPos"), Nothing)
|
||||
Me.tblSnd_AbfertigungTRAnzahl = SQL.checkNullIntegerZero(dr.Item("tblSnd_AbfertigungTRAnzahl"))
|
||||
Me.tblSnd_AbfertigungTRAnzahlPos = SQL.checkNullIntegerZero(dr.Item("tblSnd_AbfertigungTRAnzahlPos"))
|
||||
|
||||
End If
|
||||
|
||||
|
||||
@@ -125,6 +125,21 @@ Public Class cSession
|
||||
|
||||
|
||||
|
||||
Public Shared Function IS_ONLINE(sess_maId) As Boolean
|
||||
Try
|
||||
Dim SQL As New SQL
|
||||
Dim sess_IdOnline = SQL.getValueTxtBySql("SELECT TOP 1 sess_Id FROM tblSessions where sess_lastRm > dateadd(MINUTE,-2, getdate()) AND sess_maId='" & sess_maId & "' ORDER BY sess_lastActivity DESC,sess_lastRm DESC", "ADMIN",,, -1)
|
||||
If sess_IdOnline > 0 Then
|
||||
Return True
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message & ex.StackTrace)
|
||||
End Try
|
||||
Return False
|
||||
|
||||
End Function
|
||||
|
||||
|
||||
Public Shared Function GET_IP_FROM_MAID(sess_maId) As String
|
||||
Dim SQL As New SQL
|
||||
Return SQL.getValueTxtBySql(" SELECT TOP 1 isnull(sess_ipaddress,'') as sess_ipaddress FROM [tblSessions] where sess_lastRm > DATEADD(SECOND,-70, GETDATE()) AND sess_maId=" & sess_maId, "ADMIN")
|
||||
|
||||
@@ -137,6 +137,7 @@ Public Class cSpeditionsbuch
|
||||
Property PersonalnummerQS As Object = Nothing 'int=-1
|
||||
Property AtlasBezNrEZA As String = ""
|
||||
Property AtlasBezNrNCTS As String = ""
|
||||
Property AtlasBezNrAES As String = ""
|
||||
Property Versendungsland As String = ""
|
||||
Property SB_CMR As Boolean = False
|
||||
Property SB_CMRDatum As Object = Nothing
|
||||
@@ -185,6 +186,7 @@ Public Class cSpeditionsbuch
|
||||
Property PersonalnummerAbklTR As Object = Nothing
|
||||
Property UK_EIDR_ausstehend As Boolean = False
|
||||
|
||||
Property Zollstelle As Object = Nothing
|
||||
|
||||
Property UNTERPOS As New List(Of cSpeditionsbuchUnterPos)
|
||||
Property VORKOSTEN As New List(Of cVorkosten)
|
||||
@@ -311,6 +313,7 @@ Public Class cSpeditionsbuch
|
||||
Me.PersonalnummerQS = SQL.checkNullReturnValue(dr.Item("PersonalnummerQS"), Nothing)
|
||||
Me.AtlasBezNrEZA = SQL.checkNullStr(dr.Item("AtlasBezNrEZA"))
|
||||
Me.AtlasBezNrNCTS = SQL.checkNullStr(dr.Item("AtlasBezNrNCTS"))
|
||||
Me.AtlasBezNrAES = SQL.checkNullStr(dr.Item("AtlasBezNrAES"))
|
||||
Me.Versendungsland = SQL.checkNullStr(dr.Item("Versendungsland"))
|
||||
Me.SB_CMR = SQL.checkNullBool(dr.Item("SB_CMR"))
|
||||
Me.SB_CMRDatum = SQL.checkNullDateNothing(dr.Item("SB_CMRDatum"))
|
||||
@@ -350,6 +353,7 @@ Public Class cSpeditionsbuch
|
||||
Me.HandlingZuKassieren = SQL.checkNulDbl(dr.Item("HandlingZuKassieren"))
|
||||
Me.PersonalnummerAbklTR = SQL.checkNullReturnValue(dr.Item("PersonalnummerAbklTR"), Nothing)
|
||||
Me.UK_EIDR_ausstehend = SQL.checkNullBool(dr.Item("UK_EIDR_ausstehend"))
|
||||
Me.Zollstelle = SQL.checkNullReturnValue(dr.Item("Zollstelle"), Nothing)
|
||||
|
||||
Me.SB_CMRNr = SQL.checkNullReturnValue(dr.Item("SB_CMRNr"), Nothing)
|
||||
|
||||
@@ -376,7 +380,7 @@ Public Class cSpeditionsbuch
|
||||
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
|
||||
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
|
||||
Using cmd As New SqlCommand("SELECT TOP 1 * FROM Speditionsbuch WHERE ([AtlasBezNrEZA]=@bezugsNr OR [AtlasBezNrNCTS]=@bezugsNr )", conn)
|
||||
Using cmd As New SqlCommand("SELECT TOP 1 * FROM Speditionsbuch WHERE ([AtlasBezNrEZA]=@bezugsNr OR [AtlasBezNrNCTS]=@bezugsNr OR [AtlasBezNrAES]=@bezugsNr )", conn)
|
||||
cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr)
|
||||
Dim dr = cmd.ExecuteReader()
|
||||
If dr.Read Then
|
||||
@@ -464,6 +468,7 @@ Public Class cSpeditionsbuch
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerQS", PersonalnummerQS))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AtlasBezNrEZA", AtlasBezNrEZA))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AtlasBezNrNCTS", AtlasBezNrNCTS))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AtlasBezNrAES", AtlasBezNrAES))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Versendungsland", Versendungsland))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SB_CMR", SB_CMR))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SB_CMRDatum", SB_CMRDatum))
|
||||
@@ -503,6 +508,7 @@ Public Class cSpeditionsbuch
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("HandlingZuKassieren", HandlingZuKassieren))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerAbklTR", PersonalnummerAbklTR))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UK_EIDR_ausstehend", UK_EIDR_ausstehend))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zollstelle", Zollstelle))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SB_CMRNr", SB_CMRNr))
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user