neu

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