commit

2024-12-10 11:01:31 +01:00
parent 131fb0d8bc ef72c9b82d
commit 62bf73226e
5 changed files with 77 additions and 25 deletions
--- a/initATLASAufschubkonten/cWorker_NCTS.vb
+++ b/initATLASAufschubkonten/cWorker_NCTS.vb
@@ -4170,6 +4170,8 @@ Public Class cWorker_NCTS
                End If
                Dim F As New System.IO.FileInfo(filePath)

+                '   FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", ""))
+
                'Dim DY_server = "91.93.197.91"
                'Dim DY_name = "Verag"
                'Dim DY_pwd = "5P1PYOr1"
@@ -4181,14 +4183,23 @@ Public Class cWorker_NCTS


                Dim DY_server = "sftp-01.singlewindow.io"
-                Dim DY_name = "IRU-TEST"
-                Dim DY_pwd = "T1AF58OP"
+                Dim DY_name = "VERAG"
+                Dim DY_pwd = "5P1PYOr1"
                'Dim DY_name = "Verag-test"
                'Dim DY_pwd = "A1ZDTK99"
                Dim DY_port = "22"
-                Dim DY_PFAD_IN = "/TIR/DE/OUT"
+                'Dim DY_PFAD_IN = "/TIR/DE/OUT"
+                Dim DY_PFAD_IN = "/"
                Dim DY_PFAD_IN_KD = ""

+                If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+                    DY_server = "sftp-01.singlewindow.io"
+                    'DY_name = "IRU-TEST"
+                    'DY_pwd = "T1AF58OP"
+                    DY_name = "VERAG-TEST"
+                    DY_pwd = "A1ZDTK99"
+                End If
+
                'getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD, FRIMA_DY)

                Dim ConnectionInfo As New Renci.SshNet.ConnectionInfo(DY_server, DY_port, DY_name, New Renci.SshNet.PasswordAuthenticationMethod(DY_name, DY_pwd))
--- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
+++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
@@ -124,8 +124,6 @@ Public Class frmDYNachrichtenVerarbeitung
            'Dim answer As String = command.Result


-
-
            Dim ConnectionInfo As New ConnectionInfo(DY_server, DY_port, DY_name, New PasswordAuthenticationMethod(DY_name, DY_pwd))


--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -281,6 +281,8 @@ Partial Class frmStartOptions
        Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.LinkLabel67 = New System.Windows.Forms.LinkLabel()
+        Me.PictureBox26 = New System.Windows.Forms.PictureBox()
        Me.pnl.SuspendLayout()
        CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -315,7 +317,6 @@ Partial Class frmStartOptions
        CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'pnl
@@ -922,6 +923,8 @@ Partial Class frmStartOptions
        '
        'TabPage1
        '
+        Me.TabPage1.Controls.Add(Me.LinkLabel67)
+        Me.TabPage1.Controls.Add(Me.PictureBox26)
        Me.TabPage1.Controls.Add(Me.cbxGestellungspeichern)
        Me.TabPage1.Controls.Add(Me.MyTextBox4)
        Me.TabPage1.Controls.Add(Me.Label41)
@@ -1176,7 +1179,7 @@ Partial Class frmStartOptions
        Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button8.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
        Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button8.Location = New System.Drawing.Point(732, 5)
+        Me.Button8.Location = New System.Drawing.Point(1072, 6)
        Me.Button8.Name = "Button8"
        Me.Button8.Size = New System.Drawing.Size(123, 24)
        Me.Button8.TabIndex = 54
@@ -3652,6 +3655,17 @@ Partial Class frmStartOptions
        Me.DataGridViewTextBoxColumn1.MinimumWidth = 8
        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
        '
+        'LinkLabel67
+        '
+        Me.LinkLabel67.AutoSize = True
+        Me.LinkLabel67.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.LinkLabel67.Location = New System.Drawing.Point(18, 393)
+        Me.LinkLabel67.Name = "LinkLabel67"
+        Me.LinkLabel67.Size = New System.Drawing.Size(135, 13)
+        Me.LinkLabel67.TabIndex = 151
+        Me.LinkLabel67.TabStop = True
+        Me.LinkLabel67.Text = "Ländercode ISO2 einfügen"
+        '
        'frmStartOptions
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3704,7 +3718,6 @@ Partial Class frmStartOptions
        CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
