From 4b4a4a328628b51e0f0cfe79b94994f714e84203 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 6 Dec 2023 16:29:06 +0100 Subject: [PATCH] asfinag --- initATLASAufschubkonten/cAsfinag.vb | 44 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/initATLASAufschubkonten/cAsfinag.vb b/initATLASAufschubkonten/cAsfinag.vb index 698daf8..5bf7c15 100644 --- a/initATLASAufschubkonten/cAsfinag.vb +++ b/initATLASAufschubkonten/cAsfinag.vb @@ -1,6 +1,8 @@ Imports System.Data.SqlClient +Imports System.Globalization Imports System.IO Imports System.Reflection +Imports System.Text.RegularExpressions Imports VERAG_PROG_ALLGEMEIN Public Class cAsfinag @@ -1123,14 +1125,13 @@ Public Class cAsfinag Using sw As New StreamWriter(File.Open(strFile, FileMode.OpenOrCreate)) - With Header .SortField = "000" .RecordID = "00" .FileName = fileName .LiveTestIndicator = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "T", "L") 'T für Testfile, L Livesystem - .FileCreationDate = Today.ToString("yyyymmdd") - .FileCreationTime = Now().ToString("hhmm") + .FileCreationDate = Today.ToString("yyyyMMdd", CultureInfo.CurrentCulture) + .FileCreationTime = Now().ToString("HHmm", CultureInfo.CurrentCulture) .RunNumber = Format(currentFileNr, "000") .SenderID = "VG" .ReceiverID = "EP" @@ -1275,8 +1276,8 @@ Public Class cAsfinag .RecordID = "00" .FileName = fileName .LiveTestIndicator = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "T", "L") 'T für Testfile, L Livesystem - .FileCreationDate = Today.ToString("yyyymmdd") - .FileCreationTime = Now().ToString("hhmm") + .FileCreationDate = Today.ToString("yyyyMMdd", CultureInfo.CurrentCulture) + .FileCreationTime = Now().ToString("HHmm", CultureInfo.CurrentCulture) .RunNumber = Format(currentFileNr, "000") .SenderID = "VG" .ReceiverID = "EP" @@ -1296,12 +1297,9 @@ Public Class cAsfinag lngAnzahlSätze = 1 For Each row As DataRow In dt.Rows - - lngAnzahlSätze = lngAnzahlSätze + 1 With Body If Not IsDBNull(row.Item("NewCardNumber")) Then If Not row.Item("NeueKartenNrGemeldet") Then - lngAnzahlSätze = lngAnzahlSätze + 1 .SortField = "000" .RecordID = "40" @@ -1671,24 +1669,24 @@ Public Class cAsfinag 'If dtAsfinag.Rows.Count = 0 Then With clfArchiv - .PKFileName = fi.Name - .RecordType = Trim(Mid(strZeile, 1, 2)) - .fileVersion = Trim(Mid(strZeile, 3, 2)) - .fileNumber = Trim(Mid(strZeile, 5, 3)) - .cardNumber = Trim(Mid(strZeile, 9, 22)) - .validTo = Trim(Mid(strZeile, 31, 4)) + .PKFileName = fi.Name + .RecordType = Trim(Mid(strZeile, 1, 2)) + .fileVersion = Trim(Mid(strZeile, 3, 2)) + .fileNumber = Trim(Mid(strZeile, 5, 3)) + .cardNumber = Trim(Mid(strZeile, 9, 22)) + .validTo = Trim(Mid(strZeile, 31, 4)) '.OBUID = Trim(Mid(strZeile, 35, 18)) .vehicleLicensePlate = Trim(Mid(strZeile, 53, 10)) .nationality = Trim(Mid(strZeile, 63, 3)) - .vehicleCategory = Trim(Mid(strZeile, 66, 1)) - .emissionCategory = Trim(Mid(strZeile, 67, 2)) - .status = Trim(Mid(strZeile, 69, 2)) - .contractDate = DateSerial(Mid(strZeile, 71, 4), Mid(strZeile, 75, 2), Mid(strZeile, 77, 2)) - .engineCharacteristics = Trim(Mid(strZeile, 79, 3)) - .CO2EmissionsClass = Trim(Mid(strZeile, 82, 1)) - .contractType = Trim(Mid(strZeile, 83, 1)) - .SAVE() - End With + .vehicleCategory = Trim(Mid(strZeile, 66, 1)) + .emissionCategory = Trim(Mid(strZeile, 67, 2)) + .status = Trim(Mid(strZeile, 69, 2)) + .contractDate = DateSerial(Mid(strZeile, 71, 4), Mid(strZeile, 75, 2), Mid(strZeile, 77, 2)) + .engineCharacteristics = Trim(Mid(strZeile, 79, 3)) + .CO2EmissionsClass = Trim(Mid(strZeile, 82, 1)) + .contractType = Trim(Mid(strZeile, 83, 1)) + .SAVE() + End With 'End If ' For Each r As DataRow In dtAsfinag.Rows