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

Asfinag Bugfix

Browse Source
This commit is contained in:
d.breimaier
2023-12-04 10:55:52 +01:00
parent bec09948bf
commit 5b537e9887
3 changed files with 152 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
initATLASAufschubkonten/cAsfinag.vb
View File

@@ -304,8 +304,13 @@ Public Class cAsfinag
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Sub New(PKFileName, OBUID)
Me.PKFileName = PKFileName
'Sub New(PKFileName, OBUID)
' Me.PKFileName = PKFileName
' Me.OBUID = OBUID
' LOAD()
'End Sub
Sub New(OBUID)
Me.OBUID = OBUID
LOAD()
End Sub
@@ -335,7 +340,8 @@ 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 CLFArchiv WHERE PKFileName=@PKFileName AND OBUID = @OBUID) " &
'Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM CLFArchiv WHERE PKFileName=@PKFileName AND OBUID = @OBUID) " &
Dim sqlstr = " BEGIN TRAN If EXISTS(Select * FROM CLFArchiv WHERE OBUID = @OBUID) " &
" BEGIN " & getUpdateCmd() & " End " &
" Else " &
" BEGIN " & getInsertCmd() & " End " &
@@ -348,8 +354,9 @@ Public Class cAsfinag
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionAsfinag()
Using cmd As New SqlCommand("Select * FROM CLFArchiv WHERE PKFileName=@PKFileName AND OBUID = @OBUID ", conn)
cmd.Parameters.AddWithValue("@PKFileName", PKFileName)
Using cmd As New SqlCommand("Select * FROM CLFArchiv WHERE OBUID = @OBUID ", conn)
'Using cmd As New SqlCommand("Select * FROM CLFArchiv WHERE PKFileName=@PKFileName AND OBUID = @OBUID ", conn)
'cmd.Parameters.AddWithValue("@PKFileName", PKFileName)
cmd.Parameters.AddWithValue("@OBUID", OBUID)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
@@ -386,7 +393,8 @@ Public Class cAsfinag
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE [CLFArchiv] SET " & str & " WHERE PKFileName=@PKFileName AND OBUID = @OBUID ")
'Return (" UPDATE [CLFArchiv] SET " & str & " WHERE PKFileName=@PKFileName AND OBUID = @OBUID ")
Return (" UPDATE [CLFArchiv] SET " & str & " WHERE OBUID = @OBUID ")
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
@@ -1579,9 +1587,11 @@ Public Class cAsfinag
Dim dtAsfinag As DataTable = SQL.loadDgvBySql_Param(strSQLASFINAG, "ASFINAG")
Dim clfArchiv As New cAsfinag.CLFArchiv(fi.Name, Trim(Mid(strZeile, 35, 18)))
Dim clfArchiv As New cAsfinag.CLFArchiv(Trim(Mid(strZeile, 35, 18)))
If dtAsfinag.Rows.Count = 0 Then
'Dim clfArchiv As New cAsfinag.CLFArchiv(fi.Name, Trim(Mid(strZeile, 35, 18)))
'If dtAsfinag.Rows.Count = 0 Then
With clfArchiv
.PKFileName = fi.Name
.RecordType = Trim(Mid(strZeile, 1, 2))
@@ -1589,7 +1599,7 @@ Public Class cAsfinag
.fileNumber = Trim(Mid(strZeile, 5, 3))
.cardNumber = Trim(Mid(strZeile, 9, 22))
.validTo = Trim(Mid(strZeile, 31, 4))
.OBUID = Trim(Mid(strZeile, 35, 18))
'.OBUID = Trim(Mid(strZeile, 35, 18))
.vehicleLicensePlate = Trim(Mid(strZeile, 53, 10))
.nationality = Trim(Mid(strZeile, 63, 3))
.vehicleCategory = Trim(Mid(strZeile, 66, 1))
@@ -1601,32 +1611,32 @@ Public Class cAsfinag
.contractType = Trim(Mid(strZeile, 83, 1))
.SAVE()
End With
End If
'End If
For Each r As DataRow In dtAsfinag.Rows
' For Each r As DataRow In dtAsfinag.Rows
clfArchiv = New cAsfinag.CLFArchiv(r.Item("PKFileName"), r.Item("OBUID"))
' clfArchiv = New cAsfinag.CLFArchiv(r.Item("PKFileName"), r.Item("OBUID"))
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))
.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
Next
' 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))
' .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
'Next
Case "90"

94
initATLASAufschubkonten/frmStartOptions.Designer.vb generated
View File

