neu

VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb

@@ -46,7 +46,7 @@ Public Class cSqlDb
 
     Public Shared Function GetNewOpenConnectionFMZOLL(Optional pooling As Boolean = True) As SqlConnection
         Dim cn As New SqlConnection()
-        cn.ConnectionString = GetFMZOLLConnectionString() & CStr(IIf(pooling, "", ";pooling=false"))
+        cn.ConnectionString = GetFMZOLLConnectionString() & CStr(If(pooling, "", ";pooling=false"))
         cn.Open()
         Return cn
     End Function
@@ -891,6 +891,8 @@ Public Class cAviso
     Property FahrerHandy As Object = Nothing
     Property LKW_Nationalitaet As Object = Nothing
     Property DakosyRef As Object = Nothing
+    Property TeamId As Object = Nothing
+
 
     Sub UPDATE_FahrerHandy(FahrerHandy As String)
         If AvisoID <= 0 Then Exit Sub
@@ -978,6 +980,7 @@ Public Class cAvisoDAL
                     daten.FahrerHandy = VarToStr(dr.Item("FahrerHandy"))
                     daten.LKW_Nationalitaet = VarToStr(dr.Item("LKW_Nationalitaet"))
                     daten.DakosyRef = VarToStr(dr.Item("DakosyRef"))
+                    daten.TeamId = If(dr.Item("TeamId") Is DBNull.Value, Nothing, dr.Item("TeamId"))
 
 
 
@@ -1232,17 +1235,17 @@ Public Class cAvisoDAL
             hAuswahl = "INSERT INTO Aviso " &
                        "(Datum, LKW_Nr, Telefonisch, Änderungen, Info, Status, Auftraggeber, Frächter, letzterMitarbeiter, " &
                        "Vorbereitet,Vorgeschrieben, Ankunft, Freigabe, Dauer, AvisoEingang, Grenzstelle, LKW_fertig,letzterMitarbeiterId,Handling,Sendungen_Gesamtanzahl,Sammelakt,Frächter_KdNr,Auftraggeber_KdNr,AvisoTVHinweis,Buero,Imex,Abgeschlossen,FIRMA, " &
-                       " Durchgangszollstelle1,Durchgangszollstelle2,Durchgangszollstelle3,Durchgangszollstelle4,Durchgangszollstelle5,Durchgangszollstelle6,Ausgangszollstelle,Zollstelle,TransportTemperatur,Zugmaschine,FahrerHandy,LKW_Nationalitaet,DakosyRef) VALUES (" &
+                       " Durchgangszollstelle1,Durchgangszollstelle2,Durchgangszollstelle3,Durchgangszollstelle4,Durchgangszollstelle5,Durchgangszollstelle6,Ausgangszollstelle,Zollstelle,TransportTemperatur,Zugmaschine,FahrerHandy,LKW_Nationalitaet,DakosyRef,TeamId) VALUES (" &
                        "@Datum, @LKW_Nr, @Telefonisch, @Änderungen, @Info, @Status, @Auftraggeber, @Frächter, @letzterMitarbeiter, " &
                        "@Vorbereitet, @Vorgeschrieben, @Ankunft, @Freigabe, @Dauer, @AvisoEingang, @Grenzstelle, @LKW_fertig,@letzterMitarbeiterId,@Handling,@Sendungen_Gesamtanzahl,@Sammelakt,@Frächter_KdNr,@Auftraggeber_KdNr,@AvisoTVHinweis,@Buero,@Imex,@Abgeschlossen,@FIRMA," &
