neu

SDL/SMS/usrCntlSMS.vb

@@ -164,7 +164,7 @@ Public Class usrCntlSMS
         Dim sqlstr As String = ""
 
 
-        sqlstr &= " SELECT " & TopMax & " [sms_id],[sms_Datum],[sms_Account], sms_Vorwahl + '' + [sms_Handynummer] as Nummer,[sms_Nachricht],[sms_Sachbearbeiter],CASE WHEN sms_Status=3 then 'OK' when sms_Status='4' THEN 'FEHLER' ELSE '' END as Status,sms_BatchId,sms_MessageIds FROM [tblSMS]  WHERE 1=1 "
+        sqlstr &= " SELECT " & TopMax & " [sms_id],[sms_Datum],[sms_Account], sms_Vorwahl + '' + [sms_Handynummer] as Nummer,[sms_Nachricht],[sms_Sachbearbeiter],CASE WHEN sms_Status IN (2,10) then 'OK' when sms_Status IN (3,4,5,6,8,11) THEN 'FEHLER' when sms_Status IN (0,1,7,9) THEN 'WARTEND' ELSE '' END as Status,sms_BatchId,sms_MessageIds FROM [tblSMS]  WHERE 1=1 "
 
         With MyDatagridview1
             '  .DataSource = myTable

SDL/Speditionsbuch/rptSpeditionsberichtRg.Designer.vb

@@ -21,7 +21,7 @@ Partial Public Class rptSpeditionsberichtRg
         Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail()
         Me.lblVon = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblBis = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblAbfArt = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblAbfArt = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.lblBarzahlungsbetrag = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblAbfAnz = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblAbfArtNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -141,6 +141,7 @@ Partial Public Class rptSpeditionsberichtRg
         Me.lblAbfArt.HyperLink = Nothing
         Me.lblAbfArt.Left = 1.924803!
         Me.lblAbfArt.Name = "lblAbfArt"
+        Me.lblAbfArt.CanGrow = False
         Me.lblAbfArt.Style = "font-size: 9pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
     "ar-set: 1"
         Me.lblAbfArt.Text = "Abfertigungsart"
@@ -665,7 +666,7 @@ Partial Public Class rptSpeditionsberichtRg
     Public WithEvents GroupFooter1 As GrapeCity.ActiveReports.SectionReportModel.GroupFooter
     Public WithEvents lblVon As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblBis As GrapeCity.ActiveReports.SectionReportModel.Label
-    Public WithEvents lblAbfArt As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblAbfArt As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Public WithEvents lblBarzahlungsbetrag As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblAbfAnz As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblAbfArtNr As GrapeCity.ActiveReports.SectionReportModel.Label

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb

@@ -56,6 +56,7 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.pnlOpt = New System.Windows.Forms.Panel()
         Me.pnlBerichte = New System.Windows.Forms.Panel()
+        Me.btnSpedBuchEinnahmen = New System.Windows.Forms.Button()
         Me.lblKdAusFortschritt = New System.Windows.Forms.Label()
         Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
         Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
@@ -181,7 +182,6 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.Label45 = New System.Windows.Forms.Label()
         Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.SplitContainer = New System.Windows.Forms.SplitContainer()
-        Me.Button12 = New System.Windows.Forms.Button()
         Me.cntxtCntxtSpeditionsbuch.SuspendLayout()
         Me.pnlRechts.SuspendLayout()
         CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -671,7 +671,7 @@ Partial Class usrCntlSpeditionsBuchSuche
         '
         'pnlBerichte
         '
-        Me.pnlBerichte.Controls.Add(Me.Button12)
+        Me.pnlBerichte.Controls.Add(Me.btnSpedBuchEinnahmen)
         Me.pnlBerichte.Controls.Add(Me.lblKdAusFortschritt)
         Me.pnlBerichte.Controls.Add(Me.MenuStrip1)
         Me.pnlBerichte.Controls.Add(Me.cboHandlingssatz)
@@ -704,6 +704,21 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.pnlBerichte.TabIndex = 6
         Me.pnlBerichte.Visible = False
         '
