From 6ed2f79fe0a644da586cd5d5057e6f98f9afe0ca Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 30 Aug 2023 17:19:36 +0200 Subject: [PATCH] Asfinag_Datenaustausch --- initATLASAufschubkonten/cAsfinag.vb | 151 ++-- ...sfinag_NachrichtenVerarbeitung.Designer.vb | 42 +- .../frmAsfinag_NachrichtenVerarbeitung.vb | 676 ++++++++++++------ .../frmStartOptions.Designer.vb | 176 ++--- initATLASAufschubkonten/frmStartOptions.resx | 195 ++--- initATLASAufschubkonten/frmStartOptions.vb | 23 + 6 files changed, 778 insertions(+), 485 deletions(-) diff --git a/initATLASAufschubkonten/cAsfinag.vb b/initATLASAufschubkonten/cAsfinag.vb index 9fc9cab..af620ae 100644 --- a/initATLASAufschubkonten/cAsfinag.vb +++ b/initATLASAufschubkonten/cAsfinag.vb @@ -1,5 +1,6 @@ Imports System.Data.SqlClient Imports System.Reflection +Imports System.Security.Cryptography Imports DocumentFormat.OpenXml.VariantTypes Public Class cAsfinag @@ -7,14 +8,14 @@ Public Class cAsfinag Public Class CLFHeader Property PKFileName As Object = Nothing - Property recordType As Integer + Property recordType As String Property fileVersion As Integer Property fileNumber As Integer - Property inidcator As Object = Nothing + Property indcator As Object = Nothing Property senderID As Object = Nothing Property receiverID As Object = Nothing - Property fileCreationDate As Object = Nothing - Property fileCreationTime As Object = Nothing + Property fileCreationDate As DateTime + Property fileCreationTime As DateTime Property ISOCountryCode As Object = Nothing Property creationName As Object = Nothing @@ -22,17 +23,23 @@ Public Class cAsfinag Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Sub New(PKFileName) + Sub New(PKFileName, fileNumber) Me.PKFileName = PKFileName + Me.fileNumber = fileNumber LOAD() End Sub + + Sub New() + + 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("PKFileName", PKFileName)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileNumber", fileNumber)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("recordType", recordType)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileVersion", fileversion)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileNumber", filenumber)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("inidcator", inidcator)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileVersion", fileVersion)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("indcator", indcator)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("senderID", senderID)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("receiverID", receiverID)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileCreationDate", fileCreationDate)) @@ -46,7 +53,7 @@ Public Class cAsfinag Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM CLFHeader WHERE PKFileName=@PKFileName AND filenumber = @filenumber) " & + Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM CLFHeader WHERE PKFileName=@PKFileName AND fileNumber = @fileNumber) " & " BEGIN " & getUpdateCmd() & " End " & " Else " & " BEGIN " & getInsertCmd() & " End " & @@ -59,8 +66,9 @@ Public Class cAsfinag Try hasEntry = False Using conn As SqlConnection = SQL.GetNewOpenConnectionAsfinag() - Using cmd As New SqlCommand("Select * FROM CLFHeader WHERE PKFileName=@PKFileName AND filenumber = @filenumber ", conn) + Using cmd As New SqlCommand("Select * FROM CLFHeader WHERE PKFileName=@PKFileName AND fileNumber = @fileNumber", conn) cmd.Parameters.AddWithValue("@PKFileName", PKFileName) + cmd.Parameters.AddWithValue("@filenumber", fileNumber) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -96,7 +104,7 @@ Public Class cAsfinag End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [CLFHeader] SET " & str & " WHERE PKFileName=@PKFileName AND filenumber = @filenumber") + Return (" UPDATE [CLFHeader] SET " & str & " WHERE PKFileName=@PKFileName ") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -130,10 +138,10 @@ Public Class cAsfinag Public Class CLFBody Property PKFileName As Object = Nothing - Property recordType As Integer + Property RecordType As String Property fileVersion As Integer Property fileNumber As Integer - Property cardNumber As Integer + Property cardNumber As String Property validTo As Integer Property OBUID As Object = Nothing Property vehicleLicensePlate As Object = Nothing @@ -142,22 +150,24 @@ Public Class cAsfinag Property emissionCategory As Object = Nothing Property status As Object = Nothing Property contractDate As Object = Nothing - + Property PKLine As Long Public hasEntry = False Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Sub New(PKFileName) + Sub New(PKFileName, PKLine) Me.PKFileName = PKFileName + Me.PKLine = PKLine 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("PKFileName", PKFileName)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("recordType", recordType)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PKLine", PKLine)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("RecordType", recordType)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileVersion", fileVersion)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileNumber", filenumber)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileNumber", fileNumber)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("cardNumber", cardNumber)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("validTo", validTo)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OBUID", OBUID)) @@ -168,13 +178,14 @@ Public Class cAsfinag list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("status", status)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("contractDate", contractDate)) + Return list End Function Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM CLFBody WHERE PKFileName=@PKFileName AND filenumber = @filenumber) " & + Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM CLFBody WHERE PKFileName=@PKFileName AND PKLine = @PKLine) " & " BEGIN " & getUpdateCmd() & " End " & " Else " & " BEGIN " & getInsertCmd() & " End " & @@ -187,8 +198,9 @@ Public Class cAsfinag Try hasEntry = False Using conn As SqlConnection = SQL.GetNewOpenConnectionAsfinag() - Using cmd As New SqlCommand("Select * FROM CLFBody WHERE PKFileName=@PKFileName AND filenumber = @filenumber ", conn) + Using cmd As New SqlCommand("Select * FROM CLFBody WHERE PKFileName=@PKFileName AND PKLine = @PKLine ", conn) cmd.Parameters.AddWithValue("@PKFileName", PKFileName) + cmd.Parameters.AddWithValue("@PKLine", PKLine) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -224,7 +236,7 @@ Public Class cAsfinag End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [CLFBody] SET " & str & " WHERE PKFileName=@PKFileName AND filenumber = @filenumbere ") + Return (" UPDATE [CLFBody] SET " & str & " WHERE PKFileName=@PKFileName AND PKLine = @PKLine ") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -259,10 +271,10 @@ Public Class cAsfinag End Class - Public Class CLTrailer + Public Class CLFTrailer Property PKFileName As Object = Nothing - Property recordType As Integer + Property recordType As String Property fileVersion As Integer Property fileNumber As Integer Property recordCount As Integer @@ -291,7 +303,7 @@ Public Class cAsfinag Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM CLFTrailer WHERE _BASE_id=@_BASE_id) " & + Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM CLFTrailer WHERE PKFileName=@PKFileName) " & " BEGIN " & getUpdateCmd() & " End " & " Else " & " BEGIN " & getInsertCmd() & " End " & @@ -304,7 +316,7 @@ Public Class cAsfinag Try hasEntry = False Using conn As SqlConnection = SQL.GetNewOpenConnectionAsfinag() - Using cmd As New SqlCommand("Select * FROM CLFTrailer WHERE PKFileName=@PKFileName AND filenumber = @filenumber ", conn) + Using cmd As New SqlCommand("Select * FROM CLFTrailer WHERE PKFileName=@PKFileName", conn) cmd.Parameters.AddWithValue("@PKFileName", PKFileName) Dim dr = cmd.ExecuteReader() If dr.Read Then @@ -341,7 +353,7 @@ Public Class cAsfinag End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [CLFTrailer] SET " & str & " WHERE PKFileName=@PKFileName AND filenumber = @filenumbere ") + Return (" UPDATE [CLFTrailer] SET " & str & " WHERE PKFileName=@PKFileName") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -381,33 +393,36 @@ Public Class cAsfinag Property recordType As Integer Property fileVersion As Integer Property fileNumber As Integer - Property inidcator As Object = Nothing Property senderID As Object = Nothing Property receiverID As Object = Nothing - Property fileCreationDate As Object = Nothing - Property fileCreationTime As Object = Nothing + Property fileCreationDate As DateTime + Property fileCreationTime As DateTime Property ISOCountryCode As Object = Nothing + Property description As Object = Nothing + Property currencyCode As Object = Nothing Public hasEntry = False Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Sub New(PKFileName) + Sub New(PKFileName, filenummer) Me.PKFileName = PKFileName + Me.fileNumber = filenummer 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("PKFileName", PKFileName)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("recordType", recordType)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileversion", fileversion)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("filenumber", filenumber)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("inidcator", inidcator)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileVersion", fileVersion)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileNumber", fileNumber)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("senderID", senderID)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("receiverID", receiverID)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileCreationDate", fileCreationDate)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileCreationTime", fileCreationTime)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ISOCountryCode", ISOCountryCode)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("description", description)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("currencyCode", currencyCode)) Return list End Function @@ -415,7 +430,7 @@ Public Class cAsfinag Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM TTRHeader WHERE PKFileName=@PKFileName AND filenumber = @filenumber) " & + Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM TTRHeader WHERE PKFileName=@PKFileName AND fileNumber = @fileNumber) " & " BEGIN " & getUpdateCmd() & " End " & " Else " & " BEGIN " & getInsertCmd() & " End " & @@ -428,8 +443,9 @@ Public Class cAsfinag Try hasEntry = False Using conn As SqlConnection = SQL.GetNewOpenConnectionAsfinag() - Using cmd As New SqlCommand("Select * FROM TTRHeader WHERE PKFileName=@PKFileName AND filenumber = @filenumber ", conn) + Using cmd As New SqlCommand("Select * FROM TTRHeader WHERE PKFileName=@PKFileName AND fileNumber = @fileNumber ", conn) cmd.Parameters.AddWithValue("@PKFileName", PKFileName) + cmd.Parameters.AddWithValue("@fileNumber", fileNumber) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -501,9 +517,9 @@ Public Class cAsfinag Property PKFileName As Object = Nothing Property recordType As Integer Property fileVersion As Integer - Property siteId As Integer + Property siteId As String Property fileNumber As Integer - Property cardNumber As Integer + Property cardNumber As String Property fileCreationDate As Date Property deliveryNoteNumber As Integer Property deliveryDate As Date @@ -514,33 +530,48 @@ Public Class cAsfinag Property amountInclVAT As Double Property VATrate As Double Property VATamount As Double + Property PKLine As Integer + Property km As Integer + Property driverId As Integer + Property receiptNumber As String + Property OBUID As String Public hasEntry = False Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Sub New(PKFileName) + Sub New() + + End Sub + + Sub New(PKFileName, PKLine) Me.PKFileName = PKFileName + Me.PKLine = PKLine 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("PKFileName", PKFileName)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PKLine", PKLine)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileVersion", fileVersion)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("recordType", recordType)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileversion", fileversion)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("siteId", siteId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileNumber", fileNumber)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("cardNumber", cardNumber)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileCreationDate", fileCreationDate)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("deliveryNoteNumber", deliveryNoteNumber)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("cardNumber", cardNumber)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("deliveryDate", deliveryDate)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("deliveryTime", deliveryTime)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("transactionType", transactionType)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("productCode", productCode)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("km", km)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("driverId", driverId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("productQuantity", productQuantity)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("amountInclVAT", amountInclVAT)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VATrate", VATrate)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VATamount", VATamount)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("receiptNumber", receiptNumber)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OBUID", OBUID)) Return list End Function @@ -548,7 +579,7 @@ Public Class cAsfinag Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM TTRBody WHERE PKFileName=@PKFileName AND filenumber = @filenumber) " & + Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM TTRBody WHERE PKFileName=@PKFileName AND PKLine = @PKLine) " & " BEGIN " & getUpdateCmd() & " End " & " Else " & " BEGIN " & getInsertCmd() & " End " & @@ -561,8 +592,9 @@ Public Class cAsfinag Try hasEntry = False Using conn As SqlConnection = SQL.GetNewOpenConnectionAsfinag() - Using cmd As New SqlCommand("Select * FROM TTRBody WHERE PKFileName=@PKFileName AND filenumber = @filenumber ", conn) + Using cmd As New SqlCommand("Select * FROM TTRBody WHERE PKFileName=@PKFileName AND PKLine = @PKLine ", conn) cmd.Parameters.AddWithValue("@PKFileName", PKFileName) + cmd.Parameters.AddWithValue("@PKLine", PKLine) Dim dr = cmd.ExecuteReader() If dr.Read Then For Each li In getParameterList() @@ -598,7 +630,7 @@ Public Class cAsfinag End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [TTRBody] SET " & str & " WHERE PKFileName=@PKFileName AND filenumber = @filenumbere ") + Return (" UPDATE [TTRBody] SET " & str & " WHERE PKFileName=@PKFileName AND PKLine = @PKLine ") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -642,8 +674,6 @@ Public Class cAsfinag Property checksumProductQuantity As Double Property checksumAmounntInclVAT As Double - - Public hasEntry = False Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -656,8 +686,7 @@ Public Class cAsfinag Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PKFileName", PKFileName)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("recordType", recordType)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileversion", fileversion)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("filenumber", filenumber)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("fileVersion", fileVersion)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("recordCount", recordCount)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("checksumProductQuantity", checksumProductQuantity)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("checksumAmounntInclVAT", checksumAmounntInclVAT)) @@ -668,7 +697,7 @@ Public Class cAsfinag Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM TTRTrailer WHERE _BASE_id=@_BASE_id) " & + Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM TTRTrailer WHERE PKFileName=@PKFileName) " & " BEGIN " & getUpdateCmd() & " End " & " Else " & " BEGIN " & getInsertCmd() & " End " & @@ -681,7 +710,7 @@ Public Class cAsfinag Try hasEntry = False Using conn As SqlConnection = SQL.GetNewOpenConnectionAsfinag() - Using cmd As New SqlCommand("Select * FROM TTRTrailer WHERE PKFileName=@PKFileName AND filenumber = @filenumber ", conn) + Using cmd As New SqlCommand("Select * FROM TTRTrailer WHERE PKFileName=@PKFileName", conn) cmd.Parameters.AddWithValue("@PKFileName", PKFileName) Dim dr = cmd.ExecuteReader() If dr.Read Then @@ -718,7 +747,7 @@ Public Class cAsfinag End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [TTRTrailer] SET " & str & " WHERE PKFileName=@PKFileName AND filenumber = @filenumbere ") + Return (" UPDATE [TTRTrailer] SET " & str & " WHERE PKFileName=@PKFileName") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -759,4 +788,28 @@ Public Class cAsfinag End Function End Class + + Shared Function fktMod10Prüfziffer(strNummer As String) As String + ' Der Funktion wird im Feld strNummer der Wert ohne Prüfziffer übergeben. + ' Die Funktion berechnet und liefert die Prüfziffer zurück. + + Dim intIX As Integer + Dim intZSum As Integer + Dim intSum As Integer + Dim boo1 As Boolean + + For intIX = Len(strNummer) To 1 Step -1 + intZSum = IIf(boo1, Mid(strNummer, intIX, 1) * 1, Mid(strNummer, intIX, 1) * 2) + If intZSum < 10 Then + intSum = intSum + intZSum + Else + intSum = intSum + ((intZSum Mod 10) + ((intZSum - (intZSum Mod 10)) / 10)) + End If + boo1 = Not boo1 + Next intIX + + fktMod10Prüfziffer = CStr((10 - (intSum Mod 10)) Mod 10) + + End Function + End Class diff --git a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.Designer.vb b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.Designer.vb index f5dc429..7154f4d 100644 --- a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.Designer.vb +++ b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.Designer.vb @@ -23,13 +23,11 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmTRNCTS_NachrichtenVerarbeitung)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAsfinag_NachrichtenVerabeitung)) Me.btn = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() Me.lblDatenCnt = New System.Windows.Forms.Label() Me.dgvEinarbeitung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Label9 = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.Label7 = New System.Windows.Forms.Label() @@ -40,6 +38,8 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.btnOK = New System.Windows.Forms.Button() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() + Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.pnl.SuspendLayout() CType(Me.dgvEinarbeitung, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -111,18 +111,6 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.dgvEinarbeitung.Size = New System.Drawing.Size(291, 145) Me.dgvEinarbeitung.TabIndex = 18 ' - 'clmnArt - ' - Me.clmnArt.HeaderText = "Art" - Me.clmnArt.Name = "clmnArt" - Me.clmnArt.Width = 150 - ' - 'Column1 - ' - Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.Column1.HeaderText = "BezugsNr" - Me.Column1.Name = "Column1" - ' 'Label9 ' Me.Label9.AutoSize = True @@ -210,9 +198,9 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label2.Location = New System.Drawing.Point(8, 8) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(222, 13) + Me.Label2.Size = New System.Drawing.Size(231, 13) Me.Label2.TabIndex = 8 - Me.Label2.Text = "Einarbeitung der Nachrichtendaten von MAVI" + Me.Label2.Text = "Einarbeitung der Nachrichtendaten von Asfinag" ' 'Label1 ' @@ -224,7 +212,19 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.Label1.TabIndex = 8 Me.Label1.Text = "Einarbeitung:" ' - 'frmTRNCTS_NachrichtenVerarbeitung + 'clmnArt + ' + Me.clmnArt.HeaderText = "Dateiname" + Me.clmnArt.Name = "clmnArt" + Me.clmnArt.Width = 150 + ' + 'Column1 + ' + Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.Column1.HeaderText = "Status" + Me.Column1.Name = "Column1" + ' + 'frmAsfinag_NachrichtenVerabeitung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -232,7 +232,7 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.Controls.Add(Me.pnl) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.Name = "frmTRNCTS_NachrichtenVerarbeitung" + Me.Name = "frmAsfinag_NachrichtenVerabeitung" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "DY NachrichtenVerarbeitung" Me.pnl.ResumeLayout(False) @@ -254,7 +254,7 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Friend WithEvents Label9 As System.Windows.Forms.Label Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents dgvEinarbeitung As VERAG_PROG_ALLGEMEIN.MyDatagridview - Friend WithEvents clmnArt As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents Column1 As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents lblDatenCnt As Label + Friend WithEvents clmnArt As DataGridViewTextBoxColumn + Friend WithEvents Column1 As DataGridViewTextBoxColumn End Class diff --git a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb index 1c671a2..533ed70 100644 --- a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb @@ -4,6 +4,10 @@ Imports System.Xml Imports Renci.SshNet Imports System.Net Imports System.Text +Imports System.ComponentModel +Imports RoutineManager.cAsfinag +Imports DocumentFormat.OpenXml.Drawing.Charts +Imports DocumentFormat.OpenXml.VariantTypes Public Class frmAsfinag_NachrichtenVerabeitung Dim cntDatenEingelesen As Integer = 0 @@ -19,22 +23,23 @@ Public Class frmAsfinag_NachrichtenVerabeitung Dim PARTNERSYSTEM = "ASFINAG" Dim SERVER_Path = "" Dim SERVER_Path_TEST = "" - ' Dim BOX_VERSION = "8.8" + Dim FileType As String Dim Dateiname = "" - Sub New() + Sub New(FileType) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - + Me.FileType = FileType End Sub - Sub New(allowClose) 'autostart + Sub New(FileType, allowClose) 'autostart ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() + FileType = FileType Me.allowClose = allowClose ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. @@ -52,6 +57,8 @@ Public Class frmAsfinag_NachrichtenVerabeitung If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD) If Not IO.Directory.Exists(ERROR_PFAD) Then IO.Directory.CreateDirectory(ERROR_PFAD) + + 'Me.BOX_VERSION = NCTSTR_Worker.cDY_Paramter.GET_PARAM_ByName("BOX_VERSION", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) End Sub @@ -59,17 +66,28 @@ Public Class frmAsfinag_NachrichtenVerabeitung Private Sub frmDYNachrichtenVerarbeitung_Load(sender As Object, e As EventArgs) Handles Me.Load initPfade() - For Each d In System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD) - ListBox3.Items.Add(frmStartOptions.cut_file(d)) - Me.Refresh() - Next + + If FileType <> "" Then + + Label2.Text &= " " & FileType + + For Each d In System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD) + Dim filename = frmStartOptions.cut_file(d) + If filename.ToLower.Contains(FileType) Then + ListBox3.Items.Add(filename) + End If + + Me.Refresh() + Next + End If + End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Me.Enabled = False Try Label9.Visible = True - Dim cnt = getNachrichtenDatenFromAsfinagServices() + Dim cnt = getNachrichtenDatenFromFTP() Label9.Text = cnt & " Datensätze empfangen." Catch ex As Exception @@ -99,7 +117,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung End Sub - Function getNachrichtenDatenFromAsfinagServices() As Integer + Function getNachrichtenDatenFromFTP() As Integer Dim cnt = 0 Try Dim SERVER_Path = "" @@ -125,9 +143,16 @@ Public Class frmAsfinag_NachrichtenVerabeitung If IO.File.Exists(zielPfad) Then IO.File.Delete(f) End If - ListBox3.Items.Add(frmStartOptions.cut_file((New FileInfo(zielPfad)).Name)) 'zur Liste hinzufügen + Dim filename = frmStartOptions.cut_file((New FileInfo(zielPfad)).Name) + If filename.ToLower.Contains(FileType) Then + ListBox3.Items.Add(filename) + cnt += 1 + End If + + + 'ListBox3.Items.Add(frmStartOptions.cut_file((New FileInfo(zielPfad)).Name)) 'zur Liste hinzufügen + - cnt += 1 End If Next @@ -142,7 +167,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung End Function - Function getNachrichtenDatenFromMAVIServices_ALTERNATIV() As Integer + Function getNachrichtenDatenFromAsfinag_ALTERNATIV() As Integer Dim cnt = 0 Try For Each f In IO.Directory.GetFiles(ASFINAG_PFAD) @@ -260,7 +285,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung Sub DatenEinlesen() - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL + VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW If ListBox3.Items.Count = 0 Then Label6.Text = "Keine Daten zum Einlesen vorhanden." @@ -269,142 +294,81 @@ Public Class frmAsfinag_NachrichtenVerabeitung End If - For NACHRICHTENTYP = 1 To 10 'Nach Nachrichtentyp abarbeteiten + For Each d In System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD) - For Each d In System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD) - Try - Dateiname = d - cWorker_NCTS.Dateiname = d - If IO.File.Exists(d) Then - Dim found = False - Dim nr_id As Integer = -1 - Dim fi As FileInfo = New FileInfo(d) - If Not fi.Name.StartsWith(".") Then - - Dim alreadyMoved = False - - Dim NACHRICHTENTYP_notfound = False - - If fi.Extension.ToLower = ".xml" Then - Dim xmlWriterSettings As XmlWriterSettings = New XmlWriterSettings With {.Encoding = System.Text.Encoding.UTF8, .CheckCharacters = True} - - Dim doc As New XmlDocument() - Dim XML_Code = System.IO.File.ReadAllText(d, System.Text.UTF8Encoding.Default) - - doc.LoadXml(SanitizeXmlString(XML_Code)) - Dim VERSION As String = "" - - '------------------------------------------------------------------------------------------------------------------------------ - ' eZOLL - '------------------------------------------------------------------------------------------------------------------------------ + Try + Dim correctFile As Boolean = False + For Each i In ListBox3.Items + Dim fileName As FileInfo = New FileInfo(d) + If Equals(fileName.Name, i) Then + correctFile = True + Exit For + End If + Next - '------------------------------------------ - '------------------ Anmeldung ------------------ - '------------------------------------------ - 'MAVI: CC015B - Versandanmeldung Final - - Select Case NACHRICHTENTYP - Case 1 - 'NCTS: Versandanmeldung - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_VersandanmeldungXML_CC015B(doc) Then - If cMAVIWorker.readNCTS_VersandanmeldungXML_CC015B(PARTNERSYSTEM, Me, doc, nr_id, d) <> "" Then found = True - End If - - Case 2 - 'NCTS: Versandanmeldung - Ergänzung GUID - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_VersandanmeldungXML_CC015B_RES(doc) Then - If cMAVIWorker.readNCTS_VersandanmeldungXML_CC015B_RES(PARTNERSYSTEM, Me, doc, nr_id) <> "" Then found = True - End If - Case 3 - 'NCTS: BestätigungZoll - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_BestaetigungZollXML_CC029B(doc) Then - If cMAVIWorker.readNCTS_BestaetigungZollXML_CC029B(PARTNERSYSTEM, Me, doc, nr_id) <> "" Then found = True - End If - Case 4 - 'NCTS: Guarantee - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_BestaetigungZollXML_GUA_INF(doc) Then - If cMAVIWorker.readNCTS_BestaetigungZollXML_GUA_INF(PARTNERSYSTEM, Me, doc, nr_id) <> "" Then found = True - End If - Case 5 - 'NCTS: Ankunftsanzeige - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_BestaetigungZollXML_ARR_INF(doc) Then - If cMAVIWorker.readNCTS_BestaetigungZollXML_ARR_INF(PARTNERSYSTEM, Me, doc, nr_id) <> "" Then found = True - End If - - Case 6 - 'NCTS: Erledigungsmitteilung - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_ErledigungsmitteilungXML_CC045A(doc) Then - If cMAVIWorker.readNCTS_ErledigungsmitteilungXML_CC045A(PARTNERSYSTEM, Me, doc, nr_id) <> "" Then found = True - End If - - Case 7 - 'NCTS: Cancellation decision CC009A - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_AbbruchXML_CC009A(doc) Then - If cMAVIWorker.readNCTS_AbbruchXML_CC009A(PARTNERSYSTEM, Me, doc, nr_id) <> "" Then found = True - End If - Case 8 - 'NCTS: Declaration rejected CC016A - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_RueckweisungXML_CC016A(doc) Then - If cMAVIWorker.readNCTS_RueckweisungXML_CC016A(PARTNERSYSTEM, Me, doc, nr_id) <> "" Then found = True - End If - Case 9 - 'NCTS: No release for transit – type B CC051B - If Not found And cNCTSPartnerWorker.cMAVIGetMsgType.isTRNCTS_KeineFreigabeXML_CC051B(doc) Then - If cMAVIWorker.readNCTS_KeineFreigabeXML_CC051B(PARTNERSYSTEM, Me, doc, nr_id) <> "" Then found = True - End If + Dim found = False + Dateiname = d + If IO.File.Exists(d) And correctFile Then - Case 10 - NACHRICHTENTYP_notfound = True ' alle nciht zu verarbeitenden - End Select + Dim nr_id As Integer = -1 + + Dim fi As FileInfo = New FileInfo(d) + If Not fi.Name.StartsWith(".") Then + + Dim alreadyMoved = False + + Dim objFileRead As StreamReader = New StreamReader(d) + + If objFileRead.Peek() = -1 Then + + MsgBox("Datei hat keinen Inhalt!", + MsgBoxStyle.Information, + MsgBoxStyle.DefaultButton2 = MsgBoxStyle.OkOnly) + Exit Sub + + ElseIf FileType = "clf" Then + + If readAndSaveCLF(objFileRead, fi) Then + addDGVEinarbeitung(fi.Name, "OK") + found = True End If - Dim destPath = "" - If found Then - If Not IO.Directory.Exists(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") - frmStartOptions.moveFile(d, ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\", destPath) - cntDatenEingelesen += 1 - Else - If NACHRICHTENTYP_notfound Then - frmStartOptions.moveFile(d, ERROR_PFAD, destPath) ' nciht gefunden, oder durch ERROR nicht eingearbt,. - dsNichtErkannt += 1 - End If + ElseIf FileType = "ttr" Then + + If readAndSaveTTR(objFileRead, fi) Then + addDGVEinarbeitung(fi.Name, "OK") + found = True End If - If destPath <> "" And nr_id > 0 Then - VERAG_PROG_ALLGEMEIN.cNCTS_TR_Nachrichten.updatePath(nr_id, destPath) - End If + End If - Me.Refresh() + End If + + If found Then + If Not IO.Directory.Exists(ZIEL_PFAD & "\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(ZIEL_PFAD & "\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + frmStartOptions.moveFile(d, ZIEL_PFAD & "\" & Now.ToString("yyyyMMdd") & "\", VERARBEITUNGS_PFAD) + cntDatenEingelesen += 1 + Else + If Not found Then + frmStartOptions.moveFile(d, ERROR_PFAD, VERARBEITUNGS_PFAD) ' nciht gefunden, oder durch ERROR nicht eingearbt,. + dsNichtErkannt += 1 End If End If - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try - Next + Me.Refresh() + + End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try Next End Sub - - - Function getString(doc As XmlDocument) As Boolean - If doc.HasChildNodes Then - ' If doc.GetElementsByTagName("DakosyMessageInternal").Count > 0 Then - Dim sw = New StringWriter() - Dim xw = New XmlTextWriter(sw) - doc.WriteTo(xw) - Dim XmlString = sw.ToString() - End If - Return False - End Function - - - Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click Me.Close() End Sub @@ -424,127 +388,362 @@ Public Class frmAsfinag_NachrichtenVerabeitung End Sub + Public Function readAndSaveCLF(objFileRead As StreamReader, fi As FileInfo) As Boolean + + Dim booHeaderVorhanden = False + Dim booPrüfziffernfehler = False + Dim booInTransaktion = False + Dim booTrailerVorhanden = False + + Dim lngPKLine As Long = 0 + Dim lngRecordCount As Long + + Do While (objFileRead.Peek() > -1) + Dim strZeile = objFileRead.ReadLine() + lngRecordCount = lngRecordCount + 1 + + Select Case Mid(strZeile, 1, 2) + Case "10" + booHeaderVorhanden = True + Dim ext = CInt(fi.Extension.Remove(0, 1)) + Dim clfHeader As New cAsfinag.CLFHeader(fi.Name.ToString, ext) + With clfHeader + .PKFileName = fi.Name + .recordType = Mid(strZeile, 1, 2) + .fileVersion = Mid(strZeile, 3, 2) + .indcator = Trim(Mid(strZeile, 9, 1)) + .senderID = Trim(Mid(strZeile, 10, 6)) + .receiverID = Trim(Mid(strZeile, 16, 6)) + .fileCreationDate = DateSerial(Mid(strZeile, 22, 4), Mid(strZeile, 26, 2), Mid(strZeile, 28, 2)) + .fileCreationTime = Now() + '.fileCreationTime = DateSerial(Mid(strZeile, 22, 4), Mid(strZeile, 26, 2), Mid(strZeile, 28, 2)) & " " & TimeSerial(Mid(strZeile, 30, 2), Mid(strZeile, 32, 2), Mid(strZeile, 34, 2)) + .ISOCountryCode = Trim(Mid(strZeile, 62, 3)) + .SAVE() + End With + + Case "20" + ' Meldung bei nicht vorhandenen Haeder. + If Not booHeaderVorhanden Then + MsgBox("Datei kann wegen fehlenden Header nicht verarbeitet werden.") + objFileRead.Close() + Return False + End If + + Dim clfBody As New cAsfinag.CLFBody(fi.Name, lngPKLine) + With clfBody + .PKFileName = fi.Name + lngPKLine = lngPKLine + 1 + .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)) + .SAVE() + End With + 'CardNumber prüfen. + If (Right(clfBody.cardNumber, 1)) <> cAsfinag.fktMod10Prüfziffer(Left(clfBody.cardNumber, Len(clfBody.cardNumber) - 1)) Then + booPrüfziffernfehler = True + End If + 'strSQL = "SELECT * FROM CLFArchiv WHERE (OBUID = N'" & Trim(Mid(strZeile, 37, 18)) & "')" + 'rstCLFArchiv.Open strSQL, cnnASFINAG, adOpenStatic, adLockOptimistic, adCmdText - Function readPLOSE_Detail(d As String) As String - ' Try - ' readPLOSE_Detail = "" - ' Dim KdnR = "" + 'With rstCLFArchiv + ' If .EOF Then + ' .AddNew + ' !OBUID = Trim(Mid(strZeile, 37, 18)) + ' End If + ' !FileName = strPKFileName + ' !RecordType = Trim(Mid(strZeile, 1, 2)) + ' !RunNumber = Trim(Mid(strZeile, 3, 8)) + ' !CardNumber = Trim(Mid(strZeile, 11, 22)) + ' !ValidTo = Trim(Mid(strZeile, 33, 4)) + ' !KfzKennzeichen = Trim(Mid(strZeile, 55, 10)) + ' !Nationalität = Trim(Mid(strZeile, 65, 3)) + ' !Kategorie = Trim(Mid(strZeile, 68, 1)) + ' !Schadstoffklasse = Trim(Mid(strZeile, 69, 2)) + ' !Status = Trim(Mid(strZeile, 71, 2)) + ' !DatumVertragsabschluss = DateSerial(Mid(strZeile, 73, 4), Mid(strZeile, 77, 2), Mid(strZeile, 79, 2)) + ' .Update + ' .Close + 'End With - ' Using MyReader As New Microsoft.VisualBasic.FileIO.TextFieldParser(d, Encoding.UTF8) - ' MyReader.TextFieldType = FileIO.FieldType.Delimited - ' MyReader.SetDelimiters(";") - ' Dim currentRow As String() + ' Meldung bei Prüfziffernfehler. + If booPrüfziffernfehler Then + MsgBox("Prüfziffernfehler in Zeile " & CStr(lngRecordCount) & vbCrLf & "Datei kann nicht verarbeitet werden. " & vbNewLine & " " & fi.Name.ToString) + booInTransaktion = False + Return False - ' Dim cnt = 0 - ' If True Then + End If + Case "90" + ' Meldung bei nicht vorhandenen Haeder. + If Not booHeaderVorhanden Then + MsgBox("Datei kann wegen fehlenden Header nicht verarbeitet werden.") + objFileRead.Close() + Return False + End If - ' While Not MyReader.EndOfData - ' Try - ' currentRow = MyReader.ReadFields() + booTrailerVorhanden = True + Dim clfTrailer As New cAsfinag.CLFTrailer(fi.Name) + + With clfTrailer + .PKFileName = fi.Name + .recordType = Trim(Mid(strZeile, 1, 2)) + .fileVersion = Trim(Mid(strZeile, 3, 2)) + .fileNumber = Trim(Mid(strZeile, 5, 4)) + .recordCount = Trim(Mid(strZeile, 9, 7)) + .SAVE() + End With + ' Prüfsumme Anzahl der Sätze im File ohne Header und Trailer. + If clfTrailer.recordCount <> (lngRecordCount) Then + MsgBox("Record Count: " & clfTrailer.recordCount & vbCrLf & "Prüfsumme: " & (lngRecordCount) & vbCrLf) + objFileRead.Close() + Return False + End If - ' If currentRow.Length > 24 Then - ' Dim PLOSE As New cNCTSPartnerWorker.cPLOSE + ' Meldung bei Prüfsummenfehler. + If booPrüfziffernfehler Then + MsgBox("Datei kann wegen Prüfsummenfehler nicht verarbeitet werden.") + objFileRead.Close() + ' MsgBox strPrompt, , strPKFileName + ' ' Zurücksetzen der Transaktion. + 'cnnASFINAG.RollbackTrans + ' booInTransaktion = False + End If + Case Else + ' Andere RecordNumber überlesen. + End Select + Loop - ' PLOSE.plose_Datensatztyp = SQL.isleernothing(currentRow(0)) - ' PLOSE.plose_KodexMautTankstelle = SQL.isleernothing(currentRow(1)) - ' PLOSE.plose_BeschreibungMautTankstelle = SQL.isleernothing(currentRow(2)) - ' PLOSE.plose_KodexEinfahrt = SQL.isleernothing(currentRow(3)) - ' PLOSE.plose_BeschreibungEinfahrt = SQL.isleernothing(currentRow(4)) - ' PLOSE.plose_KodexAusfahrt = SQL.isleernothing(currentRow(5)) - ' PLOSE.plose_BeschreibungAusfahrt = SQL.isleernothing(currentRow(6)) - ' PLOSE.plose_Kartenkodex = SQL.isleernothing(currentRow(7)) - ' PLOSE.plose_Kontonummer = SQL.isleernothing(currentRow(8)) - ' PLOSE.plose_NummerKarteGeraet = SQL.isleernothing(currentRow(9)) - ' PLOSE.plose_Kennzeichen = SQL.isleernothing(currentRow(10)) - ' PLOSE.plose_InterneNrFahrzeug = SQL.isleernothing(currentRow(11)) - ' PLOSE.plose_POLSEKundennummer = SQL.isleernothing(currentRow(12)) - ' PLOSE.plose_Firmenname = SQL.isleernothing(currentRow(13)) - ' PLOSE.plose_DatumTransaktion = SQL.isleernothingDateFormatstring(currentRow(14)) - ' PLOSE.plose_Produktbeschreibung = SQL.isleernothing(currentRow(15)) - ' PLOSE.plose_Menge = SQL.isNullNothingDbl(currentRow(16)) - ' PLOSE.plose_Preis = SQL.isNullNothingDbl(currentRow(17)) - ' PLOSE.Einheitsrabatt = SQL.isleernothing(currentRow(18)) - ' PLOSE.plose_NettobetragTransaktion = SQL.isNullNothingDbl(currentRow(19)) - ' PLOSE.plose_MWSTBetrag = SQL.isNullNothingDbl(currentRow(20)) - ' PLOSE.plose_BruttobetragTransaktion = SQL.isNullNothingDbl(currentRow(21)) - ' PLOSE.plose_NettobetragWaehrungAbbuchung = SQL.isNullNothingDbl(currentRow(22)) - ' PLOSE.plose_MWSTBetragWaehrungAbbuchung = SQL.isNullNothingDbl(currentRow(23)) - ' PLOSE.plose_BruttobetragWaehrungAbbuchung = SQL.isNullNothingDbl(currentRow(24)) - ' PLOSE.plose_WaehrungLandDiesntleistung = SQL.isleernothing(currentRow(25)) - ' PLOSE.plose_WaehrungAbbuchung = SQL.isleernothing(currentRow(26)) - ' PLOSE.plose_DokumentNrQuittungUhrzeit = SQL.isleernothing(currentRow(27)) - ' PLOSE.plose_ArtTransaktion = SQL.isleernothing(currentRow(28)) - ' PLOSE.plose_Fahrzeugklasse = SQL.isleernothing(currentRow(29)) - ' PLOSE.plose_KlassenidentifikationEURO = SQL.isleernothing(currentRow(30)) - ' PLOSE.plose_ProduktbeschreibungShort = SQL.isleernothing(currentRow(31)) - ' PLOSE.plose_DokumentNrQuittungUhrzeit = SQL.isleernothing(currentRow(32)) - ' PLOSE.plose_Geraetetyp = SQL.isleernothing(currentRow(33)) - ' PLOSE.plose_ProduktCode = SQL.isleernothing(currentRow(34)) - ' PLOSE.plose_ReferenzenBuchungMaut = SQL.isleernothing(currentRow(35)) + objFileRead.Close() - ' '''''''''''' - ' If PLOSE.SAVE() Then + Return True - ' End If - - ' End If - - ' cnt += 1 - - ' 'For Each currentField In currentRow - ' 'Next - ' Catch ex As Exception - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - ' End Try - ' End While - - - ' 'Label30.Text = (cnt + 1) & " / " & LineCount - ' 'Label31.Visible = True - ' readPLOSE_Detail = "Zeilen: " & cnt - ' Else - ' MsgBox("FEHLER beim Löschen der vorhandenen OP-Liste.") - ' End If - ' End Using - - - - - ' Try - ' ' System.IO.File.Delete(p) - ' Catch ex As Exception - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - ' End Try - - ' addDGVEinarbeitung("PLOSE: Detail" & KdnR, readPLOSE_Detail) - - ' ' End Using - - ' 'End If - - ' Catch ex As Exception - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - ' MsgBox(ex.StackTrace & ex.Message) - ' readPLOSE_Detail = "" - ' End Try End Function + + + Public Function readAndSaveTTR(objFileRead As StreamReader, fi As FileInfo) As Boolean + + Dim booHeaderVorhanden = False + Dim booPrüfziffernfehler = False + Dim booInTransaktion = False + Dim booTrailerVorhanden = False + Dim dblCheckSumQuantity As Double + Dim curCheckSumAmount As Double + + Dim lngPKLine As Long = 0 + Dim lngRecordCount As Long + + Do While (objFileRead.Peek() > -1) + Dim strZeile = objFileRead.ReadLine() + lngRecordCount = lngRecordCount + 1 + + Select Case Mid(strZeile, 1, 2) + Case "10" + booHeaderVorhanden = True + Dim ext = CInt(fi.Extension.Remove(0, 1)) + Dim ttrHeader As New cAsfinag.TTRHeader(fi.Name.ToString, ext) + With ttrHeader + .PKFileName = fi.Name + .recordType = Trim(Mid(strZeile, 1, 2)) + .fileVersion = Trim(Mid(strZeile, 3, 2)) + .senderID = Trim(Mid(strZeile, 5, 6)) + .receiverID = Trim(Mid(strZeile, 11, 6)) + .fileCreationDate = DateSerial(Mid(strZeile, 17, 4), Mid(strZeile, 21, 2), Mid(strZeile, 23, 2)) + .fileCreationTime = DateSerial(Mid(strZeile, 17, 4), Mid(strZeile, 21, 2), Mid(strZeile, 23, 2)) & " " & TimeSerial(Mid(strZeile, 25, 2), Mid(strZeile, 27, 2), 0) + .fileNumber = Trim(Mid(strZeile, 29, 4)) + .currencyCode = Trim(Mid(strZeile, 33, 3)) + .description = IIf(Trim(Mid(strZeile, 36, 25)) = "", Nothing, Trim(Mid(strZeile, 36, 25))) + .ISOCountryCode = Trim(Mid(strZeile, 61, 3)) + .SAVE() + End With + + Case "20" + ' Meldung bei nicht vorhandenen Haeder. + If Not booHeaderVorhanden Then + MsgBox("Datei kann wegen fehlenden Header nicht verarbeitet werden.") + objFileRead.Close() + Return False + End If + + + Dim ttrBody As New cAsfinag.TTRBody(fi.Name, lngPKLine) + + With ttrBody + .PKFileName = fi.Name + .recordType = Trim(Mid(strZeile, 1, 2)) + lngPKLine = lngPKLine + 1 + .PKLine = lngPKLine + .fileVersion = Trim(Mid(strZeile, 3, 2)) + .siteId = IIf(Trim(Mid(strZeile, 7, 15)) = "", Nothing, Trim(Mid(strZeile, 7, 15))) + .fileNumber = Trim(Mid(strZeile, 22, 4)) + .fileCreationDate = DateSerial(Mid(strZeile, 26, 4), Mid(strZeile, 30, 2), Mid(strZeile, 32, 2)) + .deliveryNoteNumber = IIf(Trim(Mid(strZeile, 35, 8)) = "", Nothing, Trim(Mid(strZeile, 35, 8))) + .cardNumber = Trim(Mid(strZeile, 43, 22)) + .deliveryDate = DateSerial(Mid(strZeile, 65, 4), Mid(strZeile, 69, 2), Mid(strZeile, 71, 2)) + .deliveryTime = IIf(Trim(Mid(strZeile, 73, 4)) = "", Nothing, DateSerial(Mid(strZeile, 65, 4), Mid(strZeile, 69, 2), Mid(strZeile, 71, 2)) & " " & TimeSerial(Mid(strZeile, 73, 2), Mid(strZeile, 75, 2), 0)) + .transactionType = Trim(Mid(strZeile, 77, 2)) + .productCode = Trim(Mid(strZeile, 79, 4)) + .km = IIf(Trim(Mid(strZeile, 83, 7)) = "", Nothing, Trim(Mid(strZeile, 83, 7))) + .driverId = IIf(Trim(Mid(strZeile, 90, 4)) = "", Nothing, Trim(Mid(strZeile, 90, 4))) + .productQuantity = Trim(Mid(strZeile, 94, 6)) / 100 + .amountInclVAT = Trim(Mid(strZeile, 100, 10)) / 100 + .VATrate = Trim(Mid(strZeile, 155, 4)) / 100 + .VATamount = Trim(Mid(strZeile, 159, 10)) / 100 + .OBUID = Trim(Mid(strZeile, 130, 25)) + .receiptNumber = Trim(Mid(strZeile, 110, 20)) + + ' Bei den Checksummen wird unabhängig vom TransactionType immer der positive Betrag aufsummiert. + dblCheckSumQuantity = dblCheckSumQuantity + ttrBody.productQuantity + curCheckSumAmount = curCheckSumAmount + ttrBody.amountInclVAT + ' Bei TransactionType 03 .......Credit-Transaktion (negativ) + + If ttrBody.transactionType = 3 Then + ' Vorzeichenänderung + ttrBody.km = 0 - ttrBody.km + ttrBody.productQuantity = 0 - ttrBody.productQuantity + ttrBody.amountInclVAT = 0 - ttrBody.amountInclVAT + ttrBody.VATamount = 0 - ttrBody.VATamount + End If + + ' CardNumber prüfen. + If (Right(ttrBody.cardNumber, 1)) <> (fktMod10Prüfziffer(Left(ttrBody.cardNumber, Len(ttrBody.cardNumber) - 1))) Then + booPrüfziffernfehler = True + End If + .SAVE() + + End With + + 'strSQL = "SELECT * FROM CLFArchiv WHERE (OBUID = N'" & Trim(Mid(strZeile, 37, 18)) & "')" + 'rstCLFArchiv.Open strSQL, cnnASFINAG, adOpenStatic, adLockOptimistic, adCmdText + + + 'With rstCLFArchiv + ' If .EOF Then + ' .AddNew + ' !OBUID = Trim(Mid(strZeile, 37, 18)) + ' End If + ' !FileName = strPKFileName + ' !RecordType = Trim(Mid(strZeile, 1, 2)) + ' !RunNumber = Trim(Mid(strZeile, 3, 8)) + ' !CardNumber = Trim(Mid(strZeile, 11, 22)) + ' !ValidTo = Trim(Mid(strZeile, 33, 4)) + ' !KfzKennzeichen = Trim(Mid(strZeile, 55, 10)) + ' !Nationalität = Trim(Mid(strZeile, 65, 3)) + ' !Kategorie = Trim(Mid(strZeile, 68, 1)) + ' !Schadstoffklasse = Trim(Mid(strZeile, 69, 2)) + ' !Status = Trim(Mid(strZeile, 71, 2)) + ' !DatumVertragsabschluss = DateSerial(Mid(strZeile, 73, 4), Mid(strZeile, 77, 2), Mid(strZeile, 79, 2)) + ' .Update + ' .Close + 'End With + + ' Meldung bei Prüfziffernfehler. + If booPrüfziffernfehler Then + MsgBox("Prüfziffernfehler in Zeile " & CStr(lngRecordCount) & vbCrLf & "Datei kann nicht verarbeitet werden. " & vbNewLine & " " & fi.Name.ToString) + booInTransaktion = False + objFileRead.Close() + Return False + End If + + + Case "90" + ' Meldung bei nicht vorhandenen Haeder. + If Not booHeaderVorhanden Then + MsgBox("Datei kann wegen fehlenden Header nicht verarbeitet werden.") + objFileRead.Close() + Return False + End If + + booTrailerVorhanden = True + + + Dim ttrTrailer As New cAsfinag.TTRTrailer(fi.Name) + With ttrTrailer + .PKFileName = fi.Name + .recordType = Trim(Mid(strZeile, 1, 2)) + .fileVersion = Trim(Mid(strZeile, 3, 2)) + '.fileNumber = Trim(Mid(strZeile, 5, 4)) + .recordCount = Trim(Mid(strZeile, 5, 9)) + .checksumProductQuantity = Trim(Mid(strZeile, 14, 15)) / 100 + .checksumAmounntInclVAT = Trim(Mid(strZeile, 29, 15)) / 100 + .SAVE() + + Dim strPrompt + If ttrTrailer.recordCount <> lngRecordCount Then + strPrompt = strPrompt & "Record Count: " & ttrTrailer.recordCount & vbCrLf & + "Prüfsumme: " & lngRecordCount & vbCrLf + End If + ' Prüfsumme Menge. + If ttrTrailer.checksumProductQuantity <> dblCheckSumQuantity Then + strPrompt = strPrompt & "Check Sum Quantity: " & ttrTrailer.checksumProductQuantity & vbCrLf & + "Prüfsumme: " & dblCheckSumQuantity & vbCrLf + End If + ' Prüfsumme Betrag. + If ttrTrailer.checksumAmounntInclVAT <> Math.Round(curCheckSumAmount, 2) Then + strPrompt = strPrompt & "Check Sum Amount: " & ttrTrailer.checksumAmounntInclVAT & vbCrLf & + "Prüfsumme: " & curCheckSumAmount & vbCrLf + End If + + If strPrompt <> "" Then + MsgBox(strPrompt) + objFileRead.Close() + Return False + End If + + End With + ' Prüfsumme Anzahl der Sätze im File ohne Header und Trailer. + + If ttrTrailer.recordCount <> (lngRecordCount) Then + MsgBox("Record Count: " & ttrTrailer.recordCount & vbCrLf & "Prüfsumme: " & (lngRecordCount) & vbCrLf) + objFileRead.Close() + Return False + End If + + + ' Meldung bei Prüfsummenfehler. + If booPrüfziffernfehler Then + MsgBox("Datei kann wegen Prüfsummenfehler nicht verarbeitet werden.") + objFileRead.Close() + Return False + ' MsgBox strPrompt, , strPKFileName + ' ' Zurücksetzen der Transaktion. + 'cnnASFINAG.RollbackTrans + ' booInTransaktion = False + End If + Case Else + ' Andere RecordNumber überlesen. + End Select + + Loop + + objFileRead.Close() + + Return True + + End Function + + + + Private Sub dgvEinarbeitung_SelectionChanged(sender As Object, e As EventArgs) Handles dgvEinarbeitung.SelectionChanged dgvEinarbeitung.ClearSelection() End Sub - - - - - Private Sub frmTCNachrichtenVerarbeitung_Shown(sender As Object, e As EventArgs) Handles Me.Shown If allowClose Then Me.Refresh() @@ -561,5 +760,20 @@ Public Class frmAsfinag_NachrichtenVerabeitung Private Sub pnl_Paint(sender As Object, e As PaintEventArgs) Handles pnl.Paint End Sub + + + Public Shadows Function Right(ByVal sText As String, + ByVal nLen As Integer) As String + + If nLen > sText.Length Then nLen = sText.Length + Return (sText.Substring(sText.Length - nLen)) + End Function + + Public Shadows Function Left(ByVal sText As String, + ByVal nLen As Integer) As String + + If nLen > sText.Length Then nLen = sText.Length + Return (sText.Substring(0, nLen)) + End Function End Class diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 0e14271..c16fd6f 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -148,6 +148,13 @@ Partial Class frmStartOptions Me.LinkLabel29 = New System.Windows.Forms.LinkLabel() Me.LinkLabel30 = New System.Windows.Forms.LinkLabel() Me.Label11 = New System.Windows.Forms.Label() + Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.LinkLabel41 = New System.Windows.Forms.LinkLabel() + Me.LinkLabel42 = New System.Windows.Forms.LinkLabel() + Me.Label23 = New System.Windows.Forms.Label() + Me.LinkLabel43 = New System.Windows.Forms.LinkLabel() + Me.LinkLabel44 = New System.Windows.Forms.LinkLabel() + Me.Label24 = New System.Windows.Forms.Label() Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.LinkLabel25 = New System.Windows.Forms.LinkLabel() Me.CheckBox1 = New System.Windows.Forms.CheckBox() @@ -172,13 +179,6 @@ Partial Class frmStartOptions Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.LinkLabel41 = New System.Windows.Forms.LinkLabel() - Me.LinkLabel42 = New System.Windows.Forms.LinkLabel() - Me.Label23 = New System.Windows.Forms.Label() - Me.LinkLabel43 = New System.Windows.Forms.LinkLabel() - Me.LinkLabel44 = New System.Windows.Forms.LinkLabel() - Me.Label24 = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbcntr.SuspendLayout() @@ -200,11 +200,11 @@ Partial Class frmStartOptions CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage3.SuspendLayout() + Me.TabPage4.SuspendLayout() CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TabPage4.SuspendLayout() Me.SuspendLayout() ' 'pnl @@ -1816,6 +1816,84 @@ Partial Class frmStartOptions Me.Label11.TabIndex = 22 Me.Label11.Text = "MAVI Nachrichtenverarbeitung (NCTS TR):" ' + 'TabPage4 + ' + Me.TabPage4.Controls.Add(Me.LinkLabel41) + Me.TabPage4.Controls.Add(Me.LinkLabel42) + Me.TabPage4.Controls.Add(Me.Label23) + Me.TabPage4.Controls.Add(Me.LinkLabel43) + Me.TabPage4.Controls.Add(Me.LinkLabel44) + Me.TabPage4.Controls.Add(Me.Label24) + Me.TabPage4.Location = New System.Drawing.Point(4, 22) + Me.TabPage4.Name = "TabPage4" + Me.TabPage4.Size = New System.Drawing.Size(851, 395) + Me.TabPage4.TabIndex = 3 + Me.TabPage4.Text = "Asfinag" + Me.TabPage4.UseVisualStyleBackColor = True + ' + 'LinkLabel41 + ' + Me.LinkLabel41.AutoSize = True + Me.LinkLabel41.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel41.Location = New System.Drawing.Point(17, 165) + Me.LinkLabel41.Name = "LinkLabel41" + Me.LinkLabel41.Size = New System.Drawing.Size(82, 13) + Me.LinkLabel41.TabIndex = 35 + Me.LinkLabel41.TabStop = True + Me.LinkLabel41.Text = "Black-List (TBL)" + ' + 'LinkLabel42 + ' + Me.LinkLabel42.AutoSize = True + Me.LinkLabel42.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel42.Location = New System.Drawing.Point(17, 140) + Me.LinkLabel42.Name = "LinkLabel42" + Me.LinkLabel42.Size = New System.Drawing.Size(87, 13) + Me.LinkLabel42.TabIndex = 34 + Me.LinkLabel42.TabStop = True + Me.LinkLabel42.Text = "White-List (TWL)" + ' + 'Label23 + ' + Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label23.Location = New System.Drawing.Point(17, 113) + Me.Label23.Name = "Label23" + Me.Label23.Size = New System.Drawing.Size(296, 16) + Me.Label23.TabIndex = 33 + Me.Label23.Text = "Export" + ' + 'LinkLabel43 + ' + Me.LinkLabel43.AutoSize = True + Me.LinkLabel43.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel43.Location = New System.Drawing.Point(17, 68) + Me.LinkLabel43.Name = "LinkLabel43" + Me.LinkLabel43.Size = New System.Drawing.Size(102, 13) + Me.LinkLabel43.TabIndex = 32 + Me.LinkLabel43.TabStop = True + Me.LinkLabel43.Text = "Contractdaten (CLF)" + ' + 'LinkLabel44 + ' + Me.LinkLabel44.AutoSize = True + Me.LinkLabel44.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel44.Location = New System.Drawing.Point(17, 43) + Me.LinkLabel44.Name = "LinkLabel44" + Me.LinkLabel44.Size = New System.Drawing.Size(126, 13) + Me.LinkLabel44.TabIndex = 31 + Me.LinkLabel44.TabStop = True + Me.LinkLabel44.Text = "Transaktionsdaten (TTR)" + ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label24.Location = New System.Drawing.Point(17, 16) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(42, 13) + Me.Label24.TabIndex = 30 + Me.Label24.Text = "Import" + ' 'CheckBox2 ' Me.CheckBox2.AutoSize = True @@ -2110,84 +2188,6 @@ Partial Class frmStartOptions Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20) Me.txtGJ_UNISPED.TabIndex = 68 ' - 'TabPage4 - ' - Me.TabPage4.Controls.Add(Me.LinkLabel41) - Me.TabPage4.Controls.Add(Me.LinkLabel42) - Me.TabPage4.Controls.Add(Me.Label23) - Me.TabPage4.Controls.Add(Me.LinkLabel43) - Me.TabPage4.Controls.Add(Me.LinkLabel44) - Me.TabPage4.Controls.Add(Me.Label24) - Me.TabPage4.Location = New System.Drawing.Point(4, 22) - Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Size = New System.Drawing.Size(851, 395) - Me.TabPage4.TabIndex = 3 - Me.TabPage4.Text = "Asfinag" - Me.TabPage4.UseVisualStyleBackColor = True - ' - 'LinkLabel41 - ' - Me.LinkLabel41.AutoSize = True - Me.LinkLabel41.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel41.Location = New System.Drawing.Point(17, 165) - Me.LinkLabel41.Name = "LinkLabel41" - Me.LinkLabel41.Size = New System.Drawing.Size(82, 13) - Me.LinkLabel41.TabIndex = 35 - Me.LinkLabel41.TabStop = True - Me.LinkLabel41.Text = "Black-List (TBL)" - ' - 'LinkLabel42 - ' - Me.LinkLabel42.AutoSize = True - Me.LinkLabel42.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel42.Location = New System.Drawing.Point(17, 140) - Me.LinkLabel42.Name = "LinkLabel42" - Me.LinkLabel42.Size = New System.Drawing.Size(87, 13) - Me.LinkLabel42.TabIndex = 34 - Me.LinkLabel42.TabStop = True - Me.LinkLabel42.Text = "White-List (TWL)" - ' - 'Label23 - ' - Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label23.Location = New System.Drawing.Point(17, 113) - Me.Label23.Name = "Label23" - Me.Label23.Size = New System.Drawing.Size(296, 16) - Me.Label23.TabIndex = 33 - Me.Label23.Text = "Export" - ' - 'LinkLabel43 - ' - Me.LinkLabel43.AutoSize = True - Me.LinkLabel43.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel43.Location = New System.Drawing.Point(17, 68) - Me.LinkLabel43.Name = "LinkLabel43" - Me.LinkLabel43.Size = New System.Drawing.Size(102, 13) - Me.LinkLabel43.TabIndex = 32 - Me.LinkLabel43.TabStop = True - Me.LinkLabel43.Text = "Contractdaten (CLF)" - ' - 'LinkLabel44 - ' - Me.LinkLabel44.AutoSize = True - Me.LinkLabel44.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel44.Location = New System.Drawing.Point(17, 43) - Me.LinkLabel44.Name = "LinkLabel44" - Me.LinkLabel44.Size = New System.Drawing.Size(126, 13) - Me.LinkLabel44.TabIndex = 31 - Me.LinkLabel44.TabStop = True - Me.LinkLabel44.Text = "Transaktionsdaten (TTR)" - ' - 'Label24 - ' - Me.Label24.AutoSize = True - Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label24.Location = New System.Drawing.Point(17, 16) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(42, 13) - Me.Label24.TabIndex = 30 - Me.Label24.Text = "Import" - ' 'frmStartOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2226,12 +2226,12 @@ Partial Class frmStartOptions CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage3.ResumeLayout(False) Me.TabPage3.PerformLayout() + Me.TabPage4.ResumeLayout(False) + Me.TabPage4.PerformLayout() CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() - Me.TabPage4.ResumeLayout(False) - Me.TabPage4.PerformLayout() Me.ResumeLayout(False) End Sub diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index a055b7d..1edf06b 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -140,6 +140,102 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= @@ -481,102 +577,9 @@ True - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - + + True + AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 452cf7c..d48dfeb 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -3436,4 +3436,27 @@ Public Class frmStartOptions VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(cbxDatevOpen.Checked, cbxDatevDebitoren.Checked, cbxDatevBuchungen.Checked) End Sub + Private Sub LinkLabel44_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel44.LinkClicked + Me.Visible = False + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True + Dim f As New frmAsfinag_NachrichtenVerabeitung("ttr") + f.ShowDialog() + Me.Visible = True + End Sub + + Private Sub LinkLabel43_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel43.LinkClicked + Me.Visible = False + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True + Dim f As New frmAsfinag_NachrichtenVerabeitung("clf") + f.ShowDialog() + Me.Visible = True + End Sub + + Private Sub LinkLabel42_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel42.LinkClicked + + End Sub + + Private Sub LinkLabel41_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel41.LinkClicked + + End Sub End Class \ No newline at end of file