-                       "@Durchgangszollstelle1,@Durchgangszollstelle2,@Durchgangszollstelle3,@Durchgangszollstelle4,@Durchgangszollstelle5,@Durchgangszollstelle6,@Ausgangszollstelle,@Zollstelle,@TransportTemperatur,@Zugmaschine,@FahrerHandy,@LKW_Nationalitaet,@DakosyRef); SELECT CAST(scope_identity() AS int);"
+                       "@Durchgangszollstelle1,@Durchgangszollstelle2,@Durchgangszollstelle3,@Durchgangszollstelle4,@Durchgangszollstelle5,@Durchgangszollstelle6,@Ausgangszollstelle,@Zollstelle,@TransportTemperatur,@Zugmaschine,@FahrerHandy,@LKW_Nationalitaet,@DakosyRef,@TeamId); SELECT CAST(scope_identity() AS int);"
         Else
             id = d.AvisoID
             'Änderung
             hAuswahl = String.Format(
                        "UPDATE Aviso SET Datum = @Datum, LKW_Nr = @LKW_Nr, Telefonisch=@Telefonisch, Änderungen=@Änderungen, Info=@Info, Status=@Status, Auftraggeber=@Auftraggeber, Frächter=@Frächter, " &
                        " letzterMitarbeiter = @letzterMitarbeiter, Vorbereitet=@Vorbereitet,Vorgeschrieben=@Vorgeschrieben, Ankunft = @Ankunft, Freigabe = @Freigabe, Dauer = @Dauer, AvisoEingang = @AvisoEingang, Grenzstelle=@Grenzstelle, LKW_fertig=@LKW_fertig, letzterMitarbeiterId=@letzterMitarbeiterId, Handling=@Handling,Sendungen_Gesamtanzahl=@Sendungen_Gesamtanzahl,Sammelakt=@Sammelakt,Frächter_KdNr=@Frächter_KdNr,Auftraggeber_KdNr=@Auftraggeber_KdNr,AvisoTVHinweis=@AvisoTVHinweis,Buero=@Buero,Imex=@Imex,Abgeschlossen=@Abgeschlossen,  " &
-                       " Durchgangszollstelle1=@Durchgangszollstelle1,Durchgangszollstelle2=@Durchgangszollstelle2,Durchgangszollstelle3=@Durchgangszollstelle3,Durchgangszollstelle4=@Durchgangszollstelle4,Durchgangszollstelle5=@Durchgangszollstelle5,Durchgangszollstelle6=@Durchgangszollstelle6,Ausgangszollstelle=@Ausgangszollstelle,Zollstelle=@Zollstelle,TransportTemperatur=@TransportTemperatur,Zugmaschine=@Zugmaschine,FahrerHandy=@FahrerHandy, LKW_Nationalitaet=@LKW_Nationalitaet, DakosyRef=@DakosyRef " &
+                       " Durchgangszollstelle1=@Durchgangszollstelle1,Durchgangszollstelle2=@Durchgangszollstelle2,Durchgangszollstelle3=@Durchgangszollstelle3,Durchgangszollstelle4=@Durchgangszollstelle4,Durchgangszollstelle5=@Durchgangszollstelle5,Durchgangszollstelle6=@Durchgangszollstelle6,Ausgangszollstelle=@Ausgangszollstelle,Zollstelle=@Zollstelle,TransportTemperatur=@TransportTemperatur,Zugmaschine=@Zugmaschine,FahrerHandy=@FahrerHandy, LKW_Nationalitaet=@LKW_Nationalitaet, DakosyRef=@DakosyRef,TeamId=@TeamId " &
                        " WHERE AvisoID = @AvisoID")
         End If
 
@@ -1303,6 +1306,9 @@ Public Class cAvisoDAL
             cmd.Parameters.AddWithValue("@FahrerHandy", If(d.FahrerHandy Is Nothing, DBNull.Value, d.FahrerHandy))
             cmd.Parameters.AddWithValue("@LKW_Nationalitaet", If(d.LKW_Nationalitaet Is Nothing, DBNull.Value, d.LKW_Nationalitaet))
             cmd.Parameters.AddWithValue("@DakosyRef", If(d.DakosyRef Is Nothing, DBNull.Value, d.DakosyRef))
+            cmd.Parameters.AddWithValue("@TeamId", If(d.TeamId Is Nothing, DBNull.Value, d.TeamId))
+
+
 
             Try
                 If d.AvisoID <= 0 Then
@@ -1363,8 +1369,8 @@ Public Class cAvisoDAL
     Public Function insertSendungEmpty(ByVal AvisoID As Integer, ByVal PosUnterNr As Integer, ByVal FilialenNr As Integer, ByVal AbfertigungsNr As Object, ByVal UnterNr As Integer, ByVal tblSnd_Abfertigungsart_ID As Object, Optional tblSnd_AuftraggeberKdNr As Object = Nothing, Optional tblSnd_Auftraggeber As Object = Nothing, Optional tblSnd_Fremdspedition As Boolean = False, Optional ByRef sndId As Integer = -1) As Boolean
         Dim conn As SqlConnection = cDatenbankAVISO.GetNewOpenConnection()
         Dim sql As String = " INSERT INTO tblSendungen " &
