Prüfung Datenarchiv

DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb

@@ -117,6 +117,7 @@ Public Class cDakosyEZA
     Property eza_AUFSCHUB As New List(Of cDakosy_EZA_Aufschub)
     Property eza_SUMABA As New List(Of cDakosy_EZA_SumABeendigungsAnteil)
     Property eza_BEA_ZLAvuv As New List(Of cDakosy_EZA_BEAnteilZLAVUV)
+    Property eza_DV1Kostenverteilung As New List(Of cDakosy_EZA_DV1Kosten)
 
 
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -276,6 +277,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
         If Not SAVE_Aufschub() Then Return False
         If Not SAVE_BEAnteilZLAVUV() Then Return False
         If Not SAVE_SumABeendigungsAnteil() Then Return False
+        If Not SAVE_DV1Kostenverteilung() Then Return False
         Return True
     End Function
 
@@ -291,6 +293,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
                 eza_AUFSCHUB.Clear()
                 eza_BEA_ZLAvuv.Clear()
                 eza_SUMABA.Clear()
+                eza_DV1Kostenverteilung.Clear()
             End If
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
                 Using cmd As New SqlCommand("SELECT * FROM tblDakosy_eza WHERE eza_Id=@eza_Id  ", conn)
@@ -315,6 +318,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
                             LOAD_Aufschub()
                             LOAD_BEAnteilZLAVUV()
                             LOAD_SumABeendigungsAnteil()
+                            LOAD_DV1Kostenverteilung()
                         End If
                         LOAD = True
                     End If
@@ -357,6 +361,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
                             EZA.LOAD_Aufschub()
                             EZA.LOAD_BEAnteilZLAVUV()
                             EZA.LOAD_SumABeendigungsAnteil()
+                            EZA.LOAD_DV1Kostenverteilung()
                         End If
 
                         dr.Close()
@@ -405,6 +410,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
                 eza_AUFSCHUB.Clear()
                 eza_BEA_ZLAvuv.Clear()
                 eza_SUMABA.Clear()
+                eza_DV1Kostenverteilung.Clear()
             End If
             Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
                 Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_EZA WHERE eza_dyaAnmID=@eza_dyaAnmID  ", conn)
@@ -429,6 +435,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
                             LOAD_Aufschub()
                             LOAD_BEAnteilZLAVUV()
                             LOAD_SumABeendigungsAnteil()
+                            LOAD_DV1Kostenverteilung()
                         End If
                         LOADByAnmID = True
                     End If
@@ -449,6 +456,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
         Me.LOAD_Aufschub()
         Me.LOAD_BEAnteilZLAVUV()
         Me.LOAD_SumABeendigungsAnteil()
+        Me.LOAD_DV1Kostenverteilung()
 
 
     End Sub
@@ -482,6 +490,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
                             EZA.LOAD_Aufschub()
                             EZA.LOAD_BEAnteilZLAVUV()
                             EZA.LOAD_SumABeendigungsAnteil()
+                            EZA.LOAD_DV1Kostenverteilung()
                         End If
 
                         dr.Close()
@@ -526,6 +535,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
                             EZA.LOAD_Aufschub()
                             EZA.LOAD_BEAnteilZLAVUV()
                             EZA.LOAD_SumABeendigungsAnteil()
+                            EZA.LOAD_DV1Kostenverteilung()
                         End If
 
                         dr.Close()
@@ -1419,6 +1429,65 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_
 
 
 
+
+    ' DV1-Kosten: separate Tabelle, damit Kopfkosten persistent und mehrfach speicherbar sind.
+    Public Sub LOAD_DV1Kostenverteilung()
+        eza_DV1Kostenverteilung.Clear()
+        If eza_Id <= 0 Then Exit Sub
+        Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+            Using cmd As New SqlCommand("SELECT Kostenart, Kosten, KostenWaehrung, WechselkursArt, Verteilungsart, Minimalbetrag FROM dbo.tblDakosy_EZA_DV1Kostenverteilung WHERE eza_Id=@eza_Id ORDER BY Id", conn)
+                cmd.Parameters.Add("@eza_Id", SqlDbType.Int).Value = eza_Id
+                Using dr As SqlDataReader = cmd.ExecuteReader()
+                    While dr.Read()
+                        eza_DV1Kostenverteilung.Add(New cDakosy_EZA_DV1Kosten With {
+                            .Kostenart = If(dr.IsDBNull(0), "", dr.GetString(0)),
+                            .Kosten = If(dr.IsDBNull(1), "", dr.GetString(1)),
+                            .KostenWaehrung = If(dr.IsDBNull(2), "", dr.GetString(2)),
+                            .WechselkursArt = If(dr.IsDBNull(3), "", dr.GetString(3)),
+                            .Verteilungsart = If(dr.IsDBNull(4), "", dr.GetString(4)),
+                            .Minimalbetrag = If(dr.IsDBNull(5), "", dr.GetString(5))})
+                    End While
+                End Using
+            End Using
+        End Using
+    End Sub
+
+    Public Function SAVE_DV1Kostenverteilung() As Boolean
+        If eza_Id <= 0 Then Return False
+        Try
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using tran As SqlTransaction = conn.BeginTransaction()
+                    Try
+                        Using cmd As New SqlCommand("DELETE FROM dbo.tblDakosy_EZA_DV1Kostenverteilung WHERE eza_Id=@eza_Id", conn, tran)
+                            cmd.Parameters.Add("@eza_Id", SqlDbType.Int).Value = eza_Id
+                            cmd.ExecuteNonQuery()
+                        End Using
+                        For Each k As cDakosy_EZA_DV1Kosten In eza_DV1Kostenverteilung
+                            Using cmd As New SqlCommand("INSERT INTO dbo.tblDakosy_EZA_DV1Kostenverteilung (eza_Id, Kostenart, Kosten, KostenWaehrung, WechselkursArt, Verteilungsart, Minimalbetrag) VALUES (@id,@art,@kosten,@waehrung,@kurs,@verteilung,@min)", conn, tran)
+                                cmd.Parameters.Add("@id", SqlDbType.Int).Value = eza_Id
+                                cmd.Parameters.Add("@art", SqlDbType.VarChar, 20).Value = If(k.Kostenart, "")
+                                cmd.Parameters.Add("@kosten", SqlDbType.VarChar, 50).Value = If(k.Kosten, "")
+                                cmd.Parameters.Add("@waehrung", SqlDbType.VarChar, 10).Value = If(k.KostenWaehrung, "")
+                                cmd.Parameters.Add("@kurs", SqlDbType.VarChar, 20).Value = If(k.WechselkursArt, "")
+                                cmd.Parameters.Add("@verteilung", SqlDbType.VarChar, 30).Value = If(k.Verteilungsart, "")
+                                cmd.Parameters.Add("@min", SqlDbType.VarChar, 50).Value = If(k.Minimalbetrag, "")
+                                cmd.ExecuteNonQuery()
+                            End Using
+                        Next
+                        tran.Commit()
+                    Catch
+                        tran.Rollback()
+                        Throw
+                    End Try
+                End Using
+            End Using
+            Return True
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod().Name)
+            Return False
+        End Try
+    End Function
+
 End Class
 Public Class cDakosy_EZA_Adressen
 
@@ -2482,3 +2551,12 @@ Public Class cDakosy_EZA_WarenpositionVerbrauchssteuer
     End Function
 
 End Class
+
+Public Class cDakosy_EZA_DV1Kosten
+    Public Property Kostenart As String = ""
+    Public Property Kosten As String = ""
+    Public Property KostenWaehrung As String = ""
+    Public Property WechselkursArt As String = ""
+    Public Property Verteilungsart As String = ""
+    Public Property Minimalbetrag As String = ""
+End Class

DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb

@@ -3090,7 +3090,8 @@ Public Class cDakosyNCTSOut004
         End Select
     End Function
 
