Einarbeitung UTA und Bugfix RMC

DienstplanTV/App.config

@@ -63,12 +63,20 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Renci.SshNet" publicKeyToken="1cee9f8bde3db106" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2014.4.6.0" newVersion="2014.4.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2024.0.0.0" newVersion="2024.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.2.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

UID/ADMIN.vbproj

@@ -231,6 +231,9 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="Renci.SshNet, Version=2024.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+      <HintPath>..\packages\SSH.NET.2024.0.0\lib\net462\Renci.SshNet.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>

UID/App.config

@@ -140,7 +140,7 @@
  
               <assemblyIdentity name="Renci.SshNet" publicKeyToken="1cee9f8bde3db106" culture="neutral" />
  
-              <bindingRedirect oldVersion="0.0.0.0-2014.4.6.0" newVersion="2014.4.6.0" />
+              <bindingRedirect oldVersion="0.0.0.0-2024.0.0.0" newVersion="2024.0.0.0" />
  
           </dependentAssembly>
  
@@ -152,6 +152,22 @@
  
           </dependentAssembly>
  
+          <dependentAssembly>
+ 
+              <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ 
+              <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+ 
+          </dependentAssembly>
+ 
+          <dependentAssembly>
+ 
+              <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+ 
+              <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+ 
+          </dependentAssembly>
+ 
       </assemblyBinding>
  
   </runtime>

UID/frmAPIEinstellungen.vb

@@ -81,7 +81,7 @@ Public Class frmAPIEinstellungen
                             r.DefaultCellStyle.ForeColor = Color.Gray
                         End If
 
-                            If r.Cells("api_url").Value IsNot DBNull.Value AndAlso CheckAddress(r.Cells("api_url").Value) Then
+                        If r.Cells("api_url").Value IsNot DBNull.Value AndAlso CheckAddress(r.Cells("api_url").Value, r.Cells("api_user").Value, r.Cells("api_password").Value) Then
                             DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.ok
                         Else
                             DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.del
@@ -144,15 +144,42 @@ Public Class frmAPIEinstellungen
         If DataGridView.SelectedRows.Count = 0 Then Exit Sub
     End Sub
 
-    Private Function CheckAddress(url As String) As Boolean
+    Private Function CheckAddress(url As String, user As String, pw As String) As Boolean
-        Try
+
         If url = "" Then Return False
-            Dim request As WebRequest = WebRequest.Create(url)
+
+        If Not url.Contains("ftp") Then
+
+            Try
+                Dim request As WebRequest
+                request = WebRequest.Create(url)
                 Dim response As WebResponse = request.GetResponse()
             Catch ex As Exception
                 Return False
             End Try
             Return True
+        Else
+
+            If url.StartsWith("ftp") Then
+                Dim request As FtpWebRequest
+                request = WebRequest.Create(url)
+                request.Credentials = New NetworkCredential(user, pw)
+                request.Method = WebRequestMethods.Ftp.GetFileSize
+
+                Try
+                    Dim response As FtpWebResponse = request.GetResponse()
+                Catch ex As WebException
+                    Dim response As FtpWebResponse = ex.Response
+                    If FtpStatusCode.ActionNotTakenFileUnavailable = response.StatusCode Then
+                        Return False
+                    End If
+                End Try
+            End If
+            Return True
+        End If
+
+
+
     End Function
 
     Private Sub txtSuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown

UID/packages.config

@@ -27,6 +27,7 @@
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net40-Client" requireReinstallation="True" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net47" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net47" />
+  <package id="SSH.NET" version="2024.0.0" targetFramework="net47" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net47" />
   <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net47" />
   <package id="System.IO.Packaging" version="4.0.0" targetFramework="net47" />

initATLASAufschubkonten/RoutineManager.vbproj

@@ -133,6 +133,7 @@
     <Compile Include="cATEZWorker.vb" />
     <Compile Include="cOREGONWorker.vb" />
     <Compile Include="cMAVIWorker.vb" />
+    <Compile Include="cUTA.vb" />
     <Compile Include="frmRMCNachrichtenVerarbeitung.Designer.vb">
       <DependentUpon>frmRMCNachrichtenVerarbeitung.vb</DependentUpon>
     </Compile>

initATLASAufschubkonten/frmRMCNachrichtenVerarbeitung.vb