@@ -3965,4 +3978,5 @@ Partial Class frmStartOptions
    Friend WithEvents cbxPlose As CheckBox
    Friend WithEvents cbxUTATestkunden As CheckBox
    Friend WithEvents LinkLabel67 As LinkLabel
+    Friend WithEvents PictureBox26 As PictureBox
 End Class
--- a/initATLASAufschubkonten/frmStartOptions.resx
+++ b/initATLASAufschubkonten/frmStartOptions.resx
@@ -212,6 +212,30 @@
        WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
        nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
        CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="PictureBox26.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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=
 </value>
  </data>
  <data name="PictureBox99.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -3884,18 +3884,18 @@ Public Class frmStartOptions
                                End If
                                SDL.Sachbearbeiter = "ASFINAG"

-                                Dim Validto = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
+                                Dim Validto = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))

-                                SDL.KartenNr = SQL.checkNullStr(oRDR.GetValue("CardNumber"))
+                                SDL.KartenNr = SQl.checkNullStr(oRDR.GetValue("CardNumber"))
                                If Validto <> "" Then
                                    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"))
-                                SDL.Vertragsabschlussdatum = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
-                                SDL.Kategorie = SQL.checkNullStr(oRDR.GetValue("Kategorie"))
-                                SDL.Schadstoffklasse = SQL.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
-                                SDL.Status = SQL.checkNullStr(oRDR.GetValue("Status"))
+                                SDL.OBUID = SQl.checkNullStr(oRDR.GetValue("OBUID"))
+                                SDL.Vertragsabschlussdatum = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
+                                SDL.Kategorie = SQl.checkNullStr(oRDR.GetValue("Kategorie"))
+                                SDL.Schadstoffklasse = SQl.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
+                                SDL.Status = SQl.checkNullStr(oRDR.GetValue("Status"))
                                SDL.SAVE()
                            End If

@@ -3941,21 +3941,21 @@ Public Class frmStartOptions
                        End If
                        SDL.Sachbearbeiter = "ASFINAG" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_TEST", "")

-                        Dim Validto = SQL.checkNullStr(row.Item("contractDate"))
+                        Dim Validto = SQl.checkNullStr(row.Item("contractDate"))

-                        SDL.KartenNr = SQL.checkNullStr(row.Item("cardNumber"))
+                        SDL.KartenNr = SQl.checkNullStr(row.Item("cardNumber"))
                        If Validto <> "" Then
                            '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"))
-                        SDL.Vertragsabschlussdatum = SQL.checkNullStr(row.Item("contractDate"))
-                        SDL.Kategorie = SQL.checkNullStr(row.Item("vehicleCategory"))
-                        SDL.Schadstoffklasse = SQL.checkNullStr(row.Item("emissionCategory"))
-                        SDL.Status = SQL.checkNullStr(row.Item("status"))
-                        SDL.Nationalitaet = SQL.checkNullStr(row.Item("nationality"))
-                        SDL.CO2Kategorie = SQL.checkNullStr(row.Item("CO2EmissionsClass"))
+                        SDL.OBUID = SQl.checkNullStr(row.Item("OBUID"))
+                        SDL.Vertragsabschlussdatum = SQl.checkNullStr(row.Item("contractDate"))
+                        SDL.Kategorie = SQl.checkNullStr(row.Item("vehicleCategory"))
+                        SDL.Schadstoffklasse = SQl.checkNullStr(row.Item("emissionCategory"))
+                        SDL.Status = SQl.checkNullStr(row.Item("status"))
+                        SDL.Nationalitaet = SQl.checkNullStr(row.Item("nationality"))
+                        SDL.CO2Kategorie = SQl.checkNullStr(row.Item("CO2EmissionsClass"))
                        SDL.SAVE()
                    End If

@@ -5418,6 +5418,11 @@ Public Class frmStartOptions
    End Sub

    Private Sub LinkLabel67_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel67.LinkClicked
-
+        Me.Cursor = Cursors.WaitCursor
+        Try
+            Dim erg = VERAG_PROG_ALLGEMEIN.cTariffKN8_Interface.UPDATE_KN8()
+            showPic(erg, PictureBox26)
+        Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try
+        Me.Cursor = Cursors.Default
    End Sub
 End Class