-    Shared Function fillNCTS_WithEXG(ByRef NCTS_OUT As cDakosyNCTSOut004, exg As cDakosyEXG, Optional ObjectName As String = "", Optional AutoTranslate As Boolean? = Nothing, Optional ForceTranslate As Boolean? = Nothing) As cDakosyNCTSOut004
+
+    Shared Function fillNCTS_WithEXG(ByRef NCTS_OUT As cDakosyNCTSOut004, exg As cDakosyEXG, Optional ObjectName As String = "", Optional AutoTranslate As Boolean? = Nothing, Optional ForceTranslate As Boolean? = Nothing, Optional VersLandAusVersender As Boolean = False, Optional BestLandAusEmpfaenger As Boolean = False) As cDakosyNCTSOut004
 
         If NCTS_OUT Is Nothing Then
             NCTS_OUT = New DAKOSY_Worker.cDakosyNCTSOut004
@@ -3129,12 +3130,18 @@ Public Class cDakosyNCTSOut004
 
         'House Consignment
         HC.nctsHC_GrossMass = exg.exg_GrossMass
-        HC.nctsHC_CountryOfDestination = exg.exg_CountryOfDestination
-        'Versendungsland: zuerst EXG, alternativ Versenderadresse
-        HC.nctsHC_CountryOfDispatch = If(exg.exg_CountryOfDispatch, "").Trim().ToUpperInvariant()
 
-        If String.IsNullOrWhiteSpace(HC.nctsHC_CountryOfDispatch) Then
+        'Versendungs- und Bestimmungsland aus EXG
-            HC.nctsHC_CountryOfDispatch = If(exg.exg_Consignor_Country, "").Trim().ToUpperInvariant()
+        HC.nctsHC_CountryOfDispatch = exg.exg_CountryOfDispatch
+        HC.nctsHC_CountryOfDestination = exg.exg_CountryOfDestination
+
+        'Optionale Übernahme aus Versender- bzw. Empfängeradresse
+        If VersLandAusVersender AndAlso Not String.IsNullOrWhiteSpace(Convert.ToString(HC.nctsHC_Consignor_Country)) Then
+            HC.nctsHC_CountryOfDispatch = HC.nctsHC_Consignor_Country
+        End If
+
+        If BestLandAusEmpfaenger AndAlso Not String.IsNullOrWhiteSpace(Convert.ToString(HC.nctsHC_Consignee_Country)) Then
+            HC.nctsHC_CountryOfDestination = HC.nctsHC_Consignee_Country
         End If
 
         'UCR bewusst nicht übernehmen
@@ -3205,10 +3212,9 @@ Public Class cDakosyNCTSOut004
                 HC_ITEM.nctsHCCI_DeclarationType = DetermineTransitProcedure(EXG_POS.exgPos_RequestedProcedure, EXG_POS.exgPos_PreviousProcedure)
 
                 Debug.WriteLine($"NCTS Transit: Requested={EXG_POS.exgPos_RequestedProcedure}, Previous={EXG_POS.exgPos_PreviousProcedure}, Result={HC_ITEM.nctsHCCI_DeclarationType}")
-
             End If
 
-            'Packstücke
+            'Packstücke zunächst ohne Beipackverweise übernehmen
             If EXG_POS.exgPos_PACKAGING IsNot Nothing Then
                 For Each EXG_PK In EXG_POS.exgPos_PACKAGING
 
@@ -3218,31 +3224,61 @@ Public Class cDakosyNCTSOut004
                     HC_PK.nctsHCCIPK_TypeOfPackages = EXG_PK.exgPosPk_TypeOfPackages
                     HC_PK.nctsHCCIPK_ShippingMarks = EXG_PK.exgPosPk_ShippingMarks
 
-                    If Val(Convert.ToString(EXG_PK.exgPosPk_NumberOfPackages)) = 0 Then
-                        'Verweis auf erste Warenposition im selben House Consignment
-                        HC_PK.nctsHCCIPK_GoodsItemNumber = 1
-                    End If
-
                     HC_ITEM.nctsHCCI_PACKAGING.Add(HC_PK)
 
                 Next
             End If
 
             HC.nctsWP_CONSIGNMENT_ITEM.Add(HC_ITEM)
+
+        Next
+
+        'Beipackverweise erst nach vollständiger Erstellung aller Warenpositionen ermitteln
+        For Each item In HC.nctsWP_CONSIGNMENT_ITEM
+            For Each pk In item.nctsHCCI_PACKAGING
+
+                'Nur Packstücke mit expliziter Anzahl 0 sind Beipack-Kandidaten
+                Dim packageCount As String = Convert.ToString(pk.nctsHCCIPK_NumberOfPackages).Trim()
+                If packageCount <> "0" Then Continue For
+
+                Dim shippingMarks As String = Convert.ToString(pk.nctsHCCIPK_ShippingMarks).Trim()
+                If shippingMarks = "" Then
+                    Debug.WriteLine("NCTS Beipack: Versandzeichen fehlen / EXG " & exg.exg_ObjectName)
+                    Continue For
+                End If
+
+                Dim referencePosition As Integer = 0
+
+                'Erste Warenposition mit identischem Versandzeichen und Packstückanzahl > 0 suchen
+                For i As Integer = 0 To HC.nctsWP_CONSIGNMENT_ITEM.Count - 1
+
+                    Dim candidate = HC.nctsWP_CONSIGNMENT_ITEM(i)
+                    If candidate Is item Then Continue For
+
+                    Dim matchingPK = candidate.nctsHCCI_PACKAGING.FirstOrDefault(
+                    Function(p) Val(Convert.ToString(p.nctsHCCIPK_NumberOfPackages)) > 0 AndAlso
+                                String.Equals(Convert.ToString(p.nctsHCCIPK_ShippingMarks).Trim(), shippingMarks, StringComparison.OrdinalIgnoreCase))
+
+                    If matchingPK IsNot Nothing Then
+                        referencePosition = i + 1
+                        Exit For
+                    End If
+
+                Next
+
+                If referencePosition > 0 Then
+                    pk.nctsHCCIPK_GoodsItemNumber = referencePosition
+                Else
+                    Debug.WriteLine("NCTS Beipack: Keine Hauptpackposition für Versandzeichen '" & shippingMarks & "' gefunden / EXG " & exg.exg_ObjectName)
+                End If
+
+            Next
         Next
 
         NCTS_OUT.ncts_HOUSE_CONSIGNMENT.Add(HC)
 
         'Verfahrensart wird erst nach Zusammenführung aller EXG bestimmt
         'Positions-Verfahrensarten bleiben bis dahin erhalten
-        'Dim declType As String = GetDeclarationType(NCTS_OUT.ncts_HOUSE_CONSIGNMENT)
-
-        'If declType <> "" Then
-        '    emptyAllDeclarationItems(NCTS_OUT.ncts_HOUSE_CONSIGNMENT)
-        '    NCTS_OUT.ncts_Declarationtype = declType
-        'Else
-        '    NCTS_OUT.ncts_Declarationtype = "T-"
-        'End If
 
         'Kein SAVE_ALL: erfolgt nach Zusammenführung aller EXG-Anmeldungen
 

DAKOSY_Worker/DAKOSY_Worker_lib.vbproj

@@ -45,6 +45,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ClosedXML">
+      <HintPath>F:\PROGRAMMIERUNG\dll\closedxml\95\ClosedXML.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />

DAKOSY_Worker/cImporter_DakosyToVERAG.vb

@@ -1,4 +1,6 @@
 Imports System.Data.SqlClient
+Imports System.IO
+Imports ClosedXML.Excel
 Imports VERAG_PROG_ALLGEMEIN
 Public Class cImporter_DakosyToVERAG
 
@@ -340,6 +342,16 @@ Public Class cImporter_DakosyToVERAG
             ' ======KAFKA==========================================================
             If saved AndAlso freshInsert Then cDakosyEZA_Greenpulse.INSERT_KAFKA(ZA)
             ' ================================================================
