MDM, Startopt

initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.Designer.vb

@@ -33,12 +33,12 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
         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.btnEinlesen = New System.Windows.Forms.Button()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.ListBox3 = New System.Windows.Forms.ListBox()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.Label5 = New System.Windows.Forms.Label()
-        Me.Button1 = New System.Windows.Forms.Button()
+        Me.btnEinarbeiten = New System.Windows.Forms.Button()
         Me.btnOK = New System.Windows.Forms.Button()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
@@ -71,12 +71,12 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
         Me.pnl.Controls.Add(Me.lblDatenCnt)
         Me.pnl.Controls.Add(Me.dgvEinarbeitung)
         Me.pnl.Controls.Add(Me.Label9)
-        Me.pnl.Controls.Add(Me.Button2)
+        Me.pnl.Controls.Add(Me.btnEinlesen)
         Me.pnl.Controls.Add(Me.Label7)
         Me.pnl.Controls.Add(Me.ListBox3)
         Me.pnl.Controls.Add(Me.Label6)
         Me.pnl.Controls.Add(Me.Label5)
-        Me.pnl.Controls.Add(Me.Button1)
+        Me.pnl.Controls.Add(Me.btnEinarbeiten)
         Me.pnl.Controls.Add(Me.btnOK)
         Me.pnl.Controls.Add(Me.Label2)
         Me.pnl.Controls.Add(Me.Label1)
@@ -160,15 +160,15 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
         Me.Label9.Text = "läuft..."
         Me.Label9.Visible = False
         '
-        'Button2
+        'btnEinlesen
         '
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnEinlesen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(309, 50)
+        Me.btnEinlesen.Location = New System.Drawing.Point(309, 50)
-        Me.Button2.Name = "Button2"
+        Me.btnEinlesen.Name = "btnEinlesen"
-        Me.Button2.Size = New System.Drawing.Size(141, 50)
+        Me.btnEinlesen.Size = New System.Drawing.Size(141, 50)
-        Me.Button2.TabIndex = 16
+        Me.btnEinlesen.TabIndex = 16
-        Me.Button2.Text = "Einlesen"
+        Me.btnEinlesen.Text = "Einlesen"
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.btnEinlesen.UseVisualStyleBackColor = True
         '
         'Label7
         '
@@ -209,15 +209,15 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
         Me.Label5.Text = "läuft..."
         Me.Label5.Visible = False
         '
-        'Button1
+        'btnEinarbeiten
         '
-        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnEinarbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(309, 164)
+        Me.btnEinarbeiten.Location = New System.Drawing.Point(309, 164)
-        Me.Button1.Name = "Button1"
+        Me.btnEinarbeiten.Name = "btnEinarbeiten"
-        Me.Button1.Size = New System.Drawing.Size(141, 50)
+        Me.btnEinarbeiten.Size = New System.Drawing.Size(141, 50)
-        Me.Button1.TabIndex = 9
+        Me.btnEinarbeiten.TabIndex = 9
-        Me.Button1.Text = "Einarbeiten"
+        Me.btnEinarbeiten.Text = "Einarbeiten"
-        Me.Button1.UseVisualStyleBackColor = True
+        Me.btnEinarbeiten.UseVisualStyleBackColor = True
         '
         'btnOK
         '
@@ -236,9 +236,9 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
         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(220, 13)
+        Me.Label2.Size = New System.Drawing.Size(172, 13)
         Me.Label2.TabIndex = 8
-        Me.Label2.Text = "Einarbeitung der Nachrichtendaten von RMC"
+        Me.Label2.Text = "Einarbeitung der Nachrichtendaten"
         '
         'Label1
         '
@@ -250,7 +250,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
         Me.Label1.TabIndex = 8
         Me.Label1.Text = "Einarbeitung:"
         '
-        'frmRMCNachrichtenVerarbeitung
+        'frmNachrichtenVerarbeitung_MDM_divers
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -258,7 +258,7 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
         Me.Controls.Add(Me.pnl)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.Name = "frmRMCNachrichtenVerarbeitung"
+        Me.Name = "frmNachrichtenVerarbeitung_MDM_divers"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "DY NachrichtenVerarbeitung"
         Me.pnl.ResumeLayout(False)
@@ -271,14 +271,14 @@ Partial Class frmNachrichtenVerarbeitung_MDM_divers
     Friend WithEvents pnl As System.Windows.Forms.Panel
     Friend WithEvents Label2 As System.Windows.Forms.Label
     Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents Button1 As System.Windows.Forms.Button
+    Friend WithEvents btnEinarbeiten As System.Windows.Forms.Button
     Friend WithEvents btnOK As System.Windows.Forms.Button
     Friend WithEvents Label5 As System.Windows.Forms.Label
     Friend WithEvents Label6 As System.Windows.Forms.Label
     Friend WithEvents Label7 As System.Windows.Forms.Label
     Friend WithEvents ListBox3 As System.Windows.Forms.ListBox
     Friend WithEvents Label9 As System.Windows.Forms.Label
