Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

2024-04-17 08:50:18 +02:00
parent aaebe0b8a1 e1187607f2
commit e381a1eace
3 changed files with 63 additions and 27 deletions
--- a/initATLASAufschubkonten/RoutineManager.vbproj
+++ b/initATLASAufschubkonten/RoutineManager.vbproj
@@ -97,9 +97,6 @@
      <EmbedInteropTypes>True</EmbedInteropTypes>
      <HintPath>C:\Windows\assembly\GAC_MSIL\office\15.0.0.0__71e9bce111e9429c\OFFICE.DLL</HintPath>
    </Reference>
-    <Reference Include="Renci.SshNet">
-      <HintPath>..\..\..\dll\Renci.SshNet.dll</HintPath>
-    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.Deployment" />
@@ -311,6 +308,20 @@
  <ItemGroup>
    <WCFMetadata Include="Connected Services\" />
  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
+      <Version>1.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="SSH.NET">
+      <Version>2024.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+      <Version>6.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Tasks.Extensions">
+      <Version>4.5.4</Version>
+    </PackageReference>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb
+++ b/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb
@@ -139,7 +139,7 @@
                                Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId, getTOBBKdnr)
                                If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found)
                            Else
-                                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.ncts_ObjectName & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)")
+                                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.ncts_ObjectName & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)", VERAG_PROG_ALLGEMEIN.cAllgemein.EMailTOBB_Error)
                            End If
                        Case Else
                            Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId)
@@ -271,7 +271,7 @@
                                Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS004_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId, getTOBBKdnr)
                                If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found)
                            Else
-                                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.ncts_ObjectName & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)")
+                                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.ncts_ObjectName & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)", VERAG_PROG_ALLGEMEIN.cAllgemein.EMailTOBB_Error)
                            End If
                        Case Else
                            Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS004_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId)
@@ -396,7 +396,7 @@
                                Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromTELOTEC_V2_0_2(NCTS_TMP, UniqueId, getTOBBKdnr)
                                copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found)
                            Else
-                                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.telanm_BezugsNr & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & NCTS_TMP.telanm_BezugsNr & " (TELOTEC)")
+                                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.telanm_BezugsNr & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & NCTS_TMP.telanm_BezugsNr & " (TELOTEC)", VERAG_PROG_ALLGEMEIN.cAllgemein.EMailTOBB_Error)
                            End If

                        Case Else
@@ -580,7 +580,7 @@
                                Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromEZOLLByAnmId_V2_0_2(AnmId, UniqueId, getTOBBKdnr)
                                If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found)
                            Else
-                                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & LRN & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & LRN & " (DHF/EZOLL)")
+                                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & LRN & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & LRN & " (DHF/EZOLL)", VERAG_PROG_ALLGEMEIN.cAllgemein.EMailTOBB_Error)
                            End If

                        Case Else
--- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
+++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
@@ -8,6 +8,8 @@ Imports DocumentFormat.OpenXml.Wordprocessing
 Imports DAKOSY_Worker
 Imports Renci.SshNet.Messages
 Imports System.Windows.Forms.VisualStyles.VisualStyleElement
+Imports DocumentFormat.OpenXml.Drawing.Charts
+Imports iTextSharp.text.xml.simpleparser

 Public Class frmDYNachrichtenVerarbeitung
    Dim cntDatenEingelesen As Integer = 0
@@ -114,12 +116,31 @@ Public Class frmDYNachrichtenVerarbeitung
            Dim DY_PFAD_out = ""

            DAKOSY_Worker.cDakosyFunftions.getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, "", DY_PFAD_out, "", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+            Dim ECDSA_host_keytype = "ecdsa-sha2-nistp256" ' AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBI3RSVXoxHUFRiQHph842E8zKMuOrh2HkPh/kKaFy97xAORrYtiEAYL7sZ507RoIP689JbXTAOt2yu5/dse9yZo="
+            Dim rsa_host_keytype = "ssh-rsa" ' AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBI3RSVXoxHUFRiQHph842E8zKMuOrh2HkPh/kKaFy97xAORrYtiEAYL7sZ507RoIP689JbXTAOt2yu5/dse9yZo="
+            Dim ECDSA_host_key As String = "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBI3RSVXoxHUFRiQHph842E8zKMuOrh2HkPh/kKaFy97xAORrYtiEAYL7sZ507RoIP689JbXTAOt2yu5/dse9yZo="
+            Dim SHA256_fingerprint = "KmghfUlqnv/XqRw+FPIdRlp0UYQv6iJf9unHUjHzG5w"
+            Dim MD5_fingerprint = "cf:64:a2:08:e8:05:20:02:d8:4f:3b:74:6a:f2:43:06"
+
+            'Dim privateKey As PrivateKeyFile = New PrivateKeyFile(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".ssh", "id_rsa"), "passphrase")
+            'Dim sshClient As SshClient = New SshClient("192.168.0.1", 22, "user", privateKey)
+            'sshClient.Connect()
+            'Dim command As SshCommand = sshClient.CreateCommand("ls -la")
+            'command.Execute()
+            'Dim answer As String = command.Result
+
+


            Dim ConnectionInfo As New ConnectionInfo(DY_server, DY_port, DY_name, New PasswordAuthenticationMethod(DY_name, DY_pwd))