+
+
+            If saved Then
+                Try
+                    UpdateBrokerManagementFileTETRAPAK(ZA)
+                Catch ex As Exception
+                    cErrorHandler.ERR(ex.Message, ex.StackTrace, "UpdateBrokerManagementFile")
+                End Try
+            End If
+
             Return saved
 
 
@@ -349,6 +361,323 @@ Public Class cImporter_DakosyToVERAG
         End Try
     End Function
 
+    Public Sub UpdateBrokerManagementFileTETRAPAK(ZA As cVERAG_CustomsDeclarations)
+        Const kundenNrTETRAPAK As Integer = 719649
+        Const prefix As String = "[TETRAPAK] "
+
+        Debug.WriteLine(prefix & "========== START BrokerManagementFile ==========")
+
+        Try
+            If ZA Is Nothing OrElse ZA.za_Id <= 0 Then
+                Debug.WriteLine(prefix & "ABBRUCH: Keine gültige Zollanmeldung")
+                Exit Sub
+            End If
+
+            'Zollanmeldung vollständig aus VERAG-Datenbank laden
+            Dim ZOLL As New cVERAG_CustomsDeclarations
+            ZOLL.za_Id = ZA.za_Id
+            ZOLL.LOAD()
+
+            If Not ZOLL.hasEntry Then
+                cErrorHandler.ERR("UpdateBrokerManagementFileTETRAPAK", "UpdateBrokerManagementFileTETRAPAK", "Zollanmeldung nicht gefunden. za_Id=" & ZA.za_Id)
+            End If
+
+            Debug.WriteLine(prefix & "ZA-ID: " & ZOLL.za_Id)
+            Debug.WriteLine(prefix & "MRN: " & Convert.ToString(ZOLL.za_MRN))
+            Debug.WriteLine(prefix & "LRN: " & Convert.ToString(ZOLL.za_LRN))
+            Debug.WriteLine(prefix & "AvisoId: " & Convert.ToString(ZOLL.za_AvisoId))
+            Debug.WriteLine(prefix & "SendungsId: " & Convert.ToString(ZOLL.za_SendungsId))
+
+            If Not ZOLL.za_SendungsId.HasValue OrElse ZOLL.za_SendungsId.Value <= 0 Then
+                Debug.WriteLine(prefix & "ABBRUCH: Keine SendungsId")
+                Exit Sub
+            End If
+
+            'Auftraggeber prüfen
+            Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(ZOLL.za_SendungsId.Value)
+
+            Debug.WriteLine(prefix & "Auftraggeber: " & Convert.ToString(SND.tblSnd_Auftraggeber))
+            Debug.WriteLine(prefix & "Kundennummer: " & Convert.ToString(SND.tblSnd_AuftraggeberKdNr))
+
+            Dim kundenNr As Integer
+            If Not Integer.TryParse(Convert.ToString(SND.tblSnd_AuftraggeberKdNr), kundenNr) Then
+                Debug.WriteLine(prefix & "ABBRUCH: Ungültige Kundennummer")
+                Exit Sub
+            End If
+
+            If kundenNr <> kundenNrTETRAPAK Then
+                Debug.WriteLine(prefix & "ABBRUCH: Kein TETRAPAK-Auftraggeber")
+                Exit Sub
+            End If
+
+            'Warenpositionen aus tblVERAG_CustomsDeclarations_Items
+            Dim positionen = ZOLL.Items.OrderBy(Function(p) p.zaItem_PosNo).ToList()
+
+            If positionen.Count = 0 Then
+                Debug.WriteLine(prefix & "ABBRUCH: Keine Warenpositionen vorhanden")
+                Exit Sub
+            End If
+
+            Debug.WriteLine(prefix & "Warenpositionen: " & positionen.Count)
+            Debug.WriteLine(prefix & "Kopfabgaben: " & ZOLL.Duties.Count)
+
+            'Abgaben aus tblVERAG_CustomsDeclarations_Duties
+            'Positionen und Kopf getrennt behandeln
+            Dim gesamtZollPositionen As Decimal = 0D
+            Dim gesamtEustPositionen As Decimal = 0D
+            Dim gesamtZollKopf As Decimal = 0D
+            Dim gesamtEustKopf As Decimal = 0D
+            Dim anzahlPositionsabgaben As Integer = 0
+
+            For Each wp In positionen
+                Debug.WriteLine(prefix & "Position " & wp.zaItem_PosNo & " | ItemId=" & wp.zaItem_Id & " | Abgaben=" & wp.Duties.Count)
+
+                For Each duty In wp.Duties
+                    Dim betrag As Decimal = If(duty.zaDuty_AmountEUR, 0D)
+                    Dim art As String = If(duty.zaDuty_DutyType, "").Trim().ToUpperInvariant()
+
+                    Select Case art
+                        Case "A0000", "A00"
+                            gesamtZollPositionen += betrag
+                        Case "B0000", "B00"
+                            gesamtEustPositionen += betrag
+                    End Select
+
+                    anzahlPositionsabgaben += 1
+
+                    Debug.WriteLine(prefix & "  Duty: " & art &
+                                " | Betrag=" & betrag.ToString("0.00") &
+                                " | ItemId=" & Convert.ToString(duty.zaDuty_zaItemId))
+                Next
+            Next
+
+            For Each duty In ZOLL.Duties
+                Dim betrag As Decimal = If(duty.zaDuty_AmountEUR, 0D)
+                Dim art As String = If(duty.zaDuty_DutyType, "").Trim().ToUpperInvariant()
+
+                Select Case art
+                    Case "A0000", "A00"
+                        gesamtZollKopf += betrag
+                    Case "B0000", "B00"
+                        gesamtEustKopf += betrag
+                End Select
+
+                Debug.WriteLine(prefix & "Kopfabgabe: " & art & " | Betrag=" & betrag.ToString("0.00"))
+            Next
+
+            Debug.WriteLine(prefix & "Positions-Zoll gesamt: " & gesamtZollPositionen.ToString("0.00"))
+            Debug.WriteLine(prefix & "Positions-EUSt gesamt: " & gesamtEustPositionen.ToString("0.00"))
+            Debug.WriteLine(prefix & "Kopf-Zoll gesamt: " & gesamtZollKopf.ToString("0.00"))
+            Debug.WriteLine(prefix & "Kopf-EUSt gesamt: " & gesamtEustKopf.ToString("0.00"))
+
+            'Bei fehlenden Positionsabgaben keine künstliche Verteilung
+            Dim nurKopfabgaben As Boolean = (anzahlPositionsabgaben = 0)
+
+            If nurKopfabgaben AndAlso positionen.Count > 1 AndAlso ZOLL.Duties.Count > 0 Then
+                cErrorHandler.ERR("UpdateBrokerManagementFileTETRAPAK", "BrokerManagementFile", "BrokerManagementFile: Es sind " & positionen.Count &
+                                " Warenpositionen vorhanden, aber nur Kopfabgaben gespeichert. " &
+                                "Eine eindeutige Verteilung von Zoll/EUSt ist nicht möglich. ZA-ID=" & ZOLL.za_Id)
+            End If
+
+            If nurKopfabgaben AndAlso ZOLL.Duties.Count = 0 Then
+                Debug.WriteLine(prefix & "WARNUNG: Keine Abgaben in der Zollanmeldung gespeichert")
+            End If
+
+            If Not nurKopfabgaben Then
+                If ZOLL.Duties.Count > 0 Then
+                    If gesamtZollPositionen <> gesamtZollKopf OrElse gesamtEustPositionen <> gesamtEustKopf Then
+                        Debug.WriteLine(prefix & "WARNUNG: Positionssummen und Kopfsummen weichen voneinander ab")
+                    Else
+                        Debug.WriteLine(prefix & "OK: Positionssummen entsprechen den Kopfsummen")
+                    End If
+                End If
+            End If
+
+            'Anhänge über AVISO und Sendung laden
+            Dim anhaenge As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge)
+
+            If ZOLL.za_AvisoId.HasValue AndAlso ZOLL.za_AvisoId.Value > 0 Then
+                VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_ByAviso(anhaenge, ZOLL.za_AvisoId.Value)
+            End If
+
+            Dim sendungsAnhaenge As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge)
+            VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(sendungsAnhaenge, ZOLL.za_SendungsId.Value)
+
+            For Each anh In sendungsAnhaenge
+                If Not anhaenge.Any(Function(a) a.anh_docId = anh.anh_docId) Then anhaenge.Add(anh)
+            Next
+
+            Debug.WriteLine(prefix & "Anhänge gefunden: " & anhaenge.Count)
+
+            Dim dateienGefunden As Integer = 0
+            Dim dateienGespeichert As Integer = 0
+
+            For Each anh In anhaenge
+                Debug.WriteLine(prefix & "Prüfe Anhang: " & Convert.ToString(anh.anh_Art) & " | docId=" & anh.anh_docId)
+
+                If Not String.Equals(Convert.ToString(anh.anh_Art).Trim(), "BrokerManagementFile", StringComparison.OrdinalIgnoreCase) Then Continue For
+                If anh.anh_docId <= 0 Then Continue For
+
+                Dim pfad As String = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(anh.anh_docId)).GET_TOP1_PATH(False)
+
+                Debug.WriteLine(prefix & "Archivpfad: " & Convert.ToString(pfad))
+
+                If String.IsNullOrWhiteSpace(pfad) OrElse Not File.Exists(pfad) Then
+                    Debug.WriteLine(prefix & "Übersprungen: Archivdatei nicht gefunden")
+                    Continue For
+                End If
+
+                If Not String.Equals(Path.GetExtension(pfad), ".xlsx", StringComparison.OrdinalIgnoreCase) Then
+                    Debug.WriteLine(prefix & "Übersprungen: Keine XLSX-Datei")
+                    Continue For
+                End If
+
+                dateienGefunden += 1
+
+                Using wb As New XLWorkbook(pfad)
+                    Dim ws = wb.Worksheet(1)
+                    Dim letzteVerwendeteZeile = ws.LastRowUsed()
+
+                    If letzteVerwendeteZeile Is Nothing Then
+                        Debug.WriteLine("BrokerManagementFile ist leer: " & pfad)
+                    End If
+
+                    'Datenzeilen anhand Spalte A
+                    Dim datenZeilen As New List(Of Integer)
+                    Dim letzteZeile As Integer = letzteVerwendeteZeile.RowNumber()
+
+                    For zeile As Integer = 2 To letzteZeile
+                        If Not String.IsNullOrWhiteSpace(ws.Cell(zeile, "A").GetString()) Then datenZeilen.Add(zeile)
+                    Next
+
+                    Debug.WriteLine(prefix & "Excel-Zeilen: " & datenZeilen.Count)
+                    Debug.WriteLine(prefix & "Zollpositionen: " & positionen.Count)
+
+                    If datenZeilen.Count <> positionen.Count Then
+                        Debug.WriteLine("BrokerManagementFile: Positionsanzahl stimmt nicht überein. Excel=" &
+                                        datenZeilen.Count & ", Zollanmeldung=" & positionen.Count & ", Datei=" & pfad)
+                    End If
+
+                    For i As Integer = 0 To positionen.Count - 1
+                        Dim wp = positionen(i)
+                        Dim zeile As Integer = datenZeilen(i)
+                        Dim posNr As Integer = wp.zaItem_PosNo
+
+                        Dim zollbetr As Decimal = 0D
+                        Dim eust As Decimal = 0D
+
+                        'Positionsabgaben aus Datenbank
+                        If Not nurKopfabgaben Then
+                            For Each duty In wp.Duties
+                                Dim betrag As Decimal = If(duty.zaDuty_AmountEUR, 0D)
+                                Dim art As String = If(duty.zaDuty_DutyType, "").Trim().ToUpperInvariant()
+                                Select Case art.Trim.ToUpperInvariant()
+                                    'Zoll inkl. Zusatz-, Antidumping- und Ausgleichszoll
+                                    Case "A0000", "A00", "A2000", "A20", "A3000", "A30", "A35", "A4000", "A40"
+                                        zollbetr += betrag
+
+                                    'Einfuhrumsatzsteuer
+                                    Case "B0000", "B00", "5EV"
+                                        eust += betrag
+
+                                    'Sicherheiten, Summen und sonstige Abgaben nicht berücksichtigen
+                                    Case "2EU", "2IG", "2KO", "2PE", "2VF", "2VS", "5EU", "5ZO", "9EA", "6BE"
+                                        'Keine Addition
+
+                                    Case Else
+                                        'Debug.WriteLine("Unbekannte Abgabenart: " & art & " / Betrag: " & betrag.ToString())
+                                        zollbetr += betrag 'Default: Alle unbekannten Abgabenarten werden als Zoll behandelt
+                                End Select
+                            Next
+                        ElseIf positionen.Count = 1 Then
+                            'Nur bei einer Position sind Kopfabgaben eindeutig zuordenbar
+                            zollbetr = gesamtZollKopf
+                            eust = gesamtEustKopf
+                        End If
+
+                        Debug.WriteLine(prefix & "----------------------------------------")
+                        Debug.WriteLine(prefix & "Position: " & posNr)
+                        Debug.WriteLine(prefix & "Excel-Zeile: " & zeile)
+                        Debug.WriteLine(prefix & "Zoll: " & zollbetr.ToString("0.00"))
+                        Debug.WriteLine(prefix & "EUSt: " & eust.ToString("0.00"))
+
+                        'AZ - Registration Number ATC/ATD
+                        ws.Cell(zeile, "AZ").Value = If(zoll.za_DeclarationNo, "")
+
+                        'BA - Date of Acceptance
+                        If zoll.za_AcceptanceDate.HasValue Then
+                            ws.Cell(zeile, "BA").Value = zoll.za_AcceptanceDate.Value.ToString("dd.MM.yyyy")
+                        Else
+                            ws.Cell(zeile, "BA").Value = ""
+                        End If
+
+                        'BB - Registration Number MRN
+                        ws.Cell(zeile, "BB").Value = If(zoll.za_MRN, "")
+
+                        'BC - Office of Entry
+                        ws.Cell(zeile, "BC").Value = If(zoll.za_EntryCustomsOffice, "")
+
+                        'BD - Mode of Transport at the Border
+                        ws.Cell(zeile, "BD").Value = If(ZOLL.za_TransportModeBorder, If(ZOLL.za_TransportModeInland, ""))
+
+                        'BE - Identity of means of transport at the border
+                        ws.Cell(zeile, "BE").Value = If(zoll.za_MeansOfTransport_Vehicle, "")
+
+                        'BF - Nationality of means of transport at the border
+                        ws.Cell(zeile, "BF").Value = If(zoll.za_MeansOfTransport_Nationality, "")
+
+                        'BG - Inland Mode of Transport
+                        ws.Cell(zeile, "BG").Value = If(ZOLL.za_TransportModeInland, If(ZOLL.za_TransportModeBorder, ""))
+
+                        'BH - Identity of inland means of transport
+                        ws.Cell(zeile, "BH").Value = If(zoll.za_MeansOfTransport_Vehicle, "")
+
+                        'BI - Nationality of inland means of transport
+                        ws.Cell(zeile, "BI").Value = If(zoll.za_MeansOfTransport_Nationality, "")
+
+                        'BJ - Assessment of payable duty
+                        ws.Cell(zeile, "BJ").Value = zollbetr
+                        ws.Cell(zeile, "BJ").Style.NumberFormat.Format = "0.00"
+
+                        'BK - Assessment of payable Import VAT
+                        ws.Cell(zeile, "BK").Value = eust
+                        ws.Cell(zeile, "BK").Style.NumberFormat.Format = "0.00"
+
+                        Debug.WriteLine(prefix & "AZ=" & ws.Cell(zeile, "AZ").GetString())
+                        Debug.WriteLine(prefix & "BA=" & ws.Cell(zeile, "BA").GetString())
+                        Debug.WriteLine(prefix & "BB=" & ws.Cell(zeile, "BB").GetString())
+                        Debug.WriteLine(prefix & "BC=" & ws.Cell(zeile, "BC").GetString())
+                        Debug.WriteLine(prefix & "BD=" & ws.Cell(zeile, "BD").GetString())
+                        Debug.WriteLine(prefix & "BE=" & ws.Cell(zeile, "BE").GetString())
+                        Debug.WriteLine(prefix & "BF=" & ws.Cell(zeile, "BF").GetString())
+                        Debug.WriteLine(prefix & "BG=" & ws.Cell(zeile, "BG").GetString())
+                        Debug.WriteLine(prefix & "BH=" & ws.Cell(zeile, "BH").GetString())
+                        Debug.WriteLine(prefix & "BI=" & ws.Cell(zeile, "BI").GetString())
+                        Debug.WriteLine(prefix & "BJ=" & zollbetr.ToString("0.00"))
+                        Debug.WriteLine(prefix & "BK=" & eust.ToString("0.00"))
+                    Next
+
+
+                    wb.Save()
+                    Debug.WriteLine(prefix & "Original gespeichert: " & pfad)
+
+
+                    dateienGespeichert += 1
+                End Using
+            Next
+
+            Debug.WriteLine(prefix & "BrokerManagementFiles gefunden: " & dateienGefunden)
+            Debug.WriteLine(prefix & "BrokerManagementFiles gespeichert: " & dateienGespeichert)
+
+            If dateienGefunden = 0 Then Debug.WriteLine(prefix & "WARNUNG: Kein BrokerManagementFile gefunden")
+
+        Catch ex As Exception
+            Debug.WriteLine(prefix & "FEHLER: " & ex.ToString())
+            cErrorHandler.ERR(ex.Message, ex.StackTrace, Reflection.MethodInfo.GetCurrentMethod.Name)
+        Finally
+            Debug.WriteLine(prefix & "========== ENDE BrokerManagementFile ==========")
+        End Try
+    End Sub
     ' =====================================================================
     ' NCTS 004 -> VERAG TRANSIT
     ' =====================================================================