-                                            " ([tblSnd_PosUnterNr],[tblSnd_AvisoID],FilialenNr,AbfertigungsNr,UnterNr,tblSnd_Abfertigungsart_ID,tblSnd_AuftraggeberKdNr,tblSnd_Auftraggeber,tblSnd_Fremdspedition) " &
-                                        " VALUES(@PosUnterNr,@AvisoID,@FilialenNr,@AbfertigungsNr,@UnterNr,@tblSnd_Abfertigungsart_ID,@tblSnd_AuftraggeberKdNr,@tblSnd_Auftraggeber,@tblSnd_Fremdspedition) "
+                                            " ([tblSnd_PosUnterNr],[tblSnd_AvisoID],FilialenNr,AbfertigungsNr,UnterNr,tblSnd_Abfertigungsart_ID,tblSnd_AuftraggeberKdNr,tblSnd_Auftraggeber,tblSnd_Fremdspedition,tblSnd_QS_MA,LetzterMitarbeiterId,LetzterMitarbeiter) " &
+                                        " VALUES(@PosUnterNr,@AvisoID,@FilialenNr,@AbfertigungsNr,@UnterNr,@tblSnd_Abfertigungsart_ID,@tblSnd_AuftraggeberKdNr,@tblSnd_Auftraggeber,@tblSnd_Fremdspedition,@tblSnd_QS_MA,@LetzterMitarbeiterId,@LetzterMitarbeiter) "
 
         Using cmd As New SqlCommand(sql, conn)
             cmd.Parameters.AddWithValue("@AvisoID", AvisoID)
