div. Änderungen

This commit is contained in:
2026-03-18 10:19:52 +01:00
parent 72a2def23b
commit b143e5bf13
23 changed files with 1254 additions and 501 deletions

View File

@@ -112,6 +112,7 @@ Public Class cKundenErweitert
Property kde_CBAM_Warn2 As Decimal? = 40
Property kde_CBAM_ApplicationNo As Object = Nothing
Property kde_CBAM_CBAMAccountNo As Object = Nothing
Property kde_abwToleranzTage As Object = Nothing
Dim SQL As New SQL
@@ -232,6 +233,7 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_Warn2", kde_CBAM_Warn2))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_ApplicationNo", kde_CBAM_ApplicationNo))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_CBAMAccountNo", kde_CBAM_CBAMAccountNo))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_abwToleranzTage", kde_abwToleranzTage))

View File

@@ -18,6 +18,7 @@ Public Class cKundenveranlagungUID
Me.UstIdKz = UstIdKz
LOAD()
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdNr", kdNr))
@@ -28,18 +29,8 @@ Public Class cKundenveranlagungUID
Return list
End Function
Shared Sub LOAD_LIST_ByKdNr(ByRef UID_LIST As List(Of cKundenveranlagungUID), kdNr As Integer)
If UID_LIST Is Nothing Then UID_LIST = New List(Of cKundenveranlagungUID)
UID_LIST.Clear()
Dim SQL As New SQL
For Each r In SQL.loadDgvBySql("SELECT UstIdKz FROM tblKundenveranlagungUID WHERE kdNr=" & kdNr, "AVISO").Rows
UID_LIST.Add(New VERAG_PROG_ALLGEMEIN.cKundenveranlagungUID(kdNr, r("UstIdKz")))
Next
End Sub
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenveranlagungUID WHERE kdNr=@kdNr and UstIdKz = @UstIdKz) " &
@@ -48,7 +39,7 @@ Public Class cKundenveranlagungUID
" BEGIN " & getInsertCmd() & " END " &
" commit tran "
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , List)
End Function
Public Sub LOAD()
@@ -93,7 +84,7 @@ Public Class cKundenveranlagungUID
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE [tblKundenveranlagungUID] SET " & str & " WHERE kdNr=@kdNr and UstIdKz = @UstIdKz ")
Return (" UPDATE tblKundenveranlagungUID SET " & str & " WHERE kdNr=@kdNr and UstIdKz = @UstIdKz ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -122,4 +113,10 @@ Public Class cKundenveranlagungUID
Return ""
End Function
Public Function DELETE()
SQL.doSQL("DELETE FROM tblKundenveranlagungUID WHERE kdNr=" & Me.kdNr & " and UstIdKz = '" & Me.UstIdKz & "'", "FMZOLL")
End Function
End Class

View File

@@ -189,6 +189,7 @@ Public Class cMDMZinsberechnung
kundenNr = @KundenNr
AND zinsbetrag <> 0
AND verrechnet is null
AND left(buchungstext,6) <> 'Zinsen'
ORDER BY
belegDatum", conn)

View File

@@ -17,24 +17,18 @@ Public Class cUIDPruefung
Property uid_MaId As Object = Nothing
Property uid_Sachbearbeiter As String
Property uid_firma As Object = Nothing
Property uid_stufe As Integer = 1
Property Firma As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Property uid_abfrageUid As Object = Nothing
Property uid_sessionId As Object = Nothing
Property uid_adr1 As Object = Nothing
Property uid_adr2 As Object = Nothing
Property uid_adr3 As Object = Nothing
Property uid_adr4 As Object = Nothing
Property uid_adr5 As Object = Nothing
Property uid_adr6 As Object = Nothing
Property uid_pruefungstool As Object = Nothing
Property uid_typ As Object = Nothing
Shared SQL As New SQL
@@ -57,21 +51,19 @@ Public Class cUIDPruefung
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_MaId", uid_MaId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_Sachbearbeiter", uid_Sachbearbeiter))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_firma", uid_firma))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_stufe", uid_stufe))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma", Firma))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_abfrageUid", uid_abfrageUid))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_sessionId", uid_sessionId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr1", uid_adr1))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr2", uid_adr2))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr3", uid_adr3))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr4", uid_adr4))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr5", uid_adr5))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr6", uid_adr6))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_pruefungstool", uid_pruefungstool))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_typ", uid_typ))
Return list
End Function
@@ -238,7 +230,18 @@ Public Class cUIDPruefung
counter += 1
Dim errorCode = -99
Dim errormsg = ""
Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errormsg)
Dim UID_TMP = Nothing
'unterscheidung nach typ!
If Not IsDBNull(r("typ")) AndAlso r("typ") = "VAK" Then
UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020_UIDVeranlagungskunden(r("KdNr"), r("UstIdKz"), r("UstIdNr"), r("letzte Prüfung"),, SaveErgInAdressen, showErr,, errorCode, errormsg)
Else
UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errormsg)
End If
If UID_TMP IsNot Nothing Then
If UID_TMP.uid_valid Then
r("Ergebnis") = "OK"
@@ -325,24 +328,34 @@ Public Class cUIDPruefung
End If
If Validierungspruefung Then
where &= " AND UPPER(Adressen.UstIdKz) IN (
where &= " AND UPPER(Adressen.UstIdKz) IN (
'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR',
'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK'
)"
End If
dt = SQL.loadDgvBySql("SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr ,CASE
Dim SQLUID As String = "SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr ,CASE
WHEN UPPER(Adressen.UstIdKz) IN (
'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR',
'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK'
) THEN 'Ja'
ELSE 'Nein'
END AS istEUVAT " &
END AS istEUVAT, 'UID' as typ " &
" From [Adressen] inner Join kunden On KundenNr=AdressenNr inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr " &
" where (UstIdGeprüft <= '" & datum.ToShortDateString & "' OR UstIdGeprüft is null) and (isnull(Adressen.UstIdKz,'') <> '' and isnull(Adressen.UstIdNr,'') <> '') " &
" And Auswahl='A' " & where & " ORDER BY Ordnungsbegriff", "FMZOLL")
" And Auswahl='A' " & where
Dim SQLUID_Veranlagungskunden As String = "SELECT VAUID.KdNr,[Ordnungsbegriff] as Firma, VAUID.UstIdGeprüft, VAUID.UstIdKz,VAUID.UstIdNr, CASE WHEN UPPER(VAUID.UstIdKz) IN (
'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR',
'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK'
) THEN 'Ja'
ELSE 'Nein' END AS istEUVAT , 'VAK' as typ FROM [VERAG].[dbo].[tblKundenveranlagungUID] as VAUID
inner Join [Adressen] On AdressenNr=VAUID.KdNr
inner Join kunden On KundenNr=VAUID.KdNr
inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr
where (VAUID.UstIdGeprüft <= '" & datum.ToShortDateString & "' OR VAUID.UstIdGeprüft is null) and (isnull(VAUID.UstIdKz,'') <> '' and isnull(VAUID.UstIdNr,'') <> '') AND Filialen.firma='VERAG' " & where.Replace("Adressen.", "VAUID.")
dt = SQL.loadDgvBySql(SQLUID & " UNION ALL " & SQLUID_Veranlagungskunden & " ORDER BY Ordnungsbegriff", "FMZOLL")
Return dt