+        'btnSpedBuchEinnahmen
+        '
+        Me.btnSpedBuchEinnahmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSpedBuchEinnahmen.Image = Global.SDL.My.Resources.Resources.statistik_small
+        Me.btnSpedBuchEinnahmen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnSpedBuchEinnahmen.Location = New System.Drawing.Point(9, 114)
+        Me.btnSpedBuchEinnahmen.Margin = New System.Windows.Forms.Padding(0)
+        Me.btnSpedBuchEinnahmen.Name = "btnSpedBuchEinnahmen"
+        Me.btnSpedBuchEinnahmen.Size = New System.Drawing.Size(127, 41)
+        Me.btnSpedBuchEinnahmen.TabIndex = 90
+        Me.btnSpedBuchEinnahmen.Text = "Speditionsbericht Einnahmen"
+        Me.btnSpedBuchEinnahmen.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnSpedBuchEinnahmen.UseVisualStyleBackColor = True
+        Me.btnSpedBuchEinnahmen.Visible = False
+        '
         'lblKdAusFortschritt
         '
         Me.lblKdAusFortschritt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -2495,21 +2510,6 @@ Partial Class usrCntlSpeditionsBuchSuche
         Me.SplitContainer.SplitterWidth = 2
         Me.SplitContainer.TabIndex = 3
         '
-        'Button12
-        '
-        Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button12.Image = Global.SDL.My.Resources.Resources.statistik_small
-        Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button12.Location = New System.Drawing.Point(9, 114)
-        Me.Button12.Margin = New System.Windows.Forms.Padding(0)
-        Me.Button12.Name = "Button12"
-        Me.Button12.Size = New System.Drawing.Size(127, 41)
-        Me.Button12.TabIndex = 90
-        Me.Button12.Text = "Speditionsbericht Einnahmen"
-        Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button12.UseVisualStyleBackColor = True
-        Me.Button12.Visible = False
-        '
         'usrCntlSpeditionsBuchSuche
         '
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
@@ -2711,5 +2711,5 @@ Partial Class usrCntlSpeditionsBuchSuche
     Friend WithEvents ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents lblKdAusFortschritt As Label
     Friend WithEvents cbxEIDR As CheckBox
-    Friend WithEvents Button12 As Button
+    Friend WithEvents btnSpedBuchEinnahmen As Button
 End Class

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx

@@ -174,7 +174,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEwAACxMBAJqcGAAAB3VJREFUSEu9VntQ1NUe
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAAB3VJREFUSEu9VntQ1NUe
         /86Uo8VVROUlsrsoBGlyNeURECuwPCXSBG0GAXktr2WX5S0GCob4GEF8XdIGAcP0innTMMsxrczb4A3r
         ZjpxJ3F0uk5aaioomn7u95zdhQWb+u+eme/8zp45nA/f1+f7oSVNxaRtXUWZLasopiGHslqrKf+dWkrZ
         UUGR67W0Yn8jVb+3jVJ3rCBNXRpV7GsYW9BaOz1mnTZVXZNclrK93IaN5lTGk0NeECkLNKQwhpHSyN+C

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb

@@ -513,7 +513,6 @@ Public Class usrCntlSpeditionsBuchSuche
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "SDL") Then
             btnQSAufteilung.Visible = True
             btnCSAufteilung.Visible = True
-            Button12.Visible = True
         End If
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", "SDL") Then
             pnlBerichte.Visible = True
@@ -521,6 +520,10 @@ Public Class usrCntlSpeditionsBuchSuche
             Button17.Visible = True
         End If
 
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen_Erlöse", "SDL") Then
+            btnSpedBuchEinnahmen.Visible = True
+        End If
+
         If KDSearch > 0 Then
             kdtxtAuftraggeber.KdNr = KDSearch
             txtAbfertDat._value = dat_von.ToShortDateString
@@ -1937,7 +1940,7 @@ Public Class usrCntlSpeditionsBuchSuche
         cbxEIDR.Visible = cboFiliale._value = "7001"
     End Sub
 
-    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click
+    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnSpedBuchEinnahmen.Click
         Dim displayFilter = cbxFilterInBericht.Checked
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", "SDL") Then
             Dim sqlstr As String = ""
@@ -1988,12 +1991,26 @@ Public Class usrCntlSpeditionsBuchSuche
                     rpt.lblFilterTxt.Text = "Beschreibung:"
                 End If
             End If