@@ -1380,6 +1386,15 @@ Public Class cAvisoDAL
             cmd.Parameters.AddWithValue("@tblSnd_Auftraggeber", IIf(tblSnd_Auftraggeber Is Nothing, DBNull.Value, tblSnd_Auftraggeber))
             cmd.Parameters.AddWithValue("@tblSnd_Fremdspedition", tblSnd_Fremdspedition)
 
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
+                cmd.Parameters.AddWithValue("@tblSnd_QS_MA", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)
+            Else
+                cmd.Parameters.AddWithValue("@tblSnd_QS_MA", DBNull.Value)
+            End If
+
+            cmd.Parameters.AddWithValue("@LetzterMitarbeiter", VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME)
+            cmd.Parameters.AddWithValue("@LetzterMitarbeiterId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)
+
 
             Try
                 cmd.ExecuteNonQuery()

VERAG_PROG_ALLGEMEIN/AVISO/cGlobal.vb

@@ -11,6 +11,7 @@ Public Class cGlobal
     Public Shared DBPfad As String
     ' Public Shared Aktive_AuswahlID As Integer
     Public Shared Aktive_ID As Integer
+    Public Shared Aktive_SendungsID As Integer
     Public Shared Aktive_Zeile As Integer
     Public Shared Ausgewählte_Zeile As Integer = 0
     Public Shared AnzahlAlle As Long

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb

@@ -73,12 +73,20 @@ Public Class KdSearchBox
             ' If dgv Is Nothing Then dgv = usrcntl.dgvKundenAktiv
             ' If dgvInaktiv Is Nothing Then dgvInaktiv = usrcntl.dgvKundenInAktiv
 
+
             If e.KeyCode = Keys.Tab Then
                 If usrcntl IsNot Nothing Then usrcntl.Visible = False
                 e.Handled = True
                 Exit Sub
             End If
 
+            If e.KeyCode = Keys.ShiftKey Or e.KeyCode = Keys.Shift Or e.KeyCode = Keys.Alt Or e.KeyCode = Keys.Control Or e.KeyCode = Keys.Left Or e.KeyCode = Keys.Right Or e.KeyCode = Keys.End Or e.KeyCode = Keys.Home Or e.KeyCode = Keys.CapsLock Then 'Bei Shift Tab..
+                If usrcntl IsNot Nothing Then usrcntl.Visible = False
+                e.Handled = True
+                Exit Sub
+            End If
+
+
             If e.KeyCode = Keys.Return Then
                 e.Handled = True
                 Exit Sub
@@ -101,7 +109,6 @@ Public Class KdSearchBox
             End If
             If kdNrField IsNot Nothing Then kdNrField.Text = ""
 
-
             KdNr_value = -1
             KdData_KUNDE = Nothing
             KdData_ADRESSEN = Nothing

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyComboBox.vb

@@ -10,15 +10,15 @@ Public Class MyComboBox
     Public Sub New()
     End Sub
 
-    Sub fillWithMyListItem(l As List(Of MyListItem), Optional firstEmpty As Boolean = False)
-        MyBase.Items.Clear()
+    Sub fillWithMyListItem(l As List(Of MyListItem), Optional firstEmpty As Boolean = False, Optional clearList As Boolean = True)
+        If clearList Then MyBase.Items.Clear()
         If firstEmpty Then
             Me.Items.Insert(0, New MyListItem("", ""))
         End If
         For Each i In l : MyBase.Items.Add(i) : Next
     End Sub
-    Sub fillWithSQL(sqlstr As String, Optional showValueInText As Boolean = True, Optional conn As String = "SDL", Optional firstEmpty As Boolean = False)
-        fillWithMyListItem((New SQL).loadCboBySqlWithListItem(sqlstr, showValueInText, conn), firstEmpty)
+    Sub fillWithSQL(sqlstr As String, Optional showValueInText As Boolean = True, Optional conn As String = "SDL", Optional firstEmpty As Boolean = False, Optional clearList As Boolean = True)
+        fillWithMyListItem((New SQL).loadCboBySqlWithListItem(sqlstr, showValueInText, conn), firstEmpty, clearList)
     End Sub
 
     Public Property _value As String

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MySearchBox.vb

@@ -98,6 +98,13 @@ Public Class MySearchBox
             ' If dgv Is Nothing Then dgv = usrcntl.dgvKundenAktiv
             ' If dgvInaktiv Is Nothing Then dgvInaktiv = usrcntl.dgvKundenInAktiv
 
+            If e.KeyCode = Keys.ShiftKey Or e.KeyCode = Keys.Shift Or e.KeyCode = Keys.Alt Or e.KeyCode = Keys.Control Or e.KeyCode = Keys.Left Or e.KeyCode = Keys.Right Or e.KeyCode = Keys.End Or e.KeyCode = Keys.Home Or e.KeyCode = Keys.CapsLock Then 'Bei Shift Tab..
+                If usrcntl IsNot Nothing Then usrcntl.Visible = False
+                e.Handled = True
+                Exit Sub
+            End If
+
+
             If e.KeyCode = Keys.Tab Then
                 If usrcntl IsNot Nothing Then usrcntl.Visible = False
                 e.Handled = True

VERAG_PROG_ALLGEMEIN/Classes/SQL.vb

@@ -653,15 +653,20 @@ Public Class SQL
         Return Nothing
     End Function
 
-
-    Public Function getFMZOLLKdNrFromEORI(ByVal eori As String) As String
-        Dim s As String = ""
+    Function getFirmaWhere()
         Dim where = ""
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "IMEX" : where &= " AND [FilialenNr]='5501'  "
-            Case Else : where &= " AND isnull([FilialenNr],0)<>'5501' "
+            Case "UNISPED" : where &= " AND [FilialenNr]='5601'  "
+            Case "AMBAR" : where &= " AND [FilialenNr]='5701'  "
+            Case "FRONTOFFICE" : where &= " AND [FilialenNr]='5801'  "
+            Case Else : where &= " AND isnull([FilialenNr],0) NOT IN ('5501','5601','5701','5801') "
         End Select
-
+        Return where
+    End Function
+    Public Function getFMZOLLKdNrFromEORI(ByVal eori As String) As String
+        Dim s As String = ""
+        Dim where = getFirmaWhere()
 
         Try
             Dim conn As SqlConnection = GetNewOpenConnectionFMZOLL()
@@ -904,11 +909,7 @@ Public Class SQL
 
     Public Function getATLASKdNrFromZollNr(ByVal ZollNr As String) As String
         Dim s As String = ""
-        Dim where = ""
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX" : where &= " AND [FilialenNr]='5501'  "
-            Case Else : where &= " AND isnull([FilialenNr],0)<>'5501' "
-        End Select
+        Dim where = getFirmaWhere()
 
         Try
             Dim conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL

VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb

@@ -61,9 +61,9 @@ Public Class cAdressen
 
     Public Shared Function getHoechsteKdNr(NrKr_von As Integer, NrKr_bis As Integer) As Integer
         Try
-            Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+            Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL(False)
 
-                Using cmd As New SqlCommand("select isnull(min([AdressenNr]) +1," & NrKr_von & ")  as AdressenNr from [Adressen] a INNER JOIN Kunden ON Kundennr=adressennr where  AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' AND not exists ( select * from [Adressen] b where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' and a.[AdressenNr] +1 = b.[AdressenNr])    AND KundenNr NOT IN (([AdressenNr]) +1) ", conn)
+                Using cmd As New SqlCommand("select isnull(min([AdressenNr]) +1," & NrKr_von & ")  as AdressenNr from [Adressen] a INNER JOIN Kunden ON Kundennr=adressennr where  AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' AND not exists ( select * from [Adressen] b where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' and a.[AdressenNr] +1 = b.[AdressenNr]) AND KundenNr NOT IN (([AdressenNr]) +1) ", conn)
                     'Using cmd As New SqlCommand("SELECT isnull(max([AdressenNr])," & NrKr_von & ") as AdressenNr FROM Adressen WHERE AdressenNr BETWEEN '" & NrKr_von & "' AND '" & NrKr_bis & "' ", conn)
                     Dim dr = cmd.ExecuteReader()
                     If dr.HasRows Then
@@ -176,7 +176,7 @@ Public Class cAdressen
     Public Sub LOAD()
         Dim test = ""
         Try
-            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
                 Using cmd As New SqlCommand("SELECT * FROM Adressen WHERE AdressenNr=@AdressenNr  ", conn)
                     cmd.Parameters.AddWithValue("@AdressenNr", AdressenNr)
 
@@ -224,7 +224,7 @@ Public Class cAdressen
 
     Public Function doesOrdnungsbegriffExist() As Boolean
         Try
-            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+            Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
                 Using cmd As New SqlCommand("SELECT count(*) FROM Adressen WHERE Ordnungsbegriff=@Ordnungsbegriff  ", conn)
                     cmd.Parameters.AddWithValue("@Ordnungsbegriff", Ordnungsbegriff)
 
@@ -263,7 +263,7 @@ Public Class cAdressen
     End Function
 
     Public Shared Function getNewAdressenNr752000() As Integer
-        Return (New SQL).getValueTxtBySql("SELECT isnull(MAX (Adressennr),752000)+1  FROM [VERAG].[dbo].[Adressen]    where [AdressenNr]>752000 and [AdressenNr]<800000", "FMZOLL")
+        Return (New SQL).getValueTxtBySql("SELECT isnull(MAX (Adressennr),752000)+1  FROM [Adressen]    where [AdressenNr]>752000 and [AdressenNr]<800000", "FMZOLL")
     End Function
 
     Public Function getInsertCmd() As String

VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhaenge.vb

@@ -10,6 +10,9 @@ Public Class cAvisoAnhaenge
     Property anh_Art As Object = Nothing
     Property anh_Typ As String
     Property anh_Reihenfolge As Integer = 99
+    Property anh_LaufzettelDruck As Boolean = False
+
+
     Public hasEntry As Boolean = False
 
     Dim SQL As New SQL
@@ -46,6 +49,7 @@ Public Class cAvisoAnhaenge
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Art", anh_Art))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Typ", anh_Typ))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Reihenfolge", anh_Reihenfolge))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_LaufzettelDruck", anh_LaufzettelDruck))
 
         Return list
     End Function