View File

@@ -213,7 +213,7 @@ Public Class frmMitarbeitersuche
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Überstunden_auszahlen", "SDL") Then
If MA.getFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then 'MA derselben Firma bearbeiten
If MA.getFirma.ToUpper = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then 'MA derselben Firma bearbeiten
Button3.Visible = True
End If
End If

View File

@@ -255,26 +255,128 @@ Public Class cFinanzOnlineWebService
End If
Return Nothing
End Function
'If returnInt = 0 Then
' Firma = name & vbNewLine & adrz1
' If adrz2 <> "" Then Firma = Firma & vbNewLine & adrz2
' If adrz3 <> "" Then Firma = Firma & vbNewLine & adrz3
' If adrz4 <> "" Then Firma = Firma & vbNewLine & adrz4
' If adrz5 <> "" Then Firma = Firma & vbNewLine & adrz5
' If adrz6 <> "" Then Firma = Firma & vbNewLine & adrz6
' ' frmUIDCheck.firmaUIDFinanzOnline = firma
' ' frmUIDCheck.firmaUIDProgramm = txtFirma
' ' frmUIDCheck.uidnr = txtUid
' ' frmUIDCheck.Show()
Function Call_Web_Service_MethodUID_Abfrage_NEU2020_UIDVeranlagungskunden(kdnr, UstIdKz, UstIdNr, UstIdGeprüft, Optional AskIfDouble = False, Optional SaveErgInAdressen = True, Optional showErr = True, Optional Stufe = 1, Optional ByRef errorCode = 0, Optional ByRef errorMsg = "") As VERAG_PROG_ALLGEMEIN.cUIDPruefung
'Else
' MsgBox(GetCodeText(returnInt))
'End If
' msgErgebnis = msg
' Call_Web_Service_MethodUID_Logout_NEU2020()
If UstIdKz IsNot Nothing AndAlso UstIdNr IsNot Nothing Then
Try
If AskIfDouble Then
If IsDate(UstIdGeprüft) AndAlso CDate(UstIdGeprüft).ToShortDateString = Now.ToShortDateString Then
If vbYes <> MsgBox("Die UID-Nummer wurde heute bereits geprüft. Soll die Prüfung nochmal durchgeführt werden?", vbYesNoCancel) Then
Return Nothing
End If
End If
End If
Dim tmp_SESSION_ID = SESSION_ID
Dim CallWebService As New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService
Dim msg As String = ""
Dim name As String = ""
Dim adrz1 As String = ""
Dim adrz2 As String = ""
Dim adrz3 As String = ""
Dim adrz4 As String = ""
Dim adrz5 As String = ""
Dim adrz6 As String = ""
Dim countryCode As String = UstIdKz
Dim vatNumber As String = UstIdNr
Dim StufeAbf = VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item1
Select Case Stufe
Case 1
StufeAbf = VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item1
Case 2
StufeAbf = VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item2
End Select
Dim returnInt As Integer
Try
returnInt = CallWebService.uidAbfrage(tid, benid, SESSION_ID, uid, countryCode & vatNumber, StufeAbf, msg, name, adrz1, adrz2, adrz3, adrz4, adrz5, adrz6)
If msg <> "" Then errorMsg = " " & msg
errorCode = returnInt
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, "Fehler im externen Webservice " & System.Reflection.MethodInfo.GetCurrentMethod.Name & vbNewLine & " Daten: TID: " & tid & vbNewLine & " BENID: " & benid & vbNewLine & " SessionID: " & SESSION_ID & vbNewLine & " UID: " & uid & vbNewLine & " COUNTRY-CODE/VAT: " & countryCode & vatNumber & vbNewLine & " Stufe: " & StufeAbf & vbNewLine & " MSG: " & msg & vbNewLine & " Name: " & name & vbNewLine & " Adr1: " & adrz1 & vbNewLine & " Adr2: " & adrz2 & vbNewLine & " Adr3: " & adrz3 & vbNewLine & " Adr4: " & adrz4 & vbNewLine & " Adr5: " & adrz5 & vbNewLine & " Adr6: " & adrz6, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
If ex.Message.Contains("Wegen Wartungsarbeiten") AndAlso ex.Message.Contains("Verf??gung") Then
Dim startIndex As Integer = ex.Message.IndexOf("Wegen Wartungsarbeiten")
Dim endIndex As Integer = ex.Message.IndexOf("Verf??gung", startIndex)
Dim messageError As String = ex.Message.Substring(startIndex, endIndex - startIndex + "Verf??gung".Length)
If messageError <> "" Then errorMsg = messageError
errorCode = -99
End If
Exit Function
End Try
If returnInt = 0 Or returnInt = 1 Then
Dim UID_TMP As New VERAG_PROG_ALLGEMEIN.cUIDPruefung
UID_TMP.uid_Datum = Now
UID_TMP.uid_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
If If(UID_TMP.uid_Sachbearbeiter, "") = "" Then UID_TMP.uid_Sachbearbeiter = "AUTO"
UID_TMP.uid_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
UID_TMP.uid_valid = (returnInt = 0)
UID_TMP.uid_KundenNr = kdnr
UID_TMP.uid_UstIdKz = countryCode
UID_TMP.uid_UstIdNr = vatNumber
UID_TMP.Firma = If(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, "VERAG")
UID_TMP.uid_abfrageUid = uid
UID_TMP.uid_sessionId = tmp_SESSION_ID
UID_TMP.uid_typ = "VAK"
UID_TMP.uid_firma = name
UID_TMP.uid_adr1 = adrz1
UID_TMP.uid_adr2 = adrz2
UID_TMP.uid_adr3 = adrz3
UID_TMP.uid_adr4 = adrz4
UID_TMP.uid_adr5 = adrz5
UID_TMP.uid_adr6 = adrz6
UID_TMP.uid_stufe = Stufe
UID_TMP.uid_pruefungstool = "FINANZONLINE"
UID_TMP.SAVE()
If (returnInt = 0) Then 'OK
If SaveErgInAdressen Then
Dim UID_KUNDE As New cKundenveranlagungUID(kdnr, UstIdKz)
UID_KUNDE.UstIdGeprüft = Now.ToShortDateString
UID_KUNDE.SAVE()
End If
End If
Return UID_TMP
End If
If showErr Then MsgBox(GetCodeText(returnInt))
Catch ex As Exception
If showErr Then MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
' Call_Web_Service_MethodUID_Logout_NEU2020()
End Try
End If
Return Nothing
@@ -336,6 +438,7 @@ Public Class cFinanzOnlineWebService
UID_TMP.uid_adr4 = adrz4
UID_TMP.uid_adr5 = adrz5
UID_TMP.uid_adr6 = adrz6
UID_TMP.uid_typ = "UID"
UID_TMP.uid_stufe = Stufe