-            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+
+
+            'Problem mit beträge
+            If cboFiliale._value = "" Then
+                rpt.Dispose() : print.Dispose()
+                MsgBox("Bitte Filiale angeben!")
+                Exit Sub
+            End If
+
+            Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            If cboFiliale._value <> "" Then
+                FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value)
+            End If
+            Select Case FirmaTmp
                 Case "IMEX" : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Label28.Text = "IMEX Customs Service GmbH"
                 Case "ATILLA" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "ATILLA Spedition"
-                Case "UNISPED" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "UNISPED Spedition"
+                Case "UNISPED" : rpt.picVERAG.Image = My.Resources.Unisped_logo : rpt.Label28.Text = "UNISPED Spedition"
-                Case "AMBAR" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "AMBAR"
+                Case "AMBAR" : rpt.picVERAG.Image = My.Resources.ambar_simple : rpt.Label28.Text = "AMBAR"
-                Case "FRONTOFFICE" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "FRONTOFFICE"
+                Case "FRONTOFFICE" : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Label28.Text = "FRONTOFFICE"
                 Case Else
             End Select
 
@@ -2001,6 +2018,7 @@ Public Class usrCntlSpeditionsBuchSuche
             If CheckBox1.Checked Then
                 rpt.GroupHeader1.DataField = "FilialenNr" 'Gruppierung
             End If
+
             If rpt.DataSource.rows.count = 0 Then
                 rpt.Dispose() : print.Dispose()
                 MsgBox("Keine Daten vorhanden!")
@@ -2035,7 +2053,7 @@ Public Class usrCntlSpeditionsBuchSuche
                                               rpt.lblAbfArt.Text = If(rpt.Fields.Item("Abfertigungsbezeichnung").Value Is DBNull.Value, "-", rpt.Fields.Item("Abfertigungsbezeichnung").Value)
 
 
-                                              Dim BarBetrag As Double = CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value()).ToString("C")
+                                              Dim BarBetrag As Double = CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value())
                                               Dim sqlstrRg = " SELECT isnull( sum(RechnungsausgangPositionen.SteuerfreierBetrag+RechnungsausgangPositionen.SteuerpflichtigerBetrag),0) as RgBetrag
                                                                 FROM  Speditionsbuch LEFT JOIN Abfertigungsarten ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart 
                                                                  inner JOIN   Rechnungsausgang ON Rechnungsausgang.FilialenNr=Speditionsbuch.FilialenNr and Rechnungsausgang.AbfertigungsNr=Speditionsbuch.AbfertigungsNr and Rechnungsausgang.SpeditionsbuchUnterNr=Speditionsbuch.UnterNr 
@@ -2059,7 +2077,7 @@ Public Class usrCntlSpeditionsBuchSuche
 
                                               Dim ZwSum = RgBetrag + BarBetrag - VkBetrag
 
-                                              rpt.lblBarzahlungsbetrag.Text = BarBetrag
+                                              rpt.lblBarzahlungsbetrag.Text = BarBetrag.ToString("C")
                                               rpt.Label8.Text = (RgBetrag).ToString("C")
                                               rpt.Label13.Text = (VkBetrag).ToString("C")
                                               rpt.Label14.Text = (ZwSum).ToString("C")

SDL/kunden/frmKundenUebersichtZollRgDetails.vb

@@ -18,7 +18,7 @@ Public Class frmKundenUebersichtZollRgDetails
 
     End Sub
     Private Sub frmKundenUebersichtZollRg_Load(sender As Object, e As EventArgs) Handles Me.Load
-        Dim dt As DataRow = SQL.loadDgvBySql("SELECT *, [SteuerpflichtigerGesamtbetrag]*[Steuersatz %] as ErgSteuerbetrag , [SteuerpflichtigerGesamtbetrag]+[SteuerfreierGesamtbetrag] as RgBetrag FROM Rechnungsausgang WHERE RK_ID = " & RK_ID & "", "FMZOLL").Rows(0)
+        Dim dt As DataRow = SQL.loadDgvBySql("SELECT *, /*[SteuerpflichtigerGesamtbetrag]*[Steuersatz %]*/ SteuerpflichtigerGesamtbetrag/(1+[Steuersatz %])*[Steuersatz %] as ErgSteuerbetrag , [SteuerpflichtigerGesamtbetrag]+[SteuerfreierGesamtbetrag] as RgBetrag FROM Rechnungsausgang WHERE RK_ID = " & RK_ID & "", "FMZOLL").Rows(0)
 
         lblRgNr.Text = dt("RechnungsNr").ToString
         lblRgBetrag.Text = CDbl(dt("RgBetrag")).ToString("N2", CultureInfo.CurrentCulture)

VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb

@@ -1017,15 +1017,15 @@ Public Class cAviso
             Dim sqlstr = ""
             Select Case ART
                 Case "AVISIERER"
-                    sqlstr = "SELECT *  FROM [AVISO] 
+                    sqlstr = "SELECT TOP 1000 *  FROM [AVISO] 
                                         WHERE  (SELECT count(*) FROM tblSendungen where AvisoID=tblSnd_AvisoID  AND (tblSnd_AuftraggeberKdNr=@KundenNr OR tblSnd_AvisiererKdNr=@KundenNr OR tblSnd_FrachtfuehrerKdNr=@KundenNr))>0
                                          "
                 Case "EMPFAENGER"
-                    sqlstr = "SELECT *  FROM [AVISO] 
+                    sqlstr = "SELECT TOP 1000 *  FROM [AVISO] 
                                         WHERE  (SELECT count(*) FROM tblSendungen where AvisoID=tblSnd_AvisoID  AND (tblSnd_EmpfaengerKdNr = @KundenNr OR tblSnd_AbsenderKdNr =@KundenNr OR tblSnd_AuftraggeberKdNr=@KundenNr OR tblSnd_AvisiererKdNr=@KundenNr ))>0 "
 
                 Case Else 'Default, alle KdNr-Felder
-                    sqlstr = "SELECT *  FROM [AVISO] 
+                    sqlstr = "SELECT TOP 1000 *  FROM [AVISO] 
                                         WHERE  (SELECT count(*) FROM tblSendungen where AvisoID=tblSnd_AvisoID  AND ( tblSnd_AbsenderKdNr =@KundenNr OR tblSnd_EmpfaengerKdNr = @KundenNr OR  tblSnd_AuftraggeberKdNr=@KundenNr OR tblSnd_AvisiererKdNr=@KundenNr OR tblSnd_FrachtfuehrerKdNr=@KundenNr ))>0 "
             End Select
 
@@ -1039,7 +1039,7 @@ Public Class cAviso
             list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AvisoEingangBIS", bis))
             'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Status", Status))
 
-            dt = SQL.loadDgvBySql_Param(sqlstr & sqlWHERE & " ORDER BY Status desc, Ankunft, Freigabe, Datum ", "AVISO",, list)
+            dt = SQL.loadDgvBySql_Param(sqlstr & sqlWHERE & statusWhere & " ORDER BY Status desc, Ankunft, Freigabe, Datum ", "AVISO",, list)
 
         Catch ex As Exception
             MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb

@@ -759,6 +759,34 @@ Public Class KdSearchBox
         End Set
     End Property
 
+    Public Sub setKdNrKeepName()
+        Dim nameTmp = KdName
+        KdNr = -1
+        KdName = nameTmp
+        Me.Text = nameTmp
+    End Sub
+
+
+    Public Function getFirma() As String
+        If Me.KdData_KUNDE IsNot Nothing And KdNr_value > 0 Then
+            Return VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(Me.KdData_KUNDE.FilialenNr,, "")
+        End If
+        Return ""
+    End Function
+
+
+    Public Function checkFirma(FirmaPruef As String) As Boolean
+        Dim KdFirma = getFirma()
+        If KdFirma <> "" And FirmaPruef <> "" And KdNr_value > 0 Then
+            If KdFirma <> FirmaPruef Then
+                Return False
+            End If
+        End If
+        Return True
+    End Function
+
+
+
     Public Property KdNrNullInt As Object
         Get
             If KdNr_value > 0 Then

VERAG_PROG_ALLGEMEIN/Classes/SQL.vb

@@ -278,6 +278,13 @@ Public Class SQL
 
     Public Shared Function GetNewOpenConnectionEZOLL() As SqlConnection
         Dim cn As New SqlConnection()