@@ -161,4 +165,9 @@ Public Class cAvisoAnhaenge
         Return (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sqlstr, "AVISO")
     End Function
 
+    Public Shared Function toggleLaufzettelDruck(id As Integer) As Boolean 'obj As Object, tablename As String, where As String) As Boolean
+        Dim sqlstr = " UPDATE [tblAvisoAnhaenge]  SET [anh_LaufzettelDruck] = 1 - [anh_LaufzettelDruck] WHERE anh_id=" & id
+        Return (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sqlstr, "AVISO")
+    End Function
+
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb

@@ -50,6 +50,7 @@ Public Class cMitarbeiter
 
     Property mit_AliasAD_Domain As Object = Nothing
     Property mit_AliasAD_Username As Object = Nothing
+    Property mit_teamId As Object = Nothing
 
     Sub New()
 
@@ -121,6 +122,7 @@ Public Class cMitarbeiter
                             If Not dr.Item("mit_TELOTEC_SB") Is DBNull.Value Then Me.mit_TELOTEC_SB = dr.Item("mit_TELOTEC_SB")
                             If Not dr.Item("mit_AliasAD_Domain") Is DBNull.Value Then Me.mit_AliasAD_Domain = dr.Item("mit_AliasAD_Domain")
                             If Not dr.Item("mit_AliasAD_Username") Is DBNull.Value Then Me.mit_AliasAD_Username = dr.Item("mit_AliasAD_Username")