@@ -161,7 +161,7 @@ Partial Class frmStartOptions
Me.Label11 = New System.Windows.Forms.Label()
Me.TabPage4 = New System.Windows.Forms.TabPage()
Me.cbxTestFTP = New System.Windows.Forms.CheckBox()
Me.CheckBox8 = New System.Windows.Forms.CheckBox()
Me.cbxTestsystem = New System.Windows.Forms.CheckBox()
Me.PictureBox21 = New System.Windows.Forms.PictureBox()
Me.LinkLabel47 = New System.Windows.Forms.LinkLabel()
Me.LinkLabel46 = New System.Windows.Forms.LinkLabel()
@@ -198,6 +198,9 @@ Partial Class frmStartOptions
Me.lblRoutineManager = New System.Windows.Forms.Label()
Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button21 = New System.Windows.Forms.Button()
Me.txtTWLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtTBLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label25 = New System.Windows.Forms.Label()
Me.pnl.SuspendLayout()
CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
Me.tbcntr.SuspendLayout()
@@ -1979,8 +1982,11 @@ Partial Class frmStartOptions
'
'TabPage4
'
Me.TabPage4.Controls.Add(Me.Label25)
Me.TabPage4.Controls.Add(Me.txtTBLNr)
Me.TabPage4.Controls.Add(Me.txtTWLNr)
Me.TabPage4.Controls.Add(Me.cbxTestFTP)
Me.TabPage4.Controls.Add(Me.CheckBox8)
Me.TabPage4.Controls.Add(Me.cbxTestsystem)
Me.TabPage4.Controls.Add(Me.PictureBox21)
Me.TabPage4.Controls.Add(Me.LinkLabel47)
Me.TabPage4.Controls.Add(Me.LinkLabel46)
@@ -2012,18 +2018,18 @@ Partial Class frmStartOptions
Me.cbxTestFTP.Text = "Import von Test-FTP"
Me.cbxTestFTP.UseVisualStyleBackColor = True
'
'CheckBox8
'cbxTestsystem
'
Me.CheckBox8.AutoSize = True
Me.CheckBox8.Checked = True
Me.CheckBox8.CheckState = System.Windows.Forms.CheckState.Checked
Me.CheckBox8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CheckBox8.Location = New System.Drawing.Point(20, 13)
Me.CheckBox8.Name = "CheckBox8"
Me.CheckBox8.Size = New System.Drawing.Size(122, 17)
Me.CheckBox8.TabIndex = 76
Me.CheckBox8.Text = "Import in Testsystem"
Me.CheckBox8.UseVisualStyleBackColor = True
Me.cbxTestsystem.AutoSize = True
Me.cbxTestsystem.Checked = True
Me.cbxTestsystem.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxTestsystem.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxTestsystem.Location = New System.Drawing.Point(20, 13)
Me.cbxTestsystem.Name = "cbxTestsystem"
Me.cbxTestsystem.Size = New System.Drawing.Size(122, 17)
Me.cbxTestsystem.TabIndex = 76
Me.cbxTestsystem.Text = "Import in Testsystem"
Me.cbxTestsystem.UseVisualStyleBackColor = True
'
'PictureBox21
'
@@ -2449,6 +2455,63 @@ Partial Class frmStartOptions
Me.Button21.Text = "AAS Sendung 24h"
Me.Button21.UseVisualStyleBackColor = True
'
'txtTWLNr
'
Me.txtTWLNr._DateTimeOnly = False
Me.txtTWLNr._numbersOnly = True
Me.txtTWLNr._numbersOnlyKommastellen = ""
Me.txtTWLNr._numbersOnlyTrennzeichen = False
Me.txtTWLNr._Prozent = False
Me.txtTWLNr._ShortDateNew = False
Me.txtTWLNr._ShortDateOnly = False
Me.txtTWLNr._TimeOnly = False
Me.txtTWLNr._TimeOnly_Seconds = False
Me.txtTWLNr._value = ""
Me.txtTWLNr._Waehrung = False
Me.txtTWLNr._WaehrungZeichen = True
Me.txtTWLNr.ForeColor = System.Drawing.Color.Red
Me.txtTWLNr.Location = New System.Drawing.Point(166, 222)
Me.txtTWLNr.MaxLineLength = -1
Me.txtTWLNr.MaxLines_Warning = ""
Me.txtTWLNr.MaxLines_Warning_Label = Nothing
Me.txtTWLNr.Name = "txtTWLNr"
Me.txtTWLNr.ReadOnly = True
Me.txtTWLNr.Size = New System.Drawing.Size(53, 20)
Me.txtTWLNr.TabIndex = 78
'
'txtTBLNr
'
Me.txtTBLNr._DateTimeOnly = False
Me.txtTBLNr._numbersOnly = True
Me.txtTBLNr._numbersOnlyKommastellen = ""
Me.txtTBLNr._numbersOnlyTrennzeichen = False
Me.txtTBLNr._Prozent = False
Me.txtTBLNr._ShortDateNew = False
Me.txtTBLNr._ShortDateOnly = False
Me.txtTBLNr._TimeOnly = False
Me.txtTBLNr._TimeOnly_Seconds = False
Me.txtTBLNr._value = ""
Me.txtTBLNr._Waehrung = False
Me.txtTBLNr._WaehrungZeichen = True
Me.txtTBLNr.ForeColor = System.Drawing.Color.Red
Me.txtTBLNr.Location = New System.Drawing.Point(166, 250)
Me.txtTBLNr.MaxLineLength = -1
Me.txtTBLNr.MaxLines_Warning = ""
Me.txtTBLNr.MaxLines_Warning_Label = Nothing
Me.txtTBLNr.Name = "txtTBLNr"
Me.txtTBLNr.ReadOnly = True
Me.txtTBLNr.Size = New System.Drawing.Size(53, 20)
Me.txtTBLNr.TabIndex = 79
'
'Label25
'
Me.Label25.AutoSize = True
Me.Label25.Location = New System.Drawing.Point(166, 206)
Me.Label25.Name = "Label25"
Me.Label25.Size = New System.Drawing.Size(32, 13)
Me.Label25.TabIndex = 78
Me.Label25.Text = "lfd Nr"
'
'frmStartOptions
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2673,6 +2736,9 @@ Partial Class frmStartOptions
Friend WithEvents LinkLabel47 As LinkLabel
Friend WithEvents PictureBox21 As PictureBox
Friend WithEvents LinkLabel48 As LinkLabel
Friend WithEvents CheckBox8 As CheckBox
Friend WithEvents cbxTestsystem As CheckBox
Friend WithEvents cbxTestFTP As CheckBox
Friend WithEvents txtTBLNr As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents txtTWLNr As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label25 As Label
End Class