+        Try
+            cn.ConnectionString = GetEZOLLConnectionString()
+            cn.Open()
+            Return cn
+        Catch
+            System.Threading.Thread.Sleep(500) 'warten...
+            '2.Versuch
             Try
                 cn.ConnectionString = GetEZOLLConnectionString()
                 cn.Open()
@@ -285,6 +292,7 @@ Public Class SQL
             Catch ex As Exception
                 VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
             End Try
+        End Try
         Return Nothing
 
     End Function

VERAG_PROG_ALLGEMEIN/Classes/cAvisoBenachrichtigungen.vb

@@ -64,7 +64,7 @@ Public Class cAvisoBenachrichtigungen
         If ab_Beschreibung = "" Then ab_Beschreibung = SQL.getValueTxtBySql("SELECT abc_Bezeichnung FROM tblAvisoBenachrichtigungenCodes WHERE abc_id=" & ab_BenachrichtigungCode, "AVISO")
         AB.ab_Beschreibung = ab_Beschreibung
         AB.ab_Prioritaet = ab_Prioritaet
-        AB.ab_Mitarbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
+        AB.ab_Mitarbeiter = If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, "AUTO")
         AB.ab_MitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
 
         AB.ab_Firma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA

VERAG_PROG_ALLGEMEIN/Classes/cFilialen.vb

