mergekonfl.

Aviso/frmSendungsdetailsNEU.vb

@@ -6278,11 +6278,20 @@ Public Class frmSendungsdetailsNEU
         Me.Cursor = Cursors.Default
     End Sub
 
+    Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click
+        SAVE_ME()
 
+        Try
+            If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
+                Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX)
+                Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy"))
+                frmAttilaATEZNCTS.Show(Me)
+            End If
 
-    Private Sub ToolStripMenuItem31_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem31.Click
-        'MsgBox("Funktion noch nicht implementiert!")
-        'Exit Sub
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Me.Cursor = Cursors.Default
 
         SAVE_ME()
         If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
@@ -6293,7 +6302,41 @@ Public Class frmSendungsdetailsNEU
                                      End Sub
     End Sub
 
-    Sub initdgvATEZ()
+    Private Sub ATEZToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATEZToolStripMenuItem.Click
+        Try
+            If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
+                Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX)
+                Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy"))
+                frmAttilaATEZNCTS.Show(Me)
+            End If
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Me.Cursor = Cursors.Default
+
+
+    End Sub
+
+    Private Sub DigicustToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DigicustToolStripMenuItem.Click
+        Try
+            If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
+                If AVISO.ImEx.ToLower() <> "import" Then
+                    MsgBox("API unterstützt nur Importe!" & vbNewLine & "Aktenübersicht-Einstellungen kontrollieren")
+                    Exit Sub
+                End If
+                Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX)
+                Dim frm = New frmDigicust(AVISO, SND, Now.ToString("yy"))
+                frm.Show(Me)
+            End If
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+      Sub initdgvATEZ()
         With dgvATEZNCTS
             .Columns.Clear()
             .ReadOnly = False
@@ -6340,24 +6383,4 @@ Public Class frmSendungsdetailsNEU
         End Try
 
     End Sub
-
-    Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click
-        SAVE_ME()
-
-        Try
-            If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
-                Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX)
-                Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy"))
-                frmAttilaATEZNCTS.Show(Me)
-            End If
-
-        Catch ex As Exception
-            MsgBox(ex.Message & ex.StackTrace)
-        End Try
-        Me.Cursor = Cursors.Default
-
-        initTab()
-
-
-    End Sub
 End Class