UID/ADMIN.vbproj

@@ -1113,6 +1113,7 @@
     <None Include="Resources\ok.png" />
     <None Include="Resources\fragezeichen.png" />
     <None Include="Resources\sdl_ico2.ico" />
+    <None Include="Resources\email_big1.png" />
     <Content Include="uid.ico" />
   </ItemGroup>
   <ItemGroup>

UID/Mitarbeiter/frmMitarbDetails.Designer.vb

@@ -85,6 +85,7 @@ Partial Class frmMitarbDetails
         Me.clInterneMailBenachrichtigungen = New System.Windows.Forms.CheckedListBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.PictureBox9 = New System.Windows.Forms.PictureBox()
         Me.cboFunktion = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label63 = New System.Windows.Forms.Label()
         Me.txtTelNr = New System.Windows.Forms.TextBox()
@@ -248,6 +249,7 @@ Partial Class frmMitarbDetails
         Me.TabPage6 = New System.Windows.Forms.TabPage()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.Label74 = New System.Windows.Forms.Label()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.TabControl2.SuspendLayout()
@@ -261,6 +263,7 @@ Partial Class frmMitarbDetails
         CType(Me.dgvUserParameter, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tabBenachrichtigungen.SuspendLayout()
         Me.GroupBox2.SuspendLayout()
+        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox1.SuspendLayout()
         CType(Me.picFoto, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabPage3.SuspendLayout()
@@ -964,6 +967,8 @@ Partial Class frmMitarbDetails
         '
         'GroupBox2
         '
+        Me.GroupBox2.Controls.Add(Me.Label74)
+        Me.GroupBox2.Controls.Add(Me.PictureBox9)
         Me.GroupBox2.Controls.Add(Me.cboFunktion)
         Me.GroupBox2.Controls.Add(Me.Label63)
         Me.GroupBox2.Controls.Add(Me.txtTelNr)
@@ -1018,6 +1023,16 @@ Partial Class frmMitarbDetails
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "Firmendaten"
         '
+        'PictureBox9
+        '
+        Me.PictureBox9.BackgroundImage = Global.ADMIN.My.Resources.Resources.email_big1
+        Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox9.Location = New System.Drawing.Point(660, 250)
+        Me.PictureBox9.Name = "PictureBox9"
+        Me.PictureBox9.Size = New System.Drawing.Size(43, 29)
+        Me.PictureBox9.TabIndex = 116
+        Me.PictureBox9.TabStop = False
+        '
         'cboFunktion
         '
         Me.cboFunktion._allowedValuesFreiText = Nothing
@@ -2785,6 +2800,16 @@ Partial Class frmMitarbDetails
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
         '
+        'Label74
+        '
+        Me.Label74.AutoSize = True
+        Me.Label74.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label74.Location = New System.Drawing.Point(575, 250)
+        Me.Label74.Name = "Label74"
+        Me.Label74.Size = New System.Drawing.Size(79, 13)
+        Me.Label74.TabIndex = 117
+        Me.Label74.Text = "Zugangsdaten:"
+        '
         'frmMitarbDetails
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2819,6 +2844,7 @@ Partial Class frmMitarbDetails
         Me.tabBenachrichtigungen.PerformLayout()
         Me.GroupBox2.ResumeLayout(False)
         Me.GroupBox2.PerformLayout()
+        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupBox1.ResumeLayout(False)
         Me.GroupBox1.PerformLayout()
         CType(Me.picFoto, System.ComponentModel.ISupportInitialize).EndInit()
@@ -3063,4 +3089,6 @@ Partial Class frmMitarbDetails
     Friend WithEvents Panel2 As Panel
     Friend WithEvents Label73 As Label
     Friend WithEvents txtTimasID As TextBox
+    Friend WithEvents PictureBox9 As PictureBox
+    Friend WithEvents Label74 As Label
 End Class

UID/Mitarbeiter/frmMitarbDetails.vb

@@ -1,5 +1,6 @@
 
 Imports System.Text.RegularExpressions
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmMitarbDetails
@@ -954,7 +955,34 @@ Public Class frmMitarbDetails
     End Sub
 
     Private Sub cbxGekuendigt_CheckedChanged(sender As Object, e As EventArgs) Handles cbxGekuendigt.CheckedChanged
-        datGekuendigtAm.Enabled = cbxGekuendigt.Checked
+
+        If cbxGekuendigt.Checked AndAlso Not mitarbeiter.mit_gekuendigt Then
+            If vbYes = MsgBox("Möchten Sie den Mitarbeiter deaktivieren? " & vbNewLine & "Es wird automatisch ein Ticket zu Deaktivierung des Accounts erstellt.", vbYesNo) Then
+
+                Dim f As New frmDatumsabfrage("Austrittsdatum ", False)
+                f.ShowDialog()
+
+                If f.DialogResult = DialogResult.OK Then
+                    datGekuendigtAm.Value = f.dtp_date.Value
+
+
+                    Dim Mailtext As String = "Folgender Mitarbeiter  verlässt mit " & datGekuendigtAm.Value.ToShortDateString & " das Unternehmen " & mitarbeiter.mit_firma & ": " & mitarbeiter.mit_vname & " " & mitarbeiter.mit_nname & vbNewLine & "Bitte alle zugehörigen Accounts deaktivieren!"
+                    Dim empfaenger = VERAG_PROG_ALLGEMEIN.cMitarbeiter.GetEMailRecipientForEmailNotification("Mitarbeiter-Austritt")
+                    VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("support@verag.ag", "Austritt Mitarbeiter " & mitarbeiter.mit_vname & " " & mitarbeiter.mit_nname & " (" & mitarbeiter.mit_firma & ")", Mailtext,, True,, empfaenger)
+                    'datGekuendigtAm.Enabled = cbxGekuendigt.Checked
+                    btnOK.PerformClick()
+                End If
+
+            End If
+
+        Else
+            'datGekuendigtAm.Enabled = cbxGekuendigt.Checked
+
+        End If
+
+
+
+
     End Sub
 
 
@@ -1627,19 +1655,21 @@ Public Class frmMitarbDetails
 
         ' Sicherheitsprüfungen
         If tageProWoche <= 0 Then Return 0
-        If urlaubInStunden AndAlso wochenstunden <= 0 Then Return 0
 
-        Dim anspruch As Double = 0
+        Dim anspruch As Double
 
         If Not urlaubInStunden Then
-            ' Urlaub in Tagen
+            ' 5 Wochen Urlaub in Tagen
             anspruch = 5 * tageProWoche
         Else
-            ' Urlaub in Stunden: durchschnittliche Tagesarbeitszeit * 5
+            If wochenstunden <= 0 Then Return 0
-            anspruch = (wochenstunden / tageProWoche) * 5
+
+            ' 5 Wochen Urlaub in Stunden
+            anspruch = wochenstunden * 5
         End If
 
         Return Math.Round(anspruch, 2, MidpointRounding.AwayFromZero)
+
     End Function
 
     Private Sub TabControl2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl2.SelectedIndexChanged
@@ -1908,6 +1938,93 @@ Public Class frmMitarbDetails
 
         Next
 
+    End Sub
+
+    Private Sub PictureBox9_Click(sender As Object, e As EventArgs) Handles PictureBox9.Click
+
+        If Not cbxGekuendigt.Checked AndAlso Not mitarbeiter.mit_gekuendigt Then
+
+            ' Dim empfaenger = VERAG_PROG_ALLGEMEIN.cMitarbeiter.GetEMailRecipientForEmailNotification("Mitarbeiter-Eintritt")
+
+            Dim betreff As String = "Start Mitarbeiter " & mitarbeiter.mit_vname & " " & mitarbeiter.mit_nname & " (" & mitarbeiter.mit_firma.ToString.Replace("ALL", "VERAG") & ")"
+
+            Dim TextHTMLtable As String = ""
+
+
+            TextHTMLtable &= "Hallo " & mitarbeiter.mit_vname & "!" & "<br><br>Herzlich Willkommen bei " & mitarbeiter.mit_firma.ToString.Replace("ALL", "VERAG") & ".<br><br>"
+
+            TextHTMLtable &= "Um dir den Start so einfach wie möglich zu machen, findest du alle relevanten Informationen zum Unternehmen hier: <a href=""https://wiki.verag.ag"">WIKI</a>"
+
+            TextHTMLtable &= "<br><br>Die Zugangsdaten für deine benötigten Programme/Systeme lauten wie folgt:<br><br>"
+
+            TextHTMLtable &= "<table border=1>"
+            TextHTMLtable &= "<tr><td>Programm</td><td>Info</td><td>User</td><td>Passwort</td></tr>"
+
+
+
+            If mitarbeiter.mit_AliasAD_Username IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Username <> "" Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "Windows" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "PC-Zugangsdaten" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_AliasAD_Username & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_username <> "" AndAlso mitarbeiter.mit_pwd <> "" Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "AVISO/SDL" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "ERP-System" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_username & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_timasId IsNot Nothing AndAlso IsNumeric(mitarbeiter.mit_timasId) Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "TIMAS" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "Zeiterfassung" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_username & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_DAKOSY_SB IsNot Nothing AndAlso mitarbeiter.mit_DAKOSY_SB <> "" Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "DAKOSY" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "ZOLL-DE" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_DAKOSY_SB & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_EZOLL_SB IsNot Nothing AndAlso mitarbeiter.mit_EZOLL_SB > 0 Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "EZOLL" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "ZOLL-AT" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_EZOLL_SB & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+            If mitarbeiter.mit_CSuser IsNot Nothing AndAlso mitarbeiter.mit_CSuser <> "" Then
+                TextHTMLtable &= "<tr>"
+                TextHTMLtable &= "<td><b>" & "Creditsafe" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & "Bonitätsprüfungstool" & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_CSuser & "</b></td>"
+                TextHTMLtable &= "<td><b>" & mitarbeiter.mit_CSpwd & "</b></td>"
+                TextHTMLtable &= "</tr>"
+            End If
+
+
+            TextHTMLtable &= "</table>"
+
+            VERAG_PROG_ALLGEMEIN.cProgramFunctions.createMail("", betreff, TextHTMLtable)
+
+        End If
+
+
+
     End Sub
 End Class
 

UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb

@@ -48,6 +48,7 @@ Partial Class usrCntlMitarbeiter
         Me.TabPage9 = New System.Windows.Forms.TabPage()
         Me.dgvDURMAZ = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.TabPage8 = New System.Windows.Forms.TabPage()
+        Me.lbl_Mitarbeiter_export = New System.Windows.Forms.Label()
         Me.pbMitarbeiter_export = New System.Windows.Forms.ProgressBar()
         Me.cbxTimasAktiv = New System.Windows.Forms.CheckBox()
         Me.lblTimasMandant = New System.Windows.Forms.Label()
@@ -67,7 +68,6 @@ Partial Class usrCntlMitarbeiter
         Me.UserKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.BerechtigungenSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.lbl_Mitarbeiter_export = New System.Windows.Forms.Label()
         Me.Panel2.SuspendLayout()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -371,6 +371,15 @@ Partial Class usrCntlMitarbeiter
         Me.TabPage8.Text = "Zeiterfassung"
         Me.TabPage8.UseVisualStyleBackColor = True
         '
+        'lbl_Mitarbeiter_export
+        '
+        Me.lbl_Mitarbeiter_export.AutoSize = True
+        Me.lbl_Mitarbeiter_export.Location = New System.Drawing.Point(679, 8)
+        Me.lbl_Mitarbeiter_export.Name = "lbl_Mitarbeiter_export"
+        Me.lbl_Mitarbeiter_export.Size = New System.Drawing.Size(30, 13)
+        Me.lbl_Mitarbeiter_export.TabIndex = 54
+        Me.lbl_Mitarbeiter_export.Text = "0 / 0"
+        '
         'pbMitarbeiter_export
         '
         Me.pbMitarbeiter_export.Location = New System.Drawing.Point(556, 3)
@@ -532,7 +541,7 @@ Partial Class usrCntlMitarbeiter
         '
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserKopierenToolStripMenuItem, Me.BerechtigungenSetzenToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(195, 48)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(195, 70)
         '
         'UserKopierenToolStripMenuItem
         '
@@ -551,15 +560,6 @@ Partial Class usrCntlMitarbeiter
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
         Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
         '
-        'lbl_Mitarbeiter_export
-        '
-        Me.lbl_Mitarbeiter_export.AutoSize = True
-        Me.lbl_Mitarbeiter_export.Location = New System.Drawing.Point(679, 8)
-        Me.lbl_Mitarbeiter_export.Name = "lbl_Mitarbeiter_export"
-        Me.lbl_Mitarbeiter_export.Size = New System.Drawing.Size(30, 13)
-        Me.lbl_Mitarbeiter_export.TabIndex = 54
-        Me.lbl_Mitarbeiter_export.Text = "0 / 0"
-        '
         'usrCntlMitarbeiter
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

UID/Mitarbeiter/usrCntlMitarbeiter.vb

@@ -1435,5 +1435,7 @@ Public Class usrCntlMitarbeiter
 
     End Sub
 
+    Private Sub MailMitZugangsdatenToolStripMenuItem_Click(sender As Object, e As EventArgs)
 
+    End Sub
 End Class

UID/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.2.6.5")>
+<Assembly: AssemblyVersion("1.2.6.7")>
-<Assembly: AssemblyFileVersion("1.2.6.5")>
+<Assembly: AssemblyFileVersion("1.2.6.7")>

UID/My Project/Resources.Designer.vb

@@ -343,6 +343,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property email_big1() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("email_big1", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

UID/My Project/Resources.resx

@@ -145,6 +145,9 @@
   <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="UpdaterVersion" xml:space="preserve">
+    <value>4.0</value>
+  </data>
   <data name="refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -157,30 +160,39 @@
   <data name="dispo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dispo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="reise" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="refresh1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\reise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\refresh1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="admin_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\admin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="refresh1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\refresh1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="uhr_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="MDM_IT_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MDM_IT_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="personGray_m" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\personGray_m.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="dispo_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dispo_ico1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="connStringFMZOLL_NEW" xml:space="preserve">
+    <value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
+  </data>
+  <data name="MDM_AI_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MDM_AI_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="cmr_logo_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cmr-logo_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Verag_Academy_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Verag-Academy_blue.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="kalender" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\kalender.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="fd" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\fd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -196,8 +208,11 @@
   <data name="admin1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\admin1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="kalender" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="sdl_ico1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\kalender.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\sdl_ico2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="reise" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\reise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -271,8 +286,8 @@
   <data name="gear1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gear1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="UpdaterVersion" xml:space="preserve">
+  <data name="chain" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>4.0</value>
+    <value>..\Resources\chain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="printer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -286,9 +301,6 @@
   <data name="connStringAdmin" xml:space="preserve">
     <value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
   </data>
-  <data name="chain" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\chain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="uid" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\uid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -313,16 +325,7 @@
   <data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sdl_ico1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sdl_ico2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="MDM_AI_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\MDM_AI_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="MDM_IT_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\MDM_IT_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="connStringFMZOLL_NEW" xml:space="preserve">
-    <value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
   </data>
 </root>

UID/frmMain.Designer.vb

@@ -33,6 +33,7 @@ Partial Class frmMain
         Me.TableAdapterManager1 = New ADMIN.DataSetBerechtigungenTableAdapters.TableAdapterManager()
         Me.pnlMain = New System.Windows.Forms.Panel()
         Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.btnFirm = New System.Windows.Forms.Button()
         Me.btnInterneBenachrichtigungen = New System.Windows.Forms.Button()
         Me.lblVersion = New System.Windows.Forms.Label()
         Me.btnAuditFlow = New System.Windows.Forms.Button()
@@ -52,7 +53,6 @@ Partial Class frmMain
         Me.btnMitarbeiter = New System.Windows.Forms.Button()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.btnFirm = New System.Windows.Forms.Button()
         Me.Panel3.SuspendLayout()
         Me.Panel2.SuspendLayout()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -137,6 +137,18 @@ Partial Class frmMain
         Me.Panel3.Size = New System.Drawing.Size(137, 801)
         Me.Panel3.TabIndex = 32
         '
+        'btnFirm
+        '
+        Me.btnFirm.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnFirm.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnFirm.Location = New System.Drawing.Point(12, 76)
+        Me.btnFirm.Name = "btnFirm"
+        Me.btnFirm.Size = New System.Drawing.Size(94, 33)
+        Me.btnFirm.TabIndex = 47
+        Me.btnFirm.Text = "Firmen"
+        Me.btnFirm.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnFirm.UseVisualStyleBackColor = True
+        '
         'btnInterneBenachrichtigungen
         '
         Me.btnInterneBenachrichtigungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -265,6 +277,7 @@ Partial Class frmMain
         Me.btnUpdate.Size = New System.Drawing.Size(94, 34)
         Me.btnUpdate.TabIndex = 37
         Me.btnUpdate.Text = "Update"
+        Me.btnUpdate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnUpdate.UseVisualStyleBackColor = True
         '
         'btnSchulungen
@@ -358,18 +371,6 @@ Partial Class frmMain
         Me.PictureBox1.TabIndex = 31
         Me.PictureBox1.TabStop = False
         '
-        'btnFirm
-        '
-        Me.btnFirm.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnFirm.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnFirm.Location = New System.Drawing.Point(12, 76)
-        Me.btnFirm.Name = "btnFirm"
-        Me.btnFirm.Size = New System.Drawing.Size(94, 33)
-        Me.btnFirm.TabIndex = 47
-        Me.btnFirm.Text = "Firmen"
-        Me.btnFirm.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnFirm.UseVisualStyleBackColor = True
-        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

UID/usrCntlDatenarchiv.Designer.vb

@@ -26,6 +26,8 @@ Partial Class usrCntlDatenarchiv
         Me.SplitContainer = New System.Windows.Forms.SplitContainer()
         Me.pnlSearch = New System.Windows.Forms.Panel()
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
+        Me.lblfehlendeDokumente = New System.Windows.Forms.Label()
+        Me.Button1 = New System.Windows.Forms.Button()
         Me.cbxTestsystem = New System.Windows.Forms.CheckBox()
         Me.cboPartnersystem = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label8 = New System.Windows.Forms.Label()
@@ -35,12 +37,12 @@ Partial Class usrCntlDatenarchiv
         Me.pnlAnzeige = New System.Windows.Forms.Panel()
         Me.DataGridView = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.btnSave = New System.Windows.Forms.Button()
         Me.lblErgebnis = New System.Windows.Forms.Label()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Button10 = New System.Windows.Forms.Button()
         Me.Button11 = New System.Windows.Forms.Button()
-        Me.btnSave = New System.Windows.Forms.Button()
         CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer.Panel1.SuspendLayout()
         Me.SplitContainer.Panel2.SuspendLayout()
@@ -96,6 +98,8 @@ Partial Class usrCntlDatenarchiv
         '
         'SplitContainer1.Panel1
         '
+        Me.SplitContainer1.Panel1.Controls.Add(Me.lblfehlendeDokumente)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.Button1)
         Me.SplitContainer1.Panel1.Controls.Add(Me.cbxTestsystem)
         Me.SplitContainer1.Panel1.Controls.Add(Me.cboPartnersystem)
         Me.SplitContainer1.Panel1.Controls.Add(Me.Label8)
@@ -107,6 +111,24 @@ Partial Class usrCntlDatenarchiv
         Me.SplitContainer1.SplitterDistance = 55
         Me.SplitContainer1.TabIndex = 0
         '
+        'lblfehlendeDokumente
+        '
+        Me.lblfehlendeDokumente.AutoSize = True
+        Me.lblfehlendeDokumente.ForeColor = System.Drawing.Color.Red
+        Me.lblfehlendeDokumente.Location = New System.Drawing.Point(617, 15)
+        Me.lblfehlendeDokumente.Name = "lblfehlendeDokumente"
+        Me.lblfehlendeDokumente.Size = New System.Drawing.Size(0, 13)
+        Me.lblfehlendeDokumente.TabIndex = 57
+        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(443, 10)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(159, 23)
+        Me.Button1.TabIndex = 56
+        Me.Button1.Text = "Prüfe Datenarchiv-DOK"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
         'cbxTestsystem
         '
         Me.cbxTestsystem.AutoSize = True
@@ -142,6 +164,7 @@ Partial Class usrCntlDatenarchiv
         '
         'btnSuche
         '
+        Me.btnSuche.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -218,6 +241,19 @@ Partial Class usrCntlDatenarchiv
         Me.Panel1.Size = New System.Drawing.Size(1020, 44)
         Me.Panel1.TabIndex = 1
         '
+        'btnSave
+        '
+        Me.btnSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSave.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnSave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnSave.Location = New System.Drawing.Point(789, 5)
+        Me.btnSave.Name = "btnSave"
+        Me.btnSave.Size = New System.Drawing.Size(118, 26)
+        Me.btnSave.TabIndex = 56
+        Me.btnSave.Text = "speichern"
+        Me.btnSave.UseVisualStyleBackColor = True
+        '
         'lblErgebnis
         '
         Me.lblErgebnis.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -230,6 +266,7 @@ Partial Class usrCntlDatenarchiv
         '
         'Label4
         '
+        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label4.AutoSize = True
         Me.Label4.Location = New System.Drawing.Point(930, 5)
         Me.Label4.Name = "Label4"
@@ -251,6 +288,7 @@ Partial Class usrCntlDatenarchiv
         Me.txtMaxSrch._value = ""
         Me.txtMaxSrch._Waehrung = False
         Me.txtMaxSrch._WaehrungZeichen = True
+        Me.txtMaxSrch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtMaxSrch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtMaxSrch.ForeColor = System.Drawing.Color.Black
         Me.txtMaxSrch.Location = New System.Drawing.Point(966, 2)
@@ -288,18 +326,6 @@ Partial Class usrCntlDatenarchiv
         Me.Button11.TabIndex = 4
         Me.Button11.UseVisualStyleBackColor = True
         '
-        'btnSave
-        '
-        Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSave.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnSave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSave.Location = New System.Drawing.Point(789, 5)
-        Me.btnSave.Name = "btnSave"
-        Me.btnSave.Size = New System.Drawing.Size(118, 26)
-        Me.btnSave.TabIndex = 56
-        Me.btnSave.Text = "speichern"
-        Me.btnSave.UseVisualStyleBackColor = True
-        '
         'usrCntlDatenarchiv
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -343,4 +369,6 @@ Partial Class usrCntlDatenarchiv
     Friend WithEvents Label12 As Label
     Friend WithEvents cbxTestsystem As CheckBox
     Friend WithEvents btnSave As Button
+    Friend WithEvents Button1 As Button
+    Friend WithEvents lblfehlendeDokumente As Label
 End Class

UID/usrCntlDatenarchiv.vb

@@ -1,6 +1,4 @@
-Imports System.ComponentModel
+Imports System.Windows.Documents
-Imports System.IO
-Imports System.Windows.Documents
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class usrCntlDatenarchiv
@@ -24,6 +22,7 @@ Public Class usrCntlDatenarchiv
         'cboPartnersystem.Items.Clear()
         Dim distinctDT As DataTable = DatenarchivBind.bindingdataTable.DefaultView.ToTable(True, "Param_system")
 
+        cboPartnersystem.Items.Add(New MyListItem("", ""))
         For Each d As DataRow In distinctDT.Rows
             If Not cboPartnersystem.Items.Contains(d.Item(0)) Then cboPartnersystem.Items.Add(d.Item(0))
         Next
@@ -72,31 +71,6 @@ Public Class usrCntlDatenarchiv
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub cbxProduktivsystem_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTestsystem.CheckedChanged
-
-        'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
-
-        DatenarchivBind = New cEasyBinding(BIND_DB)
-
-
-        Dim sqlstr As String = ""
-        Dim TopMax = If(IsNumeric(txtMaxSrch.Text), " TOP " & txtMaxSrch.Text, "")
-
-
-        DatenarchivBind.initBinding("SELECT " & TopMax & " [Param_name],[Param_value], [Param_system]  FROM " & table & " WHERE 1 = 1 " & getDatenarchivwhere(), table)
-
-        DataGridView.DataSource = DatenarchivBind.bindingdataTable
-
-        Dim distinctDT As DataTable = DatenarchivBind.bindingdataTable.DefaultView.ToTable(True, "Param_system")
-
-        For Each d As DataRow In distinctDT.Rows
-            If Not cboPartnersystem.Items.Contains(d.Item(0)) Then cboPartnersystem.Items.Add(d.Item(0))
-        Next
-
-        Me.usrCntlDatenarchiv_Load(sender, e)
-
-    End Sub
-
     Private Sub cboPartnersystem_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboPartnersystem.SelectedIndexChanged
         btnSuche_Click(sender, e)
     End Sub
@@ -202,4 +176,55 @@ Public Class usrCntlDatenarchiv
         End If
     End Sub
 
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+
+        Dim jahr As Integer = 2026
+        Dim zupruefendeDokumente As String = " select top(100000) * from [tblDatenarchiv_Collection] where Year(coll_date) = " & jahr & " and coll_archiv = 0 and isnull(coll_pfad,'') <> '' order by coll_date desc "
+
+
+
+        Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+        Dim Datenarchiv_DOKS As DataTable = SQL.loadDgvBySql(zupruefendeDokumente, "FMZOLL")
+        Dim dtFehlendeDOKS = Datenarchiv_DOKS.Clone()
+
+
+        If Datenarchiv_DOKS.Rows.Count > 0 Then
+            For Each r As DataRow In Datenarchiv_DOKS.Rows
+
+                If r.Item("coll_pfad") <> "" Then
+                    If Not System.IO.File.Exists(r.Item("coll_pfad")) Then
+                        dtFehlendeDOKS.ImportRow(r)
+                        lblfehlendeDokumente.Text = "fehlende Doks.: " & dtFehlendeDOKS.Rows.Count
+                        Me.Refresh()
+                        If dtFehlendeDOKS.Rows.Count >= 10000 Then Exit For
+                    End If
+
+
+                End If
+
+            Next
+
+
+            If dtFehlendeDOKS.Rows.Count > 0 Then
+
+                MsgBox("Es existieren " & dtFehlendeDOKS.Rows.Count & " Datenarchiv-Datensätze, die kein zugeordnetes Dokument besitzen!")
+                VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtFehlendeDOKS,,,,, True,,, True)
+
+
+                If vbYes = MsgBox("Sollen diese Datenarchiveinträge gelöscht werden?", vbYesNo) Then
+
+                End If
+
+
+            Else
+
+                MsgBox("Es wurden keine fehlenden Dokumente gefunden!")
+
+            End If
+
+
+        End If
+
+
+    End Sub
 End Class

initATLASAufschubkonten/frmStartOptions.vb

@@ -1439,7 +1439,25 @@ Public Class frmStartOptions
                             End If
                             '---------------------------------------------------------
 
+                            '---------------------------------------------------------
+                            ' BrokerManagementFile immer zusätzlich anhängen
+                            '---------------------------------------------------------
+                            If SND.tblSnd_SendungID > 0 Then
+                                Dim ANH_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge)
+                                VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST, SND.tblSnd_SendungID)
 