@@ -0,0 +1,186 @@
+
+
+Imports System.Data.SqlClient
+    Imports System.Reflection
+
+Public Class cFilialen
+    Property FilialenNr As Integer
+
+    Property Stammfiliale As Object = Nothing
+    Property Grenzstelle As Object = Nothing
+    Property Speditionsbuch As Object =Nothing
+    Property Name_1 As Object = Nothing
+    Property Name_2 As Object = Nothing
+    Property Postfach As Object = Nothing
+    Property PLZPF As Object = Nothing
+    Property Straße As Object = Nothing
+    Property LandKz As Object = Nothing
+    Property PLZ As Object = Nothing
+    Property Ort As Object = Nothing
+    Property Telefon As Object = Nothing
+    Property Telefax As Object = Nothing
+    Property E_Mail As Object = Nothing
+    Property UstIdKz As Object = Nothing
+    Property UstIdNr As Object = Nothing
+    Property KorrespondentenNr As Object = Nothing
+    Property Absender As Object = Nothing
+    Property Fil_Status As Object = Nothing
+    Property PP440 As Object = Nothing
+    Property Firma As Object = Nothing
+    Property Cluster As Object = Nothing
+    Property PP441 As Object = Nothing
+
+    Public hasEntry = False
+
+
+    Dim SQL As New SQL
+
+    Sub New()
+
+    End Sub
+    Sub New(FilialenNr)
+        Me.FilialenNr = FilialenNr
+        LOAD()
+    End Sub
+    Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNr", FilialenNr,, True))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Stammfiliale", Stammfiliale))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Grenzstelle", Grenzstelle))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Speditionsbuch", Speditionsbuch))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Name 1", Name_1, "Name_1"))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Name 2", Name_2, "Name_2"))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Postfach", Postfach))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PLZPF", PLZPF))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Straße", Straße))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LandKz", LandKz))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PLZ", PLZ))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Ort", Ort))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Telefon", Telefon))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Telefax", Telefax))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("E-Mail", E_Mail, "E_Mail"))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstIdKz", UstIdKz))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstIdNr", UstIdNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KorrespondentenNr", KorrespondentenNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Absender", Absender))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Fil_Status", Fil_Status))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PP440", PP440))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma", Firma))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Cluster", Cluster))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PP441", PP441))
+
+        Return list
+    End Function
+
+
+
+    Public Function SAVE() As Boolean
+        Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM Filialen  WHERE FilialenNr=@FilialenNr) " &
+                       " BEGIN " & getUpdateCmd() & " END " &
+                       " Else " &
+                       " BEGIN " & getInsertCmd() & " END " &
+                       " commit tran "
+
+        Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
+    End Function
+
+    Public Sub LOAD()
+        Try
+            hasEntry = False
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM Filialen WHERE FilialenNr=@FilialenNr  ", conn)
+                    cmd.Parameters.AddWithValue("@FilialenNr", FilialenNr)
+                    Dim dr = cmd.ExecuteReader()
+                    If dr.Read Then
+                        For Each li In getParameterList()
+                            Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(Me, Nothing)
+                            Else
+                                propInfo.SetValue(Me, dr.Item(li.Text))
+                            End If
+
+                        Next
+                        hasEntry = True
+                    End If
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+    End Sub
+
+
+
+    Public Function getUpdateCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+            Dim str As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            Return (" UPDATE Filialen SET " & str & " WHERE FilialenNr=@FilialenNr ")
+
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+
+
+    Public Function getInsertCmd() As String
+        Try
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim str As String = ""
+            Dim values As String = ""
+            For Each i In list
+                If Not i.isPrimaryParam Then
+                    str &= "[" & i.Text & "],"
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                End If
+            Next
+            str = str.Substring(0, str.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
+            Return (" INSERT INTO Filialen  (" & str & ") VALUES(" & values & ")  ")
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
+    Public Shared Function LOAD_LIST() As List(Of cFilialen)
+        Dim FILIALEN As New List(Of cFilialen)
+        Try
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM Filialen ", conn)
+                    Dim dr = cmd.ExecuteReader()
+                    While dr.Read
+                        Dim FILIALE As New cFilialen
+                        For Each li In FILIALE.getParameterList()
+                            Dim propInfo As PropertyInfo = FILIALE.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(FILIALE, Nothing)
+                            Else
+                                propInfo.SetValue(FILIALE, dr.Item(li.Text))
+                            End If
+
+                        Next
+                        FILIALEN.Add(FILIALE)
+                    End While
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return FILIALEN
+    End Function
+End Class

VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb

@@ -102,6 +102,34 @@ Public Class cFirmen
         End Try
     End Sub
 
+    Public Shared Function LOAD_LIST() As List(Of cFirmen)
+        Dim FIRMEN As New List(Of cFirmen)
+        Try
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                Using cmd As New SqlCommand("SELECT * FROM tblFirma ", conn)
+                    Dim dr = cmd.ExecuteReader()
+                    While dr.Read
+                        Dim FIMRA As New cFirmen
+                        For Each li In FIMRA.getParameterList()
+                            Dim propInfo As PropertyInfo = FIMRA.GetType.GetProperty(li.Scalarvariable)
+
+                            If dr.Item(li.Text) Is DBNull.Value Then
+                                propInfo.SetValue(FIMRA, Nothing)
+                            Else
+                                propInfo.SetValue(FIMRA, dr.Item(li.Text))
+                            End If
+
+                        Next
+                        FIRMEN.Add(FIMRA)
+                    End While
+                    dr.Close()
+                End Using
+            End Using
+        Catch ex As Exception
+            MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+        End Try
+        Return FIRMEN
+    End Function
 
 
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb

@@ -1,5 +1,6 @@
 Imports com.esendex.sdk.messaging
 Imports com.esendex.sdk.sent
+Imports com.esendex.sdk.core
 Imports System.Data.SqlClient
 Imports System.Reflection
 
@@ -213,10 +214,17 @@ Public Class cSMS
         End Try
 
     End Function
-    Function checkSMSStatus(Optional silent = False) As String
+    Function checkSMSStatus(Optional silent = False, Optional insertVermerkAviso = True) As String
         Try
 
-            If Me.sms_Status >= 3 Then Return Me.sms_Status ' Bereits finaler Status, keine Abfrage nötig
+            Select Case Me.sms_Status
+                Case MessageStatus.Submitted, MessageStatus.Sent, MessageStatus.Scheduled, MessageStatus.Connecting, -1
+                    'Weiter...
+                Case Else
+                    ' Bereits finaler Status, keine Abfrage nötig
+                    Return Me.sms_Status
+            End Select
+
             If If(Me.sms_MessageIds, "") = "" Then
                 If Not silent Then MsgBox("Keine MessageId gefunden!")
                 Return False ' Keine MsgId
@@ -226,23 +234,44 @@ Public Class cSMS
 
             'Send a message and retrieve the message ID
             Dim MSG = sendService.GetMessage(New Guid(Me.sms_MessageIds.ToString))
-            Dim messageStatus = MSG.Status
+            Dim msgStatus = MSG.Status
             '    MsgBox(MSG.Status)
             'Status in DB Ubdaten
-            Me.sms_Status = messageStatus
+            Me.sms_Status = msgStatus
             Me.sms_Sent = MSG.SentAt
             Me.sms_Delivered = MSG.DeliveredAt
 
-            If IsDate(MSG.DeliveredAt) Then
+            'If IsDate(MSG.DeliveredAt) Then
-                Me.sms_Status = 3 ': MsgBox("SENT")
+            '    Me.sms_Status = 2 ': MsgBox("SENT")
-            Else
+            'Else
-                'MsgBox("NOT SENT")
+            '    'MsgBox("NOT SENT")
-            End If
+            'End If
 
             If MSG.FailureReason IsNot Nothing Then Me.sms_Failure = MSG.FailureReason.Description
             Me.SAVE()
 
-            Return messageStatus
+            If True Then
+                Try
+
+
+                    If Me.sms_AvisoId IsNot Nothing AndAlso IsNumeric(Me.sms_AvisoId) Then
+                    Select Case MSG.Status
+                        Case MessageStatus.Expired, MessageStatus.Failed, MessageStatus.FailedAuthorisation, MessageStatus.Cancelled, MessageStatus.Rejected
+                                'Keine Übermittlung.
+                                Dim MaId As Integer = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & Me.sms_AvisoId & "' ", "AVISO", -1)
+                                If MaId > 0 Then
+                                    VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(Me.sms_AvisoId, Nothing, 3, "B", MaId, "*SMS Fehler*", 0, "", "Fehler bei der SMS Übermittlung: " & If(Me.sms_Failure, ""))
+                                End If
+                    End Select
+
+                End If
+
+                Catch ex As Exception
+                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name)
+
+                End Try
+            End If
+            Return msgStatus
         Catch ex As Exception
             If Not silent Then MsgBox("Fehler beim Prüfen des SMS Status!" & vbNewLine & ex.Message & ex.StackTrace)
         End Try

VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj

@@ -303,6 +303,7 @@
     <Compile Include="Classes\cERS.vb" />
     <Compile Include="Classes\cEZB_Waehrungskurse.vb" />
     <Compile Include="Classes\cEZT_ImportCodenummern.vb" />
+    <Compile Include="Classes\cFilialen.vb" />
     <Compile Include="Classes\cFirmen.vb" />
     <Compile Include="Classes\cFremdSpeditionenZuordnung.vb" />
     <Compile Include="Classes\cGelangensbestaetigung.vb" />

VERAG_PROG_ALLGEMEIN/cAllgemein.vb

@@ -19,7 +19,7 @@ Public Class cAllgemein
     Public Shared AVISO_SERVER As String = "[SQLGUIDE01.verag.ost.dmn]" '"[SQLGUIDE01.verag.ost.dmn]"
     Public Shared FMZOLL_SERVER As String = "[FMZOLL\SQLFMZOLL]" '"[SQLGUIDE01.verag.ost.dmn]"
     'Public Shared FMZOLL_ATLAS_Datensicherung As String = "\\192.168.0.91\f\FMZoll\Datensicherung\atlas\atlas\fssouzb"
-    Public Shared FMZOLL_ATLAS_Datensicherung As String = "\\share01\F\FMZoll\Datensicherung\atlas\atlas\fssouzb"
+    Public Shared FMZOLL_ATLAS_Datensicherung_OLD As String = "\\share01\F\FMZoll\Datensicherung\atlas\atlas\fssouzb"
 
     Public Shared BÜRO As String
 
@@ -54,6 +54,8 @@ Public Class cAllgemein
 
     Shared SQL As New SQL
     Public Shared MITARBEITER As cMitarbeiter
+    Public Shared FIRMEN As List(Of cFirmen)
+    Public Shared FILIALEN As List(Of cFilialen)
     Public Const LeerDatum As Date = #12/30/1899#   'wird als leerer Datumswert verwendet, da sonst Probleme bei Null/Date
 
     Public Shared Sub LOAD_DATA()
@@ -106,6 +108,8 @@ Public Class cAllgemein
         End If
         LOAD_PARAM()
         LOAD_TRANSLATE()
+        LOAD_FIRMEN()
+        LOAD_FILIALEN()
         If TESTSYSTEM Then
             AVISO_SERVER = "[DEVELOPER\DEVSQL]"
             FMZOLL_SERVER = "[DEVELOPER\DEVSQL]"