+                            If Not dr.Item("mit_teamId") Is DBNull.Value Then Me.mit_teamId = dr.Item("mit_teamId")
 
 
 

VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb

@@ -65,6 +65,15 @@ Public Class cSendungen
     Property tblSnd_Warenwert As Object = Nothing
     Property tblSnd_WarenwertWaehrung As Object = Nothing
 
+
+    Property tblSnd_Status As Integer = 0
+    Property tblSnd_Vorbereitet As Object = Nothing
+    Property tblSnd_Vorgeschrieben As Object = Nothing
+
+    Property LetzterMitarbeiter As Object = Nothing
+    Property LetzterMitarbeiterId As Object = Nothing
+    Property tblSnd_VG_MA As Object = Nothing
+
     Property ABRECHNUNG As New List(Of cSendungAbrechnung)
     Property HANDLING As New List(Of cSendHandling)
 
@@ -116,6 +125,13 @@ Public Class cSendungen
         Me.tblSnd_inBearbeitung = False
         Me.tblSnd_aufschub = ""
 
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
+            Me.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+        End If
+
+        Me.LetzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
+        Me.LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+
         If FilialenNr IsNot Nothing Then Me.FilialenNr = FilialenNr
         If AbfertigungsNr IsNot Nothing Then Me.AbfertigungsNr = AbfertigungsNr
         If UnterNr IsNot Nothing Then Me.UnterNr = UnterNr
@@ -226,6 +242,13 @@ Public Class cSendungen
                     Me.tblSnd_Warenwert = SQL.checkNullReturnValue(dr.Item("tblSnd_Warenwert"), Nothing)
                     Me.tblSnd_WarenwertWaehrung = SQL.checkNullReturnValue(dr.Item("tblSnd_WarenwertWaehrung"), Nothing)
 
+                    Me.tblSnd_Status = SQL.checkNullReturnValue(dr.Item("tblSnd_Status"), Nothing)
+                    Me.tblSnd_Vorbereitet = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorbereitet"), Nothing)
+                    Me.tblSnd_Vorgeschrieben = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorgeschrieben"), Nothing)
+
+                    Me.LetzterMitarbeiter = SQL.checkNullReturnValue(dr.Item("LetzterMitarbeiter"), Nothing)
+                    Me.LetzterMitarbeiterId = SQL.checkNullReturnValue(dr.Item("LetzterMitarbeiterId"), Nothing)
+                    Me.tblSnd_VG_MA = SQL.checkNullReturnValue(dr.Item("tblSnd_VG_MA"), Nothing)
 
                 End If
                 dr.Close()
@@ -291,6 +314,8 @@ Public Class cSendungen
                     a.sndhdg_abrArt = SQL.checkNullReturnValue(dr2.Item("sndhdg_abrArt"), Nothing)
                     a.sndhdg_nr = SQL.checkNullReturnValue(dr2.Item("sndhdg_nr"), Nothing)
 
+                    a.sndhdg_colli = SQL.checkNullReturnValue(dr2.Item("sndhdg_colli"), 0)
+                    a.sndhdg_gewicht = SQL.checkNullReturnValue(dr2.Item("sndhdg_gewicht"), 0)
                     Me.HANDLING.Add(a)
                 End While
                 dr2.Close()
@@ -369,6 +394,12 @@ Public Class cSendungen
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_ATCMRN_Fremd", tblSnd_ATCMRN_Fremd))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Warenwert", tblSnd_Warenwert))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_WarenwertWaehrung", tblSnd_WarenwertWaehrung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Status", tblSnd_Status))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorbereitet", tblSnd_Vorbereitet))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorgeschrieben", tblSnd_Vorgeschrieben))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LetzterMitarbeiter", LetzterMitarbeiter))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LetzterMitarbeiterId", LetzterMitarbeiterId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_VG_MA", tblSnd_VG_MA))
 
 
         Return list
