MDM-Abrechnung, Leihgeld, UID-Pruefungen ,etc.

SDL/kassenbuch/frmNacherfassungLeihgeld.vb

@@ -810,17 +810,8 @@ Public Class frmNacherfassungLeihgeld
         txtAuftrProvision.Enabled = sender.checked
     End Sub
 
-    Private Sub cboPrintAktendeckel_CheckedChanged(sender As Object, e As EventArgs) Handles cboPrintAktendeckel.CheckedChanged
-
-    End Sub
-
-    Private Sub kdFrachtführer_TextChanged(sender As Object, e As System.ComponentModel.PropertyChangedEventArgs) Handles kdFrachtführer.PropertyChanged
-
-    End Sub
-
     Private Function getSachkonto(pos As EABelegPositionen)
 
-
         '    Dim SQL = New VERAG_PROG_ALLGEMEIN.SQL
         '    Dim RE As New cRechnungsausgang(pos.RK_ID)
 

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -1501,8 +1501,8 @@ Public Class frmMDMDatenverarbetiung
         Dim top = ""
         Dim sqlWhere = ""
         Select Case art
-            Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543" & IIf(Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 204055 ", "")
+            Case "IDS" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode<>740543"
-            Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode=740543" & IIf(Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, " AND Adressen.AdressenNr = 204055 ", "")
+            Case "IDS_AT" : sqlWhere = " AND tblIDSTransactionsNew.OutletCountryCode=740543"
             Case Else
                 MsgBox("falscher Typ!") : Return False
 

VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb

@@ -154,26 +154,7 @@ Public Class cUIDPruefung
 
     Public Shared Function doUIDPruefungALL(Optional datum As Object = Nothing, Optional SaveErgInAdressen As Boolean = True, Optional Sciherheitsabfrage As Boolean = True, Optional MaxEintraege As Integer = -1, Optional showErr As Boolean = True, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 1500) As DataTable
         Dim dt As DataTable = Nothing
-        'If datum = Nothing Then datum = CDate("15." & Now.ToString("MM.yyyy")).AddMonths(-1)
+     
-
-        'Dim where = ""
-        'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-        '    Case "AMBAR" : where = " And Filialen.FilialenNr  IN (5701)"
-        '    Case "IMEX" : where = " And Filialen.FilialenNr  IN (5501)"
-        '    Case "ATILLA" : where = " And Filialen.FilialenNr IN (4801)"
-        '    Case "UNISPED" : where = " AND Filialen.firma='UNISPED' "
-        '    Case Else : where = " AND Filialen.firma='VERAG' " '" And isnull(FilialenNr,'')  Not IN (5501,5701)"
-        'End Select
-        'Dim Top = ""
-        'If MaxEintraege > 0 Then
-        '    Top = " TOP " & MaxEintraege
-        'End If
-
-        'dt = SQL.loadDgvBySql("SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr " &
-        '  "  From [Adressen] inner Join kunden On KundenNr=AdressenNr  inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr " &
-        '  "  where (UstIdGeprüft <= '" & datum.ToShortDateString & "' OR UstIdGeprüft is null) and (isnull(Adressen.UstIdKz,'') <> ''and isnull(Adressen.UstIdNr,'') <> '') " &
-        '  "  And Auswahl='A' " & where & " ORDER BY Ordnungsbegriff", "FMZOLL")
-
         dt = get_zupruefendeKunden(MaxEintraege, datum)
 
         If dt IsNot Nothing Then
@@ -195,6 +176,14 @@ Public Class cUIDPruefung
             e.ColumnName = "Error-Text"
             dt.Columns.Add(e)
 
+            Dim f As New DataColumn
+            f.ColumnName = "Re-Login"
+            dt.Columns.Add(f)
+
+            Dim g As New DataColumn
+            g.ColumnName = "Verzoegerung"
+            dt.Columns.Add(g)
+
 
             '------------------------------------------------
             'ENTWEDER ÜBER EU-KOMISSION ODER FINANZONLINE::::
@@ -233,6 +222,7 @@ Public Class cUIDPruefung
                     VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG"
                     FO.initValues()
                     Dim counter = 0
+                    Dim errorCounter As Integer = 0
                     If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then
 
                         For Each r As DataRow In dt.Rows
@@ -262,6 +252,10 @@ Public Class cUIDPruefung
                                     r("Error-Code") = errorCode.ToString()
                                     r("Error-Text") = FO.GetCodeText(errorCode) & errormsg
 
+                                    If r("Error-Code") = "1511" Then
+                                        errorCounter += 1 'Fehler Mitgliedsstaat nicht erreichbar!!!
+                                    End If
+
                                     ' Bei ERROR soll er ebenfalls einzeln durchgehen! Besprochen mit A.Stockenhuber
                                     'For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'")
                                     '    row("Ergebnis") = r("Ergebnis")
@@ -273,10 +267,14 @@ Public Class cUIDPruefung
 
                             End If
 
-                            If counter Mod 100 = 0 Then
+                            r("Re-Login") = "0"
+
+                            If counter Mod 100 = 0 OrElse errorCounter > 10 Then
+                                If errorCounter > 10 Then errorCounter = 0
                                 FO.Call_Web_Service_MethodUID_Logout_NEU2020()
                                 Thread.Sleep(2000)
                                 FO.Call_Web_Service_MethodUID_Login_NEU2020()
+                                r("Re-Login") = "1"
                             End If
 
                             If veroegerungMs > 0 Then
@@ -309,7 +307,6 @@ Public Class cUIDPruefung
             Firma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
         End If
 
-
         Select Case Firma
             Case "AMBAR" : where = " And Filialen.FilialenNr  IN (5701)"
             Case "IMEX" : where = " And Filialen.FilialenNr  IN (5501)"
@@ -326,7 +323,7 @@ Public Class cUIDPruefung
 
         dt = SQL.loadDgvBySql("SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr " &
           "  From [Adressen] inner Join kunden On KundenNr=AdressenNr  inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr " &
-          "  where (UstIdGeprüft <= '" & datum.ToShortDateString & "' OR UstIdGeprüft is null) and (isnull(Adressen.UstIdKz,'') <> ''and isnull(Adressen.UstIdNr,'') <> '') " &
+          "  where (UstIdGeprüft <= '" & datum.ToShortDateString & "' OR UstIdGeprüft is null) and (isnull(Adressen.UstIdKz,'') <> '' and isnull(Adressen.UstIdNr,'') <> '') " &
           "  And Auswahl='A' " & where & " ORDER BY Ordnungsbegriff", "FMZOLL")
 
         Return dt

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb

@@ -1,11 +1,6 @@
-Imports System.ComponentModel
+Imports System.Drawing
-Imports System.Diagnostics.Eventing.Reader
-Imports System.Drawing
-Imports System.Net
 Imports System.Threading
 Imports System.Windows.Forms
-Imports Therefore.API
-Imports VERAG_PROG_ALLGEMEIN.cCreditSafeAPI
 
 Public Class frmMitarbeitersuche
     Dim mit_id As Integer = -1