edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
d.breimaier
2025-01-27 14:42:24 +01:00
parent 3c7b71df9c 27caa2e2ce
commit c05cb36cae
12 changed files with 452 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
View File

@@ -320,7 +320,7 @@ Public Class cADMIN
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, Optional nlTmp As String = "", Optional switchCompany As Boolean = False) As Boolean
Public Function checkLogin(ByVal user As String, ByVal pwd As String, ByVal firma As String, Optional nlTmp As String = "", Optional switchCompany As Boolean = False, Optional bepr_programm As String = "AVISO") As Boolean
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = If(firma = "", "VERAG", firma)
@@ -338,7 +338,7 @@ Public Class cADMIN
cmd.Parameters.AddWithValue("@mit_username", user)
cmd.Parameters.AddWithValue("@mit_pwd", pwd)
cmd.Parameters.AddWithValue("@bepr_programm", "AVISO")
cmd.Parameters.AddWithValue("@bepr_programm", bepr_programm)
cmd.Parameters.AddWithValue("@mit_firma", firma)
dr = cmd.ExecuteReader()

5
VERAG_PROG_ALLGEMEIN/Schnittstellen/cTariffKN8.vb
View File

@@ -23,6 +23,11 @@ Public Class cTariffKN8_Interface
TNR = TNR.ToString.Replace(".", "")
TNR = TNR.ToString.Replace(" ", "")
If TNR.ToString.Length > 8 Then TNR = TNR.ToString.Substring(0, 8)
'If TNR.Length < 8 Then
' ' Mit Nullen auffüllen
' TNR = TNR.PadRight(8, "0"c)
'End If
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Return sql.getValueTxtBySql("SELECT TOP 1 [Kurztitel] FROM [tblEZTKN8] where EDV_Code like '" & TNR & "'", "FMZOLL",,, "")
End Function

1
VERAG_PROG_ALLGEMEIN/cAllgemein.vb
View File

@@ -10,6 +10,7 @@ Public Class cAllgemein
Public Shared STAMMFILIALE As String 'IMEX,UNISPED;ATILLA...
Public Shared WARENORT_ZUGANG As Boolean = False
Public Shared WARENORT As String
Public Shared ATILLA_SND As Boolean = False
Public Shared CLUSTER As String = "" 'Firmenverbund
' Public Shared SPECIFIC As cSPECIFIC = New cSPECIFIC