View File

@@ -956,6 +956,8 @@ Public Class cMSEAPI
rest.AddQueryParam("start_date", startDate.ToString("yyyy-MM-dd"))
rest.AddQueryParam("end_date", end_date.ToString("yyyy-MM-dd"))
'rest.AddQueryParam("end_date", "2026-03-17")
rest.AddHeader("X-API-Key", jwt)
rest.IdleTimeoutMs = 1000000

View File

@@ -393,6 +393,7 @@
<Compile Include="AuditFlow\Classes\cAuditFlow.vb" />
<Compile Include="AuditFlow\Classes\cAuditFlow_Pruefobjekte.vb" />
<Compile Include="AuditFlow\Classes\cAuditFlow_Pruefungen.vb" />
<Compile Include="Classes\cKundenveranlagungUID.vb" />
<Compile Include="Classes\cMDMEInarbeitung.vb" />
<Compile Include="Classes\cMDMZinsberechnung.vb" />
<Compile Include="Classes\cKundenportal.vb" />

View File

@@ -30,6 +30,9 @@ Public Class cSicherheiten
Property gs_MRNNr As Object = Nothing
Property gs_posSubNr As Object = Nothing
Property gs_VeralteteWeitereRegistriernummer As Object = Nothing
Property gs_dakoyimport As Boolean = False
Property gs_EH_Anzahl As Object = Nothing
Property gs_DK_laufnr As Object = Nothing
Public hasEntry = False
@@ -48,6 +51,15 @@ Public Class cSicherheiten
LOADSubNr()
End Sub
Sub New(gs_gsID, gs_posNr, gs_posSubNr, gs_DK_laufnr)
Me.gs_gsId = gs_gsID
Me.gs_posNr = gs_posNr
Me.gs_posSubNr = gs_posSubNr
Me.gs_DK_laufnr = gs_DK_laufnr
LOADDakosyLaufNr()
End Sub
Sub New(gs_gsNr)
Me.gs_gsNr = gs_gsNr
LOADGSNR()
@@ -85,6 +97,9 @@ Public Class cSicherheiten
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_systemuser", gs_systemuser))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_MRNNr", gs_MRNNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_VeralteteWeitereRegistriernummer", gs_VeralteteWeitereRegistriernummer))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_dakoyimport", gs_dakoyimport))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_EH_Anzahl", gs_EH_Anzahl))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_DK_laufnr", gs_DK_laufnr))
If Not WithoutPosSubNr Then list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posSubNr", gs_posSubNr))
Return list
@@ -193,6 +208,36 @@ Public Class cSicherheiten
End Try
End Sub
Public Sub LOADDakosyLaufNr()
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheit] WHERE gs_gsId=@gs_gsId AND gs_posNr=@gs_posNr AND gs_DK_laufnr=@gs_DK_laufnr ", conn)
cmd.Parameters.AddWithValue("@gs_gsID", gs_gsId)
cmd.Parameters.AddWithValue("@gs_posNr", gs_posNr)
cmd.Parameters.AddWithValue("@gs_DK_laufnr", gs_DK_laufnr)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
If dr.Item(li.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(li.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using
End Using
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
End Sub
Public Sub LOADGSNR()
Try