@@ -4,7 +4,10 @@ Imports System.Runtime.Remoting
 Imports System.Text
 Imports System.Text.RegularExpressions
 Imports System.Xml
+Imports DocumentFormat.OpenXml.Bibliography
 Imports DocumentFormat.OpenXml.Office2010.Excel
+Imports Renci.SshNet
+Imports Renci.SshNet.Sftp
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmRMCNachrichtenVerarbeitung
@@ -13,6 +16,7 @@ Public Class frmRMCNachrichtenVerarbeitung
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
     Dim allowClose = False
     Dim rmc As New cRMC
+    Dim uta As New cUTA
     Dim programName As String
     Dim Dateiname = ""
 
@@ -37,19 +41,33 @@ Public Class frmRMCNachrichtenVerarbeitung
 
     Private Sub frmDYNachrichtenVerarbeitung_Load(sender As Object, e As EventArgs) Handles Me.Load
 
-        rmc.initImportPfade(programName)
+        ListBox3.Items.Clear()
+        Me.Refresh()
+
+
         lblFTP.Text = programName
+
+        If programName.Contains("RMC") Then
+            rmc.initImportPfade(programName)
             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)
+            For Each d In System.IO.Directory.GetFiles(uta.VERARBEITUNG_PFAD)
+                ListBox3.Items.Add(frmStartOptions.cut_file(d))
+                Me.Refresh()
+            Next
+        End If
+
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         Me.Enabled = False
         Try
             Label9.Visible = True
-            Dim cnt = getNachrichtenDatenFromRMCServices()
+            Dim cnt = getNachrichtenDaten()
             Label9.Text = cnt & " Datensätze empfangen."
 
         Catch ex As Exception
@@ -77,11 +95,15 @@ Public Class frmRMCNachrichtenVerarbeitung
     End Sub
 
 
-    Function getNachrichtenDatenFromRMCServices() As Integer
+    Function getNachrichtenDaten() As Integer
         Dim cnt = 0
         Try
-
+            If programName.Contains("RMC") Then
                 DownloadFtpDirectory(rmc.API_STRING & "/", New NetworkCredential(rmc.API.Rows(0).Item("api_user").ToString, rmc.API.Rows(0).Item("api_password").ToString), "", cnt, False)
+            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, False, "/TRX/" & Now.Year)
+            End If
+
 
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -96,6 +118,13 @@ Public Class frmRMCNachrichtenVerarbeitung
         listRequest.Method = WebRequestMethods.Ftp.ListDirectoryDetails
         listRequest.Credentials = credentials
 
+        Dim verarbeitungspfad = ""
+
+        If programName.Contains("RMC") Then
+            verarbeitungspfad = rmc.VERARBEITUNG_PFAD
+        ElseIf programName.Contains("UTA") Then
+            verarbeitungspfad = uta.VERARBEITUNG_PFAD
+        End If
 
         Dim lines As List(Of String) = New List(Of String)
 
@@ -124,11 +153,21 @@ Public Class frmRMCNachrichtenVerarbeitung
                 downloadRequest.Method = WebRequestMethods.Ftp.DownloadFile
                 downloadRequest.Credentials = credentials
 
-                Dim fileDateTmp As Date = ServerDateFile(credentials, fileUrl)
+                ' Dim fileDateTmp As Date = ServerDateFile(credentials, fileUrl)
 
-                name = name.Replace(".csv", "_RGDAT_" & fileDateTmp.ToShortDateString & ".csv")
+                'name = name.Replace(".csv", "_RGDAT_" & Now.ToShortDateString & ".csv")
+
+                Dim destFilenameTMP = verarbeitungspfad
+                If IO.File.Exists(verarbeitungspfad & name) Then
+                    Dim fi As FileInfo = New FileInfo(verarbeitungspfad & name)
+                    destFilenameTMP &= name.Replace(fi.Extension, "_") & Now.ToString("yyMMdd_HHmmss.fff") & fi.Extension
+                Else
+                    destFilenameTMP &= name
+
+                End If
+
+                Try
 
