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

div Änderungen (Mailsender, MDM-Einarbeitung, USTVA, Aufschubkonen,etc.)

Browse Source
This commit is contained in:
d.breimaier
2026-10-06 10:19:35 +02:00
parent c174cd55c7
commit c22a536646
2 changed files with 86 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
View File

@@ -590,7 +590,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Case 2
'------------------------------------------
'------------------ PDF ------------------
'---- PDF - RECHNUNGEN AUS PDF-Datensatz --
'------------------------------------------
If fi.Extension.ToLower = ".pdf" Then
@@ -728,6 +728,10 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Case 3
'------------------------------------------
'---- PDF - Anhänge AUS PDF-Datensatz -----
'------------------------------------------
If (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso fi.Name.ToString.Contains("ALL")) Then 'bekommen wir diese PDFS noch??
@@ -757,7 +761,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
RMC.SAVE()
End If
frmStartOptions.moveFile_DateBack(fileNamePath, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
frmStartOptions.moveFile_DateBack(fileNamePath, zielpfad & "Attachments_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
dgvEinarbeitung.Refresh()
found = True
@@ -768,32 +772,54 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Dim fileNameMauteets As String = fi.Name
fileNameMauteets = fileNameMauteets.Replace("mauteets_", "")
Dim kdNr As String = fileNameMauteets.Substring(0, 5)
Dim mautteetsDate As String = ""
Dim mauteetsCountry As String = ""
' Dateiendung entfernen
Dim fileNameWithoutExtension As String = Path.GetFileNameWithoutExtension(fileNameMauteets)
'22424_302753_20260808_IT_orig_bto.pdf
' Dateiname anhand "_" aufteilen
Dim parts() As String = fileNameWithoutExtension.Split("_"c)
mautteetsDate = fileNameMauteets.Substring(13, 8)
mauteetsCountry = fileNameMauteets.Substring(23, 2)
Dim kdNr As String = parts(0)
Dim mautteetsDate As String = parts(2)
Dim mauteetsCountry As String = parts(3)
Dim parsedDate As DateTime = DateTime.ParseExact(fileNameMauteets, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture)
' Datum aus yyyyMMdd
Dim parsedDate As DateTime = DateTime.ParseExact(mautteetsDate, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture)
Dim isBTO As Boolean = False
If fileNameMauteets.ToString.ToLower.Contains("bto") Then
isBTO = True
' Nächsthöheres RMC-Datum ermitteln:
' 01. - 14. -> 15. des Monats
' 15. - Monatsende -> Monatsende
' Monatsende -> 15. des Folgemonats
Dim getNextRMCDate As Date
Dim tag15 As Date = New Date(parsedDate.Year, parsedDate.Month, 15)
Dim monatsende As Date = New Date(parsedDate.Year, parsedDate.Month, 1).AddMonths(1).AddDays(-1)
If parsedDate < tag15 Then
getNextRMCDate = tag15
ElseIf parsedDate < monatsende Then
getNextRMCDate = monatsende
Else
getNextRMCDate = New Date(parsedDate.Year, parsedDate.Month, 1).AddMonths(1).AddDays(14)
End If
' BTO prüfen
Dim isBTO As Boolean = parts.Any(Function(p) p.Equals("bto", StringComparison.OrdinalIgnoreCase)
)
Dim RMC As New cRMC(kdNr, parsedDate.ToString("dd.MM.yyyy"), mauteetsCountry, isBTO)
Dim RMC As New cRMC(kdNr, getNextRMCDate.ToString("dd.MM.yyyy"), mauteetsCountry, isBTO)
If RMC.hasEntry AndAlso RMC.rmc_daId_InvAtt Is Nothing Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC_ATT", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath))
DS.uploadDataToDATENSERVER(fileNamePath,,,,,, True)
RMC.rmc_daId_InvAtt = DS.da_id
RMC.SAVE()
End If
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC_ATT", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath))
DS.uploadDataToDATENSERVER(fileNamePath,,,,,, True)
RMC.rmc_daId_InvAtt = DS.da_id
RMC.SAVE()
End If
frmStartOptions.moveFile_DateBack(fileNamePath, zielpfad & "Attachments_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
dgvEinarbeitung.Refresh()
found = True
End If