-    Friend WithEvents Button2 As System.Windows.Forms.Button
+    Friend WithEvents btnEinlesen As System.Windows.Forms.Button
     Friend WithEvents dgvEinarbeitung As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents lblDatenCnt As Label
     Friend WithEvents clmnArt As DataGridViewTextBoxColumn

initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb

@@ -8,8 +8,6 @@ Imports Renci.SshNet
 Imports Renci.SshNet.Sftp
 Imports VERAG_PROG_ALLGEMEIN
 
-
-
 Public Class frmNachrichtenVerarbeitung_MDM_divers
     Dim cntDatenEingelesen As Integer = 0
     Dim dsNichtErkannt As Integer = 0
@@ -54,24 +52,36 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
         ListBox3.Items.Clear()
         Me.Refresh()
 
-        Button2.Enabled = enableEinlesen
+        btnEinlesen.Enabled = enableEinlesen
 
         lblFTP.Text = programName
 
         If programName.Contains("RMC") Then
             rmc.initImportPfade(programName)
+            setButtons(Not rmc.VERARBEITUNG_PFAD = "")
+            setButtons(Not rmc.ZIEL_PFAD = "")
+            If rmc.VERARBEITUNG_PFAD = "" Then Exit Sub
+            If rmc.ZIEL_PFAD = "" Then Exit Sub
             For Each d In System.IO.Directory.GetFiles(rmc.VERARBEITUNG_PFAD)
                 ListBox3.Items.Add(frmStartOptions.cut_file(d))
                 Me.Refresh()
             Next
         ElseIf programName.Contains("UTA") Then
             uta.initImportPfade(programName)
+            setButtons(Not uta.VERARBEITUNG_PFAD = "")
+            setButtons(Not uta.ZIEL_PFAD = "")
+            If uta.VERARBEITUNG_PFAD = "" Then Exit Sub
+            If uta.ZIEL_PFAD = "" Then Exit Sub
             For Each d In System.IO.Directory.GetFiles(uta.VERARBEITUNG_PFAD)
                 ListBox3.Items.Add(frmStartOptions.cut_file(d))
                 Me.Refresh()
             Next
         ElseIf programName.Contains("IDS") Then
             ids.initImportPfade(programName)
+            setButtons(Not ids.VERARBEITUNG_PFAD = "", True)
+            setButtons(Not ids.ZIEL_PFAD = "", True)
+            If ids.VERARBEITUNG_PFAD = "" Then Exit Sub
+            If ids.ZIEL_PFAD = "" Then Exit Sub
             For Each d In System.IO.Directory.GetFiles(ids.VERARBEITUNG_PFAD)
                 ListBox3.Items.Add(frmStartOptions.cut_file(d))
                 Me.Refresh()
@@ -80,7 +90,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
 
     End Sub
 
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnEinlesen.Click
         Me.Enabled = False
         Try
             Label9.Visible = True
@@ -93,7 +103,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
         Me.Enabled = True
 
     End Sub
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnEinarbeiten.Click
         Me.Enabled = False
         Try
             Label5.Visible = True
@@ -120,7 +130,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
             ElseIf programName.Contains("UTA") Then
                 DownloadSFtpDirectory(uta.API_STRING, New NetworkCredential(uta.API.Rows(0).Item("api_user").ToString, uta.API.Rows(0).Item("api_password").ToString), "", cnt, deleteFilesAfterDownload, "/TRX/" & year, renameFilesAfterDownload)
             ElseIf programName.Contains("IDS") Then
-                'keinFTP (NOCH NICHT)!
+                'keinFTP (NOCH NICHT??)!
             End If
 
 
@@ -437,7 +447,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
 
                                         If True Then 'Not System.IO.Directory.Exists(zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then System.IO.Directory.CreateDirectory(zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
 
-                                            If fi.Name.ToString.StartsWith("AP") AndAlso fi.Name.Contains("ZUGFERD") Then
+                                            If fi.Name.ToString.StartsWith("AP") AndAlso fi.Name.ToLower.Contains("zugferd") Then
 
                                                 Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "UTA", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d))
 
@@ -579,12 +589,12 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
                                             Try
 
                                             Catch ex As System.Exception
-                                                End Try
+                                            End Try
-
-                                            End If
 
                                         End If
 
+                                    End If
+
 
                                     If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
                                     dgvEinarbeitung.Refresh()
@@ -768,8 +778,8 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
         If allowClose Then
             Me.Refresh()
 
-            Button2.PerformClick()
+            btnEinlesen.PerformClick()
-            Button1.PerformClick()
+            btnEinarbeiten.PerformClick()
 
             System.Threading.Thread.Sleep(2000)
 
@@ -824,5 +834,14 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
     End Sub
 
 
+    Private Sub setButtons(enable As Boolean, Optional alwaysDisableEinlesen As Boolean = False)
+
+
+        btnEinarbeiten.Enabled = enable
+        btnEinlesen.Enabled = enable
+        If alwaysDisableEinlesen Then btnEinlesen.Enabled = False
+
+    End Sub
+
 End Class
 

initATLASAufschubkonten/frmStartOptions.vb

@@ -5372,6 +5372,7 @@ Public Class frmStartOptions
 
 
 
+
     End Sub
 
     Private Sub LinkLabel65_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel65.LinkClicked