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

Asfinag, Plose, etc.

Browse Source
This commit is contained in:
d.breimaier
2025-10-08 10:27:05 +02:00
parent bb9ec487cf
commit 3fa7fdee27
5 changed files with 930 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
initATLASAufschubkonten/cAsfinag.vb
View File

@@ -1966,6 +1966,8 @@ Public Class cAsfinag
MDMEinarb.ds_total = savedTrans
MDMEinarb.ds_count = counTrans
MDMEinarb.importfilename = fi.Name
MDMEinarb.import_date = Now()
If MDMEinarb.ds_total = MDMEinarb.ds_count Then
MDMEinarb.completed = True

2
initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb
View File

@@ -713,6 +713,8 @@ Public Class frmMDMNachrichtenVerarbeitung
MDMEinarb.ds_total = counTrans
MDMEinarb.ds_count = savedTrans
MDMEinarb.importfilename = fi.Name
MDMEinarb.import_date = Now()
If MDMEinarb.ds_total = MDMEinarb.ds_count Then
MDMEinarb.completed = True

87
initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
View File

@@ -529,12 +529,13 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
End If
Dim dt As New DataTable
Dim loopInt As Int16 = 2
Dim deleteTable As Boolean = False
Dim verarbeitungspfad, zielpfad
If programName.Contains("RMC") Then
verarbeitungspfad = rmc.VERARBEITUNG_PFAD
zielpfad = rmc.ZIEL_PFAD
loopInt = 3
dt.Columns.Add("KundenNr", GetType(String))
dt.Columns.Add("UID", GetType(String))
@@ -547,7 +548,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
zielpfad = ids.ZIEL_PFAD
End If
For i = 1 To 2
For i = 1 To loopInt
For Each d In System.IO.Directory.GetFiles(verarbeitungspfad)
Try
@@ -587,8 +588,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
'File in Datenarchiv sichern:
'd.breimaier: 2024-06-05 aktuell nur die RMC-Dateien! (später, wenn CSV vollständig, dann alle PDFs importieren!
'd.breimaier: 2024-06-17 laut Christian Schuster von Comcore (EDV-BEtr. von RMC) nicht möglich CSV mit easytrip und sofico Datensätzen zu ergängen!
'd.breimaier: 2025-09-15 laut Christian Schuster erhalten wir nun die Rechnungen mit folgenden Aufbau:
'd.breimaier: 2025-09-15 laut Christian Schuster erhalten wir nun die Rechnungen mit folgenden Aufbau:
'• fixwert invoice
'• Kundennummer 26807 (in der CSV enthalten)
@@ -601,8 +601,6 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Dim fileNamePath As String = d
'If fi.Name.ToString.StartsWith("invoice_") Then
If RMCNewFormat Then
Dim destFilename As String = fi.FullName
@@ -617,16 +615,22 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
If fi.Name.ToString.StartsWith("invoice_") OrElse (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso Not fi.Name.ToString.Contains("ALL")) Then 'RMC Eigenrechnungen
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath))
DS.uploadDataToDATENSERVER(fileNamePath,,,,,, True)
If fi.Name.ToString.StartsWith("invoice_") Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath))
DS.uploadDataToDATENSERVER(fileNamePath,,,,,, True)
SQL.doSQL("Update [tblRMCImport] SET [rmc_daId]='" & DS.da_id & "' where [rmc_pdfFileName] = '" & DS.da_name & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL")
ElseIf (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso Not fi.Name.ToString.Contains("ALL")) Then 'EasyTrip IT Rechnungen
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath))
DS.uploadDataToDATENSERVER(fileNamePath,,,,,, True)
'EasyTrip sollen mit der Pos-Liste gemerged werden!!!
Dim fileNameEasyTrip As String = fi.Name
fileNameEasyTrip = fileNameEasyTrip.Replace("maut_", "")
@@ -680,12 +684,12 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Dim adress As New VERAG_PROG_ALLGEMEIN.cAdressen(RMC.rmc_UID, RMC.rmc_kdNr)
If Not adress.hasEntry Then
Dim R As DataRow = dt.NewRow
If Not adress.hasEntry Then
Dim R As DataRow = dt.NewRow
R("KundenNr") = RMC.rmc_kdNr
R("UID") = RMC.rmc_UID
dt.Rows.Add(R)
End If
dt.Rows.Add(R)
End If
End If
@@ -694,23 +698,60 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
End If
'copy file to lydia
If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
Dim filepathToLydia = IIf(rmc.PDFRECHNUNGEN <> "", rmc.PDFRECHNUNGEN, "\\share01\F\Juricevic Datensicherung\RMC_RECHNUNGEN\")
If fileNamePath.ToString.ToLower.Contains("nto") Then
frmStartOptions.copyFile(fileNamePath, filepathToLydia & "NETTO\")
Else
frmStartOptions.copyFile(fileNamePath, filepathToLydia & "BRUTTO\")
End If
End If
'copy file to lydia - nicht mehr notwendig!!!
'If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
' Dim filepathToLydia = IIf(rmc.PDFRECHNUNGEN <> "", rmc.PDFRECHNUNGEN, "\\share01\F\Juricevic Datensicherung\RMC_RECHNUNGEN\")
' If fileNamePath.ToString.ToLower.Contains("nto") Then
' frmStartOptions.copyFile(fileNamePath, filepathToLydia & "NETTO\")
' Else
' frmStartOptions.copyFile(fileNamePath, filepathToLydia & "BRUTTO\")
' End If
'End If
End If
Case 3
If (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso fi.Name.ToString.Contains("ALL")) Then
Dim fileNamePath As String = d
Dim fileNameEasyTrip As String = fi.Name
fileNameEasyTrip = fileNameEasyTrip.Replace("maut_", "")
fileNameEasyTrip = fileNameEasyTrip.Replace("EGR_con", "")
Dim indexOfFIT = fileNameEasyTrip.LastIndexOf("FITFIT") + 3
Dim kdNr As String = fileNameEasyTrip.Substring(0, 5)
Dim invoiceNo As String = "" 'FIT2002A25-079939
Dim invoiceDate As String = "" '20250908
invoiceNo = fileNameEasyTrip.Substring(indexOfFIT, 17)
invoiceDate = fileNameEasyTrip.Substring(indexOfFIT + 17, 8)
Dim parsedDate As DateTime = DateTime.ParseExact(invoiceDate, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture)
Dim RMC As New cRMC(kdNr, invoiceNo, parsedDate.ToString("dd.MM.yyyy")) 'easytry über Filename anlegen!
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
frmStartOptions.moveFile_DateBack(fileNamePath, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
dgvEinarbeitung.Refresh()
End If
End Select

1701
initATLASAufschubkonten/frmStartOptions.Designer.vb generated
View File

File diff suppressed because it is too large Load Diff

5
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -699,6 +699,7 @@ Public Class frmStartOptions
End If
MDMEinarb.import_date = Now()
MDMEinarb.importfilename = "API_BatchNr_" & batchrequestNr & "_totalPages_" & totalPages
MDMEinarb.SAVE()
closeMe()
End If
@@ -6818,4 +6819,8 @@ repeatRequest:
End If
End Sub
Private Sub LinkLabel54_LinkClicked_1(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lblPlosefoppelteIMporte.LinkClicked
cPLOSE_Inv_Data.checkImport()
End Sub
End Class