@@ -537,6 +568,8 @@ Public Class cSendHandling
     Property sndhdg_sendId As Integer = Nothing
     Property sndhdg_abrArt As String = Nothing
     Property sndhdg_nr As String = Nothing
+    Property sndhdg_colli As Double = 0
+    Property sndhdg_gewicht As Double = 0
 
 
     Dim SQL As New SQL
@@ -545,16 +578,20 @@ Public Class cSendHandling
         Me.sndhdg_sendId = sndhdg_sendId
     End Sub
 
-    Sub New(sndhdg_sendId, sndabr_beteiligter, sndabr_abrArt, sndabr_wert)
+    Sub New(sndhdg_sendId, sndabr_beteiligter, sndabr_abrArt, sndabr_wert, sndhdg_colli, sndhdg_gewicht)
         Me.sndhdg_sendId = sndhdg_sendId
         Me.sndhdg_abrArt = sndhdg_abrArt
         Me.sndhdg_nr = sndhdg_nr
+        Me.sndhdg_colli = sndhdg_colli
+        Me.sndhdg_gewicht = sndhdg_gewicht
     End Sub
 
-    Sub New(sndhdg_sendId, sndhdg_abrArt, sndhdg_nr)
+    Sub New(sndhdg_sendId, sndhdg_abrArt, sndhdg_nr, sndhdg_colli, sndhdg_gewicht)
         Me.sndhdg_sendId = sndhdg_sendId
         Me.sndhdg_abrArt = sndhdg_abrArt
         Me.sndhdg_nr = sndhdg_nr
+        Me.sndhdg_colli = sndhdg_colli
+        Me.sndhdg_gewicht = sndhdg_gewicht
     End Sub
     Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
@@ -562,6 +599,8 @@ Public Class cSendHandling
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_sendId", sndhdg_sendId))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_abrArt", sndhdg_abrArt))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_nr", sndhdg_nr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_colli", sndhdg_colli))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_gewicht", sndhdg_gewicht))
         Return list
     End Function
 

VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb

@@ -448,7 +448,7 @@ Public Class cDATENSERVER
 
     '    Return True
     ' Catch ex As Exception
-    '       MsgBox(ex.Message)
+    '       MsgBox(ex.Message  & ex.StackTrace) 
     '       Return False
     '   End Try
     'End Function
@@ -897,7 +897,7 @@ Public Class cFormularManager
             pdf.Close()
             Return destPath
         Catch ex As Exception
-            MsgBox(ex.Message)
+            MsgBox(ex.Message & ex.StackTrace)
             Return ""
         End Try
 
@@ -1110,6 +1110,51 @@ Public Class cFormularManager
         End Try
     End Sub
 
+    Shared Function getTMPPath_PDF() As String
+        Return System.IO.Path.GetTempPath() & Guid.NewGuid().ToString() & ".pdf"
+    End Function
+
+    Public Shared Function getPDFViaSpirePDF_FromURL(URL As String, Optional targetPath As String = "") As String
+        Try
+            If targetPath = "" Then targetPath = getTMPPath_PDF()
+            Dim doc As New Spire.Pdf.PdfDocument '= New Spire.Pdf.PdfDocument(URL)
+            doc.LoadFromHTML(URL, True, True, True)
+            If doc IsNot Nothing Then
+                doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4
+                doc.PrintDocument.DefaultPageSettings.Landscape = True
+                doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize
+                ' doc.PrinterName = printerName
+                ' doc.PrintDocument.Print()
+                doc.SaveToFile(targetPath)
+            End If
+
+            'For Each doc As Spire.Pdf.PdfDocument In docs
+            'Dim doc As New Spire.Pdf.PdfDocument()
+
+            'Using webClient As New Net.WebClient()
+            '    Dim data() As Byte = webClient.DownloadData(URL)
+            '    Using stream As New MemoryStream(data)
+            '        Dim doc As Spire.Pdf.PdfDocument = New Spire.Pdf.PdfDocument(stream)
+            '        If doc IsNot Nothing Then
+            '            doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4
+            '            doc.PrintDocument.DefaultPageSettings.Landscape = True
+            '            doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize
+            '            ' doc.PrinterName = printerName
+            '            ' doc.PrintDocument.Print()
+            '            doc.SaveToFile(targetPath)
+            '        End If
+            '    End Using
+            'End Using
+
+            '  doc.LoadFromHTML(pdfPath, True, True, True)
+
+
+            Return targetPath
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return ""
+    End Function
 
 
 
