MDM, Startopt

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 If
+                                            End Try
 
                                         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()
-            Button1.PerformClick()
+            btnEinlesen.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