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

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-10-06 09:24:25 +02:00
parent 9eb8a1d800 3860240e63
commit 74972a519e
25 changed files with 750 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb
View File

@@ -23,6 +23,7 @@ Public Class KdSearchBox
Public Property _loadKdData As Boolean = False
Public Property _hideIfListEmpty As Boolean = True
Public Property _displayWoelflKd As Boolean = False
Public Property _hideMDMKd As Boolean = False
Public Property _displayAVISO_Email As Boolean = False
Public Property nurAktive As Boolean = True
Public Property kdNrField As Control = Nothing
@@ -522,6 +523,7 @@ Public Class KdSearchBox
If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'"
If _hideMDMKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'"
SQLstr &= " order by Ordnungsbegriff "
setDS(True, usrcntl.dgvKundenAktiv, SQL.loadDgvBySql(SQLstr, "FMZOLL"), topAnz)
@@ -595,6 +597,7 @@ Public Class KdSearchBox
End If
If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'"
If _hideMDMKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'"
SQLstr &= " order by Ordnungsbegriff "
setDS(False, usrcntl.dgvKundenInAktiv, SQL.loadDgvBySql(SQLstr, "FMZOLL"), 6)
@@ -677,6 +680,7 @@ Public Class KdSearchBox
End If
If Not _displayWoelflKd Then SQLstrEnd &= " AND AdressenNr NOT LIKE '15%'"
If _hideMDMKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'"
Dim searchstring = SQLstr & SQLstrEnd & " order by Ordnungsbegriff "
@@ -743,6 +747,7 @@ Public Class KdSearchBox
If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'"
If _hideMDMKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'"
SQLstr &= " order by Ordnungsbegriff "
setDS(False, usrcntl.dgvKundenInAktiv, SQL.loadDgvBySql(SQLstr, "FMZOLL"), 4)
@@ -882,6 +887,12 @@ Public Class KdSearchBox
sqlEnd.AppendLine(" AND AdressenNr NOT LIKE '15%'")
End If
If _hideMDMKd Then
sqlEnd.AppendLine(" AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'")
End If
sqlEnd.AppendLine(" ORDER BY Ordnungsbegriff")
Return (selectPart & sqlEnd.ToString(), sqlEnd.ToString())

18
VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb
View File

@@ -2,6 +2,7 @@
Imports System.Data.SqlClient
Imports System.Reflection
Imports com.sun.org.apache.xerces.internal.dom
Public Class cAufschubKonten
Property brgakto_id As Integer
@@ -328,12 +329,7 @@ FROM
If showMessage Then
MsgBox(
"Saldo zum Stichtag " &
datumBis.ToShortDateString() &
":" & vbNewLine &
brgakto_gs_aktSaldo.ToString("N2")
)
MsgBox("Saldo zum Stichtag " & datumBis.ToShortDateString() & ":" & vbNewLine & brgakto_gs_aktSaldo.ToString("N2"))
End If
@@ -350,7 +346,15 @@ FROM
Try
Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate.ToShortDateString & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,)
Dim refBetrag As Double = 0
Dim refBetagDB As String = SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate.ToShortDateString & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,, 0,)
If refBetagDB <> "" AndAlso IsNumeric(refBetagDB) Then
refBetrag = CDbl(refBetagDB)
End If
Return refBetrag
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)

1
VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
View File

@@ -290,6 +290,7 @@ Public Class cDATENSERVER
s = s.Replace("Ј", "J") 'cyrillic J
s = s.Replace("Е", "E") 'cyrillic E
s = s.Replace("?", "")
s = s.Replace("/", "")
Dim temp = s
s = Regex.Replace(s, "[бБвгГдДёЁжЖзЗиИйЙкКлЛмнпПртфФхХцЦчЧшШщЩъЪыЫьЬэЭюЮяЯ]", "").Replace("""", "") 'REMOVE cyrillic letters

3
VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
View File

@@ -1039,6 +1039,7 @@ Public Class cTimasAPI
dt.Columns.Add("Geschlecht", GetType(String))
dt.Columns.Add("Ausweis-Nr", GetType(Integer))
dt.Columns.Add("Info", GetType(String))
'dt.Columns.Add("AVISO-ID", GetType(Integer))
End If
dt.Clear()
@@ -1055,6 +1056,8 @@ Public Class cTimasAPI
R("Geschlecht") = employee.StringOf("gender")
R("Ausweis-Nr") = employee.IntOf("card")
R("Info") = employee.StringOf("info")
'R("AVISO-ID") = employee.IntOf("externid")
dt.Rows.Add(R)
j = j + 1
End While

2
VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb
View File

@@ -240,7 +240,7 @@ Public Class cSyska_Interface
Dim dt_Stamm As DataTable = getStammdaten(FiBuSchnittstelleNr)
Dim postfix As String = ""
If dt_Stamm IsNot Nothing AndAlso dt_Stamm.Rows.Count > 0 Then
If FiBuSchnittstelleNr = 19 Then postfix = "MDM_"
If FiBuSchnittstelleNr = 19 Then postfix = "_MDM"
Dim fileKD As System.IO.StreamWriter
Dim DateinameKD = "AVISO_DEBI_" & Now.ToString("ddMMyyyy_HHmm") & postfix & ".txt"
fileKD = My.Computer.FileSystem.OpenTextFileWriter(pathKD & DateinameKD, True, System.Text.Encoding.GetEncoding("iso-8859-15"))

16
VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
View File

@@ -1312,8 +1312,15 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
Continue For
End If
' Keine doppelten Punkte
If localPart.Contains("..") Then
' Keine führenden/abschließenden Punkte
If localPart.StartsWith("'") Then
invalid.Add(e)
Continue For
End If
' Keine doppelten Punkte
If localPart.Contains("..") Then
invalid.Add(e)
Continue For
End If
@@ -1327,6 +1334,11 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
Continue For
End If
If domainAscii.EndsWith("'") Then
invalid.Add(e)
Continue For
End If
' Domainlabels prüfen

6
VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb
View File

@@ -36,12 +36,12 @@ Public Class frmDatumsabfrage
Public Datum As Date = CDate(Now.ToShortDateString)
Public Datum As Date = CDate(Now)
Public exceptedCountries As String
Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
Label1.Text = ""
If onlypastDate And CDate(dtp_date.Value) > CDate(Now.ToShortDateString) Then
If onlypastDate AndAlso CDate(dtp_date.Value) > CDate(Now) Then
Label1.Text = "Muss heute oder früher sein!"
Me.DialogResult = DialogResult.None
Exit Sub
@@ -60,7 +60,7 @@ Public Class frmDatumsabfrage
End Sub
Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
Datum = CDate(Now.ToShortDateString)
Datum = CDate(Now)
If panelLaender Then
exceptedCountries = getValues()