+                                For Each l In ANH_LIST
+                                    If String.Equals(Convert.ToString(l.anh_Art), "BrokerManagementFile", StringComparison.OrdinalIgnoreCase) Then
+                                        If l.anh_docId > 0 Then
+                                            Dim PathTmpANH = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(l.anh_docId)).GET_TOP1_PATH(False)
+                                            If Not String.IsNullOrWhiteSpace(PathTmpANH) AndAlso Not pfadList.Contains(PathTmpANH) Then
+                                                pfadList.Add(PathTmpANH)
+                                            End If
+                                        End If
+                                    End If
+                                Next
+                            End If
+                            '---------------------------------------------------------
 
                             VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(KundenNr, Mail_Art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                             '  body = body.Replace("%Platzhalter%", "E-Mails: " & EMails & " CC: " & EMails_CC & " BCC:" & EMails_BCC)
@@ -6415,8 +6433,8 @@ weiter:
         ElseIf txtUTADate.Text <> "" AndAlso IsDate(txtUTADate.Text) Then
             datumString = txtUTADate.Text
             SQLWhere = "And CAST(U.Rechnungsdatum AS date) = '" & datumString & "'"
-            von = New Date(datumString)
+            von = CDate(datumString)
-            bis = New Date(datumString)
+            bis = CDate(datumString)
         End If