@@ -120,6 +124,12 @@ Public Class cAllgemein
     Public Shared Sub LOAD_PARAM()
         PARAMS = New cParameterList(PROGID, FIRMA)
     End Sub
+    Public Shared Sub LOAD_FIRMEN()
+        FIRMEN = cFirmen.LOAD_LIST
+    End Sub
+    Public Shared Sub LOAD_FILIALEN()
+        FILIALEN = cFilialen.LOAD_LIST
+    End Sub
 
     Public Shared Sub LOAD_TRANSLATE()
         TRANSLATE = New cTranslate_LIST(PROGID)
@@ -249,7 +259,9 @@ Public Class cAllgemein
     Public Shared Function getFirmaFromFiliale2(FilialenNr As Object, Optional usedefaultFirma As Boolean = True, Optional defaultFIRMA As String = "VERAG") As String
         Dim FirmaTMP = ""
         If FilialenNr IsNot Nothing AndAlso IsNumeric(FilialenNr) Then
-            FirmaTMP = SQL.getValueTxtBySql("SELECT TOP 1 [Firma] FROM [Filialen] WHERE  FilialenNr='" & FilialenNr & "' ", "FMZOLL")
+            ' FirmaTMP = SQL.getValueTxtBySql("SELECT TOP 1 [Firma] FROM [Filialen] WHERE  FilialenNr='" & FilialenNr & "' ", "FMZOLL")
+            Dim FILIALE = FILIALEN.Find(Function(x) x.FilialenNr = FilialenNr)
+            If FILIALE IsNot Nothing Then FirmaTMP = If(FILIALE.Firma, "")
         End If
         If usedefaultFirma AndAlso FirmaTMP = "" Then FirmaTMP = defaultFIRMA
         Return FirmaTMP
@@ -259,7 +271,9 @@ Public Class cAllgemein
     Public Shared Function getFirmaFromFiliale(FilialenNr As Object, Optional defaultVERAG As Boolean = True) As String
         Dim FirmaTMP = ""
         If FilialenNr IsNot Nothing AndAlso IsNumeric(FilialenNr) Then
-            FirmaTMP = SQL.getValueTxtBySql("SELECT TOP 1 [Firma] FROM [Filialen] WHERE  FilialenNr='" & FilialenNr & "' AND ( Firma='" & FIRMA & "' OR Cluster='" & CLUSTER & "')", "FMZOLL")
+            ' FirmaTMP = SQL.getValueTxtBySql("SELECT TOP 1 [Firma] FROM [Filialen] WHERE  FilialenNr='" & FilialenNr & "' AND ( Firma='" & FIRMA & "' OR Cluster='" & CLUSTER & "')", "FMZOLL")
+            Dim FILIALE = FILIALEN.Find(Function(x) x.FilialenNr = FilialenNr And (x.Firma = FIRMA Or x.Cluster = CLUSTER))
+            If FILIALE IsNot Nothing Then FirmaTMP = If(FILIALE.Firma, "")
         End If
         If defaultVERAG AndAlso FirmaTMP = "" Then FirmaTMP = "VERAG"
         Return FirmaTMP

VERAG_PROG_ALLGEMEIN/frmScan.vb

@@ -43,6 +43,12 @@ Public Class frmScan
     Public DefaultFileName = ""
     'Dim DS As New cDATENSERVER
 
+    Private Sub Form1_FormClosed(sender As Object, e As FormClosedEventArgs) Handles Me.FormClosed
+        m_TwainManager.Dispose()
+        m_ImageCore.Dispose()
+        m_TwainManager = Nothing
+        m_ImageCore = Nothing
+    End Sub
 
     Sub New(ART)
 
@@ -536,10 +542,12 @@ Public Class frmScan
             MessageBox.Show(ex.Message)
         Finally
             m_ImageCore.Dispose() 'Speicherfreigabe
-
+            m_PDFCreator = Nothing 'Speicherfreigabe??
         End Try
     End Sub
 
+
+
     Private Function VerifyFileName(fileName As String) As Boolean
         Try
             If fileName.LastIndexOfAny(System.IO.Path.GetInvalidFileNameChars()) = -1 Then