This commit is contained in:
2023-12-05 16:31:38 +01:00
parent 7addd7b133
commit 3b57150abf
5 changed files with 420 additions and 276 deletions

View File

@@ -95,7 +95,7 @@ Public Class frmStartOptions
'doIDSPlatts()
'Exit Sub
PARAM=""
'Standart-Errorverhalten ist MAIL
VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL
If PARAM <> "" Then
@@ -466,6 +466,30 @@ Public Class frmStartOptions
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL("AMBAR", False, True, True)
closeMe()
Case "ASFINAG_EXPORT"
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
Dim blt = New cAsfinag.Exportist
Dim autoclose As Boolean = True
blt.initExportPfade()
blt.exportiereWhiteList(autoclose)
blt.exportiereBlackList(autoclose)
closeMe()
Case "ASFINAG_IMPORT"
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
Dim autoclose As Boolean = True
Dim testFTP As Boolean = False
Dim fmCLF As New frmAsfinag_NachrichtenVerabeitung("CLF", testFTP)
fmCLF.Show()
AddHandler fmCLF.FormClosed, AddressOf closeMe
Dim fmTTR As New frmAsfinag_NachrichtenVerabeitung("TTR", testFTP)
fmTTR.Show()
AddHandler fmTTR.FormClosed, AddressOf closeMe
closeMe()
'------------------------------
Case Else
@@ -3189,7 +3213,7 @@ Public Class frmStartOptions
Dim reader As OleDbDataReader = Nothing
' Kfz Kennzeichen einlesen.
Dim SQLQuery = "SELECT CardNumber, ValidTo, OBUID, KfzKennzeichen, Nationalität, DatumVertragsabschluss, Kategorie, Schadstoffklasse, Status FROM vwCLFBody "
Dim SQLQuery = "SELECT CardNumber, ValidTo, OBUID, KfzKennzeichen, Nationalität, DatumVertragsabschluss, Kategorie, Schadstoffklasse, Status FROM vwCLFBody " ' vwCLFBody verwendet immer zuletzt importierte CLF!
Using Command As New OleDbCommand(SQLQuery, con)
Using oRDR As OleDbDataReader = Command.ExecuteReader
While (oRDR.Read)
@@ -3221,7 +3245,7 @@ Public Class frmStartOptions
SDL.KartenNr = SQL.checkNullStr(oRDR.GetValue("CardNumber"))
If Validto <> "" Then
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(Validto, 1, 2), Mid(Validto, 3, 2), 1)))
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(oRDR.GetValue("CardNumber"), 1, 2), Mid(Validto, 3, 2), 1)))
End If
SDL.OBUID = SQL.checkNullStr(oRDR.GetValue("OBUID"))
@@ -3278,8 +3302,8 @@ Public Class frmStartOptions
SDL.KartenNr = SQL.checkNullStr(row.Item("cardNumber"))
If Validto <> "" Then
'MsgBox(Mid(Validto, 7, 2) & " " & Mid(Validto, 4, 2))
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(Validto, 7, 2), Mid(Validto, 4, 2), 1))) 'noch im DETAIL checken!
'MsgBox(Mid(row.Item("ValidTo"), 1, 2) & " " & Mid(row.Item("ValidTo"), 3, 2))
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(row.Item("ValidTo"), 1, 2), Mid(row.Item("ValidTo"), 3, 2), 1))) 'noch im DETAIL checken!
End If
SDL.OBUID = SQL.checkNullStr(row.Item("OBUID"))
@@ -3807,7 +3831,8 @@ Public Class frmStartOptions
dbo.CLFBody.RecordType,
dbo.CLFBody.fileNumber,
dbo.CLFBody.cardNumber,
dbo.CLFBody.validTo OBUID,
dbo.CLFBody.validTo,
dbo.CLFBody.OBUID,
dbo.CLFBody.vehicleLicensePlate,
dbo.CLFBody.nationality,
dbo.CLFBody.vehicleCategory,
@@ -3975,20 +4000,46 @@ Public Class frmStartOptions
Private Sub tbcntr_SelectedIndexChanged(sender As Object, e As EventArgs) Handles tbcntr.SelectedIndexChanged
If tbcntr.SelectedIndex = 3 Then
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt = SQL.loadDgvBySql("SELECT filename, fileVersion from [dbo].[FileINfo]", "ASFINAG")
If dt IsNot Nothing Then
For Each r In dt.Rows
If r("filename") = "TBL" Then txtTBLNr.Text = r("fileVersion")
If r("filename") = "TWL" Then txtTWLNr.Text = r("fileVersion")
Next
End If
checkTBLandTWLNr()
End If
End Sub
Private Sub checkTBLandTWLNr()
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
Dim dt = SQL.loadDgvBySql("SELECT filename, fileVersion from [dbo].[FileINfo]", "ASFINAG")
If dt IsNot Nothing Then
For Each r In dt.Rows
If r("filename") = "TBL" Then txtTBLNr.Text = r("fileVersion")
If r("filename") = "TWL" Then txtTWLNr.Text = r("fileVersion")
Next
End If
End Sub
Private Sub cbxTestsystem_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTestsystem.CheckedChanged
If tbcntr.SelectedIndex = 3 Then
checkTBLandTWLNr()
End If
End Sub
Private Sub LinkLabel49_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel49.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
If Not checkTestsystemSettings() Then Exit Sub
Me.Cursor = Cursors.WaitCursor
Dim blt = New cAsfinag.Exportist
blt.initExportPfade()
showPic(blt.exportiereWhiteList, PictureBox18)
showPic(blt.exportiereBlackList, PictureBox19)
Me.Cursor = Cursors.Default
End Sub
End Class