34
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -3603,7 +3603,7 @@ Public Class frmStartOptions
Private Sub LinkLabel44_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel44.LinkClicked
Me.Visible = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
If Not checkTestsystemSettings() Then Exit Sub
Dim f As New frmAsfinag_NachrichtenVerabeitung("TTR", cbxTestFTP.Checked)
f.ShowDialog()
@@ -3612,7 +3612,7 @@ Public Class frmStartOptions
Private Sub LinkLabel43_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel43.LinkClicked
Me.Visible = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
If Not checkTestsystemSettings() Then Exit Sub
Dim f As New frmAsfinag_NachrichtenVerabeitung("CLF", cbxTestFTP.Checked)
f.ShowDialog()
@@ -3621,7 +3621,7 @@ Public Class frmStartOptions
End Sub
Private Sub LinkLabel42_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel42.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
If Not checkTestsystemSettings() Then Exit Sub
Me.Cursor = Cursors.WaitCursor
Dim blt = New cAsfinag.Exportist
@@ -3631,7 +3631,7 @@ Public Class frmStartOptions
End Sub
Private Sub LinkLabel41_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel41.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
If Not checkTestsystemSettings() Then Exit Sub
Me.Cursor = Cursors.WaitCursor
Dim blt = New cAsfinag.Exportist
@@ -3796,7 +3796,7 @@ Public Class frmStartOptions
Private Sub LinkLabel99_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel46.LinkClicked
Try
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim frm As New Form
@@ -3940,7 +3940,7 @@ Public Class frmStartOptions
End Function
Private Sub LinkLabel47_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel47.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
showPic(ASFINAG_LKW(False), PictureBox21)
End Sub
@@ -3963,7 +3963,7 @@ Public Class frmStartOptions
Private Function checkTestsystemSettings() As Boolean
Dim check As Boolean = False
If cbxTestFTP.Checked And Not CheckBox8.Checked Then
If cbxTestFTP.Checked And Not cbxTestsystem.Checked Then
MsgBox("Testdaten von/auf TEST-FTP in/von Prod-Umgebung importieren/exportieren?" & vbNewLine & " Keine gute Idee!")
Else
check = True
@@ -3971,4 +3971,24 @@ Public Class frmStartOptions
Return check
End Function
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
End If
End Sub
End Class