@@ -1550,7 +1595,7 @@ Public Class DATENVERVER_OPTIONS
             IO.File.Copy(pfad, tmpPath)
             Return tmpPath
         Catch ex As Exception
-            MsgBox(ex.Message)
+            MsgBox(ex.Message & ex.StackTrace)
         End Try
         Return pfad
     End Function
@@ -1562,7 +1607,7 @@ Public Class DATENVERVER_OPTIONS
             IO.File.Copy(pfad, tmpPath)
             Return tmpPath
         Catch ex As Exception
-            MsgBox(ex.Message)
+            MsgBox(ex.Message & ex.StackTrace)
         End Try
         Return pfad
     End Function
@@ -1703,7 +1748,7 @@ Public Class DATENVERVER_OPTIONS
             Return True
 
         Catch ex As Exception
-            MsgBox(ex.Message)
+            MsgBox(ex.Message & ex.StackTrace)
             Return False
         End Try
     End Function

VERAG_PROG_ALLGEMEIN/Schnittstellen/cTherefore.vb

@@ -1,9 +1,20 @@
 Imports Therefore.API
 Public Class cTherefore
 
+    Shared Function saveFileTo_ImportFolder(Path As String, FilialeAbfertigungsNr As String, AvisoId As String, FirmaId As String, Optional deleteFileAfterImport As Boolean = False)
+        Select Case FirmaId
+            Case 7
+                Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Atilla ab Juni 2011",, deleteFileAfterImport)
+            Case 1, 11 ', 15,20
+                Return saveFileTo_ImportFolderCat(Path, FilialeAbfertigungsNr, AvisoId, "Import an Jänner 2019", "Import ab Jänner 2019", deleteFileAfterImport)
+            Case Else
+                Return False
+        End Select
+    End Function
 
-    Shared Function saveFileTo_ImportFolder(Path As String, FilialeAbfertigungsNr As String, AvisoId As String)
+    Shared Function saveFileTo_ImportFolderCat(Path As String, FilialeAbfertigungsNr As String, AvisoId As String, Category As String, Optional Category2 As String = "", Optional deleteFileAfterImport As Boolean = False)
         Try
+            If Category2 = "" Then Category2 = Category
             Dim SQL As New SQL
 
             ' 1. Connect to the Therefore™ Server
@@ -20,7 +31,7 @@ Public Class cTherefore
             ' 4A. Set Therefore™ Category by Number
             '  doc.IndexData.SetCategory(5, server) 
             ' or 4B. Set Therefore™ Category by Name
-            doc.IndexData.SetCategory("Import ab Jänner 2019", server)
+            doc.IndexData.SetCategory(Category2, server)
 
             ' 5. Add streams
             'doc.AddStream("D:\\TestAll\\TestDocs\\Scsi.doc", "", 0)
@@ -36,8 +47,8 @@ Public Class cTherefore
             'Dim docNo As Integer = doc.Archive(server, 0)
             'Dim docNo As Integer = 0
             'Dim filenameNEW As String = doc.Retrieve(docNo, "", server)
-
-            Dim docNo As Integer = SQL.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM [Therefore].[dbo].[TheCat119] WHERE [String] LIKE '" & FilialeAbfertigungsNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON",,, -1)
+            Dim TableName = SQL.getValueTxtBySql("SELECT TOP 1 [TableName]   FROM [TheCategory] WHERE Title='" & Category & "'", "SCANCANON",,, "")
+            Dim docNo As Integer = SQL.getValueTxtBySql("SELECT TOP 1 isnull([DocNo],-1)  FROM  " & TableName & " WHERE [String] LIKE '" & FilialeAbfertigungsNr & "' ORDER BY [Eingabedatum] DESC", "SCANCANON",,, -1)
             Dim filename As String = ""
             If docNo <= 0 Then
                 doc.Create(filename)
@@ -67,7 +78,7 @@ Public Class cTherefore
             doc.Close()
 
             ' 9. Delete the temporary file
-            System.IO.File.Delete(filename)
+            If deleteFileAfterImport Then      System.IO.File.Delete(filename)
 
             ' 10. Optional: Print a success message on the console
             '   Console.WriteLine("Document successfully archived as " + docNo.ToString() + ".")