-                Dim destFilenameTMP = rmc.VERARBEITUNG_PFAD & "." & If(IO.File.Exists(rmc.VERARBEITUNG_PFAD & "." & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name)
 
                     Using downloadResponse As FtpWebResponse = downloadRequest.GetResponse(),
                           sourceStream As Stream = downloadResponse.GetResponseStream(),
@@ -146,12 +185,12 @@ Public Class frmRMCNachrichtenVerarbeitung
                         targetStream.Dispose()
                         downloadResponse.Dispose()
 
-                    Dim destFilename = rmc.VERARBEITUNG_PFAD & If(IO.File.Exists(rmc.VERARBEITUNG_PFAD & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name)
+                        'Dim destFilename = verarbeitungspfad & If(IO.File.Exists(verarbeitungspfad & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name)
 
-                    IO.File.Move(destFilenameTMP, destFilename) 'Datei umbenennen
+                        'IO.File.Move(destFilenameTMP, destFilename) 'Datei umbenennen
 
 
-                    Dim fi As FileInfo = New FileInfo(destFilename)
+                        Dim fi As FileInfo = New FileInfo(destFilenameTMP)
                         ListBox3.Items.Add(frmStartOptions.cut_file(fi.Name)) 'zur Liste hinzufügen
                         cnt += 1
 
@@ -166,10 +205,49 @@ Public Class frmRMCNachrichtenVerarbeitung
                         End If
 
                     End Using
+                Catch ex As Exception
+
+                End Try
             End If
             'End If
         Next
     End Sub
+    Function DownloadSFtpDirectory(url As String, credentials As NetworkCredential, localPath As String, ByRef cnt As Integer, deleteAfterDownload As Boolean, Path As String) As Integer
+
+
+        Dim ConnectionInfo As New ConnectionInfo(url, "22", credentials.UserName, New PasswordAuthenticationMethod(credentials.UserName, credentials.Password))
+        Using client = New SftpClient(ConnectionInfo)
+            client.Connect()
+
+            Dim files = client.ListDirectory(Path)
+
+            Dim targetFile As SftpFile
+
+            For Each file As SftpFile In files
+                If file.IsRegularFile AndAlso file.Name.ToLower.Contains(".uta") AndAlso file.Length > 0 Then
+
+                    Dim remoteFileName = "/" & file.Name
+                    Dim filePath = uta.VERARBEITUNG_PFAD & If(IO.File.Exists(uta.VERARBEITUNG_PFAD & file.Name), Name.Replace(".UTA", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".UTA", file.Name)
+
+                    Dim downloadedFile As Stream = IO.File.Create(filePath)
+
+
+                    client.DownloadFile(Path + remoteFileName, downloadedFile)
+
+                    Dim fi As FileInfo = New FileInfo(filePath)
+                    ListBox3.Items.Add(frmStartOptions.cut_file(fi.Name)) 'zur Liste hinzufügen
+                    cnt += 1
+
+                    'TODO: nach erfolgreichen verschieben, von FTP löschen!
+
+                    downloadedFile.Close()
+
+                End If
+            Next
+
+        End Using
+
+    End Function
 
 
 
@@ -186,7 +264,8 @@ Public Class frmRMCNachrichtenVerarbeitung
 
             Return ServerDate
         Catch ex As WebException
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "RMC GET DATE FILE: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & programName & " GET DATE FILE: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            Return Now
         End Try
 
         Return ServerDate
@@ -202,18 +281,28 @@ Public Class frmRMCNachrichtenVerarbeitung
             Exit Sub
         End If
 
+        Dim verarbeitungspfad, zielpfad
+        If programName.Contains("RMC") Then
+            verarbeitungspfad = rmc.VERARBEITUNG_PFAD
+            zielpfad = rmc.ZIEL_PFAD
+        ElseIf programName.Contains("UTA") Then
+            verarbeitungspfad = uta.VERARBEITUNG_PFAD
+            zielpfad = uta.ZIEL_PFAD
+        End If
+
         For i = 1 To 2
 
-            For Each d In System.IO.Directory.GetFiles(rmc.VERARBEITUNG_PFAD)
+            For Each d In System.IO.Directory.GetFiles(verarbeitungspfad)
                 Try
                     Dateiname = d
-                    'cWorker_NCTS.Dateiname = d
                     If IO.File.Exists(d) Then
                         Dim found = False
                         Dim fi As FileInfo = New FileInfo(d)
 
                         Dim alreadyMoved = False
 
+                        If programName.Contains("RMC") Then
+
                             Select Case i
                                 Case 1
                                     '------------------------------------------
@@ -235,39 +324,57 @@ Public Class frmRMCNachrichtenVerarbeitung
 
                                         found = False
 
-                                    If Not IO.Directory.Exists(rmc.ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(rmc.ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
+                                        If Not IO.Directory.Exists(zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
 
                                         'File in Datenarchiv sichern:
+                                        If fi.Name.ToString.StartsWith("invoice_") Then 'aktuell nur die RMC-Dateien! (später, wenn CSV vollständig, dann alle PDS importieren! d.breimaier: 2024-06-05
+
                                             Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d))
 
                                             DS.uploadDataToDATENSERVER(d,,,,,, True)
-                                    If fi.Name.ToString.StartsWith("invoice_") Then
+
                                             SQL.doSQL("Update [tblRMCImport] SET [rmc_daId]='" & DS.da_id & "' where [rmc_pdfFileName] = '" & DS.da_name & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate())  ", "FMZOLL")
+
                                         End If
 
-                                    frmStartOptions.moveFile_DateBack(d, rmc.ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
+                                        frmStartOptions.moveFile_DateBack(d, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
-
+                                        If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
-                                    addDGVEinarbeitung("PDF", DS.da_name)
 
                                         dgvEinarbeitung.Refresh()
 
-                                    'Eintrag 
                                     End If
 
                             End Select
 
+                        ElseIf programName.Contains("UTA") Then
+
+                            '------------------------------------------
+                            '------------------ .UTA ------------------
+                            '------------------------------------------
+
+
+                            If fi.Extension.ToLower = ".uta" Then
+
+                                If Not found Then
+                                    uta.clearimporttable()
+                                    If readUTA(d) <> "" Then found = True
+                                End If
+                                If found Then cntDatenEingelesen += 1
+                            End If
+
+                        End If
                         If True Then
                             If Not alreadyMoved Then
                                 If found Then
-                                    If Not IO.Directory.Exists(rmc.ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(rmc.ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
+                                    If Not IO.Directory.Exists(zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
-                                    frmStartOptions.moveFile_DateBack(d, rmc.ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
+                                    frmStartOptions.moveFile_DateBack(d, zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
+                                End If
                             End If
                         End If
                     End If
-
                     Me.Refresh()
 
-                    End If
+
                 Catch ex As Exception
                     VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
                 End Try
@@ -354,7 +461,7 @@ Public Class frmRMCNachrichtenVerarbeitung
                 If filepath <> "" Then
                     Dim anhenge As New List(Of String)
                     anhenge.Add(filepath)
-                    VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("juricevic@verag.ag", "Wölfl-UIDNr", "Im Anhang die zu prüfenden Kunden von WÖLFL " & vbNewLine & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge)
+                    VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("d.breimaier@verag.ag", "Wölfl-UIDNr", "Im Anhang die zu prüfenden Kunden von WÖLFL " & vbNewLine & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge)
                 End If
 
             End If
@@ -366,6 +473,30 @@ Public Class frmRMCNachrichtenVerarbeitung
         End Try
     End Function
 
+
+    Function readUTA(d As String) As String
+        Try
+
+            Dim fi As FileInfo = New FileInfo(d)
+
+            Dim objFileRead As StreamReader = New StreamReader(d)
+
+
+            If uta.readAndSaveUTA(objFileRead, fi) Then
+                addDGVEinarbeitung(fi.Name, "OK")
+            Else
+                addDGVEinarbeitung(fi.Name, "Fehler")
+            End If
+
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            MsgBox(ex.StackTrace & ex.Message)
+
+        End Try
+    End Function
+
+
     Private Sub dgvEinarbeitung_SelectionChanged(sender As Object, e As EventArgs) Handles dgvEinarbeitung.SelectionChanged
         dgvEinarbeitung.ClearSelection()
 
@@ -426,5 +557,6 @@ Public Class frmRMCNachrichtenVerarbeitung
 
     End Sub
 
+
 End Class
 

initATLASAufschubkonten/frmStartOptions.vb

@@ -4373,4 +4373,12 @@ Public Class frmStartOptions
         f.ShowDialog()
         Me.Visible = True
     End Sub
+
+    Private Sub LinkLabel53_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel53.LinkClicked
+        Me.Visible = False
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
+        Dim f As New frmRMCNachrichtenVerarbeitung("UTA")
+        f.ShowDialog()
+        Me.Visible = True
+    End Sub
 End Class