+
+
            Using client = New SftpClient(ConnectionInfo)
                client.Connect()

+
+
+                'MsgBox(client.ListDirectory(DY_PFAD_out).Count)
                For Each f In client.ListDirectory(DY_PFAD_out)
                    If Not f.Name.StartsWith(".") And Not f.IsDirectory Then
                        'Temp. DownloadPfad
@@ -142,8 +163,11 @@ Public Class frmDYNachrichtenVerarbeitung
                Next
                client.Disconnect()
            End Using
+
        Catch ex As Exception
            If ex.Message.Contains("connection was aborted by the server") Then
+                '  VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+                'Bei großen Datenmengen kann die Verbindung abbrechen -> nicht alle Elemente werden abgeholt
            Else

                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -7148,6 +7172,7 @@ Public Class frmDYNachrichtenVerarbeitung
                End If

                If TXT_Rückweisung <> "" Then
+
                    'Benachrichtigung
                    Try
                        Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -7183,16 +7208,16 @@ Public Class frmDYNachrichtenVerarbeitung
                        'Wenn gefunden
                        If (art = "F" AndAlso If(sendToID, "") <> "") OrElse sendToID >= 0 Then
                            Dim statusAVISO = SQL.DLookup("Status", "Aviso", "AvisoID='" & DY_TMP.dy_AvisoId & "'", "AVISO")
-                            Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & DY_TMP.dy_AvisoId & "'", "AVISO")
-                            If GrenzstelleAVISO = "???" Then
-                                Select Case statusAVISO
-                                    Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben
-                                        'Nicht
-                                    Case Else
-                                        Dim code = VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.ZOLL_Rueckweisung
-                                        VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(DY_TMP.dy_AvisoId, DY_TMP.dy_SendungsId, code, art, sendToID, "ZOLL: Rückweisung", 1, , (TXT_Rückweisung & vbNewLine & TXT_Mitteilung).Trim,,, If(EZA_TMP IsNot Nothing, If(EZA_TMP.eza_firma, ""), ""))
-                                End Select
-                            End If
+                            ' Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & DY_TMP.dy_AvisoId & "'", "AVISO")
+                            ' If GrenzstelleAVISO = "???" Then 'lt. ML 27.03.-> für alle freigeben
+                            Select Case statusAVISO
+                                Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben
+                                    'Nicht
+                                Case Else
+                                    Dim code = VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.ZOLL_Rueckweisung
+                                    VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(DY_TMP.dy_AvisoId, DY_TMP.dy_SendungsId, code, art, sendToID, "ZOLL: Rückweisung", 1, , (TXT_Rückweisung & vbNewLine & TXT_Mitteilung).Trim,,, If(EZA_TMP IsNot Nothing, If(EZA_TMP.eza_firma, ""), ""))
+                            End Select
+                            ' End If
                        End If

                    Catch ex As Exception
@@ -7247,16 +7272,16 @@ Public Class frmDYNachrichtenVerarbeitung
                                If (art = "F" AndAlso If(sendToID, "") <> "") OrElse sendToID >= 0 Then
                                    '    If sendToID = 153 Or sendToID = 174 Then '--> NUR TOBI/MATHIAS!!
                                    Dim statusAVISO = SQL.DLookup("Status", "Aviso", "AvisoID='" & DY_TMP.dy_AvisoId & "'", "AVISO")
-                                    Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & DY_TMP.dy_AvisoId & "'", "AVISO")
-                                    If GrenzstelleAVISO = "???" Then
-                                        Select Case statusAVISO
-                                            Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben
-                                                'Nicht
-                                            Case Else
-                                                Dim code = VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.ZOLL_Mitteilung
-                                                VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(DY_TMP.dy_AvisoId, DY_TMP.dy_SendungsId, code, art, sendToID, "ZOLL: Mitteilung", 1, , (TXT_Mitteilung & TXT_Mitteilung_Zollbeamter).Trim,,, If(EZA_TMP IsNot Nothing, If(EZA_TMP.eza_firma, ""), ""))
-                                        End Select
-                                    End If
+                                    'Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & DY_TMP.dy_AvisoId & "'", "AVISO")
+                                    'If GrenzstelleAVISO = "???" Then  'lt. ML 27.03.-> für alle freigeben
+                                    Select Case statusAVISO
+                                        Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben
+                                            'Nicht
+                                        Case Else
+                                            Dim code = VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.ZOLL_Mitteilung
+                                            VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(DY_TMP.dy_AvisoId, DY_TMP.dy_SendungsId, code, art, sendToID, "ZOLL: Mitteilung", 1, , (TXT_Mitteilung & TXT_Mitteilung_Zollbeamter).Trim,,, If(EZA_TMP IsNot Nothing, If(EZA_TMP.eza_firma, ""), ""))
+                                    End Select
+                                    '  End If
                                    '      End If
                                End If