Merge branch 'master' of http://172.24.11.74:90/scm/git/SchaumKommi

2018-09-28 14:25:51 +02:00 · 2018-09-28 14:25:51 +02:00 · 2987067529
commit 2987067529
parent 37d946f435 a76f328e3b
3 changed files with 74 additions and 49 deletions
--- a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb
+++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb
@ -96,11 +96,11 @@ Partial Public Class reportUebergabe
        Me.GroupHeader3 = New DevExpress.XtraReports.UI.GroupHeaderBand()
        Me.labelSendungNr = New DevExpress.XtraReports.UI.XRLabel()
        Me.labelPalettenanzahl = New DevExpress.XtraReports.UI.XRLabel()
-        Me.XrLabel42 = New DevExpress.XtraReports.UI.XRLabel()
+        Me.labelColliCode = New DevExpress.XtraReports.UI.XRLabel()
        Me.XrLabel35 = New DevExpress.XtraReports.UI.XRLabel()
        Me.XrLabel34 = New DevExpress.XtraReports.UI.XRLabel()
        Me.labelGewicht = New DevExpress.XtraReports.UI.XRLabel()
-        Me.XrLabel44 = New DevExpress.XtraReports.UI.XRLabel()
+        Me.labelEmpfaenger = New DevExpress.XtraReports.UI.XRLabel()
        Me.XrLabel54 = New DevExpress.XtraReports.UI.XRLabel()
        Me.XrLabel45 = New DevExpress.XtraReports.UI.XRLabel()
        Me.XrLabel55 = New DevExpress.XtraReports.UI.XRLabel()
@ -910,18 +910,18 @@ Partial Public Class reportUebergabe
        Me.labelPalettenanzahl.Summary = XrSummary4
        Me.labelPalettenanzahl.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight
        '
-        'XrLabel42
+        'labelColliCode
        '
-        Me.XrLabel42.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.CODE")})
-        Me.XrLabel42.Dpi = 100.0!
-        Me.XrLabel42.Font = New System.Drawing.Font("Arial", 8.25!)
-        Me.XrLabel42.LocationFloat = New DevExpress.Utils.PointFloat(241.0872!, 0!)
-        Me.XrLabel42.Name = "XrLabel42"
-        Me.XrLabel42.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
-        Me.XrLabel42.SizeF = New System.Drawing.SizeF(37.30055!, 14.66667!)
-        Me.XrLabel42.StylePriority.UseFont = False
-        Me.XrLabel42.StylePriority.UseTextAlignment = False
-        Me.XrLabel42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft
+        Me.labelColliCode.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.CODE")})
+        Me.labelColliCode.Dpi = 100.0!
+        Me.labelColliCode.Font = New System.Drawing.Font("Arial", 8.25!)
+        Me.labelColliCode.LocationFloat = New DevExpress.Utils.PointFloat(241.0872!, 0!)
+        Me.labelColliCode.Name = "labelColliCode"
+        Me.labelColliCode.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+        Me.labelColliCode.SizeF = New System.Drawing.SizeF(37.30055!, 14.66667!)
+        Me.labelColliCode.StylePriority.UseFont = False
+        Me.labelColliCode.StylePriority.UseTextAlignment = False
+        Me.labelColliCode.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft
        '
        'XrLabel35
        '
@ -962,57 +962,57 @@ Partial Public Class reportUebergabe
        Me.labelGewicht.SizeF = New System.Drawing.SizeF(58.89133!, 14.66667!)
        Me.labelGewicht.StylePriority.UseFont = False
        '
-        'XrLabel44
+        'labelEmpfaenger
        '
-        Me.XrLabel44.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP")})
-        Me.XrLabel44.Dpi = 100.0!
-        Me.XrLabel44.Font = New System.Drawing.Font("Arial", 8.25!)
-        Me.XrLabel44.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
-        Me.XrLabel44.Name = "XrLabel44"
-        Me.XrLabel44.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
-        Me.XrLabel44.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink
-        Me.XrLabel44.SizeF = New System.Drawing.SizeF(156.9534!, 12.5!)
-        Me.XrLabel44.StylePriority.UseFont = False
-        Me.XrLabel44.Text = "XrLabel29"
+        Me.labelEmpfaenger.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.KUNDEN_ID")})
+        Me.labelEmpfaenger.Dpi = 100.0!
+        Me.labelEmpfaenger.Font = New System.Drawing.Font("Arial", 8.25!)
+        Me.labelEmpfaenger.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
+        Me.labelEmpfaenger.Name = "labelEmpfaenger"
+        Me.labelEmpfaenger.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+        Me.labelEmpfaenger.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink
+        Me.labelEmpfaenger.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
+        Me.labelEmpfaenger.SizeF = New System.Drawing.SizeF(156.9534!, 12.5!)
+        Me.labelEmpfaenger.StylePriority.UseFont = False
        '
        'XrLabel54
        '
-        Me.XrLabel54.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_STRASSE")})
+        Me.XrLabel54.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_STRASSE"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.KUNDEN_ID")})
        Me.XrLabel54.Dpi = 100.0!
        Me.XrLabel54.Font = New System.Drawing.Font("Arial", 8.25!)
        Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0!, 23.0!)
        Me.XrLabel54.Name = "XrLabel54"
        Me.XrLabel54.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
        Me.XrLabel54.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink
+        Me.XrLabel54.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
        Me.XrLabel54.SizeF = New System.Drawing.SizeF(156.9534!, 10.58332!)
        Me.XrLabel54.StylePriority.UseFont = False
-        Me.XrLabel54.Text = "XrLabel34"
        '
        'XrLabel45
        '
-        Me.XrLabel45.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_PLZ_STR")})
+        Me.XrLabel45.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_PLZ_STR"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.KUNDEN_ID")})
        Me.XrLabel45.Dpi = 100.0!
        Me.XrLabel45.Font = New System.Drawing.Font("Arial", 8.25!)
        Me.XrLabel45.LocationFloat = New DevExpress.Utils.PointFloat(0!, 33.58332!)
        Me.XrLabel45.Name = "XrLabel45"
        Me.XrLabel45.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
        Me.XrLabel45.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink
+        Me.XrLabel45.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
        Me.XrLabel45.SizeF = New System.Drawing.SizeF(156.9534!, 11.54167!)
        Me.XrLabel45.StylePriority.UseFont = False
-        Me.XrLabel45.Text = "XrLabel33"
        '
        'XrLabel55
        '
-        Me.XrLabel55.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_ZUSATZ")})
+        Me.XrLabel55.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_ZUSATZ"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.KUNDEN_ID")})
        Me.XrLabel55.Dpi = 100.0!
        Me.XrLabel55.Font = New System.Drawing.Font("Arial", 8.25!)
        Me.XrLabel55.LocationFloat = New DevExpress.Utils.PointFloat(0!, 12.50001!)
        Me.XrLabel55.Name = "XrLabel55"
        Me.XrLabel55.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
        Me.XrLabel55.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink
+        Me.XrLabel55.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
        Me.XrLabel55.SizeF = New System.Drawing.SizeF(154.9481!, 10.49999!)
        Me.XrLabel55.StylePriority.UseFont = False
-        Me.XrLabel55.Text = "XrLabel35"
        '
        'GroupHeader1
        '
@ -1032,7 +1032,7 @@ Partial Public Class reportUebergabe
        '
        'GroupHeader4
        '
-        Me.GroupHeader4.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel55, Me.labelPalettenanzahl, Me.XrLabel42, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.XrLabel44, Me.XrLabel54, Me.XrLabel45, Me.labelSendungNr})
+        Me.GroupHeader4.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel55, Me.labelPalettenanzahl, Me.labelColliCode, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.labelEmpfaenger, Me.XrLabel54, Me.XrLabel45, Me.labelSendungNr})
        Me.GroupHeader4.Dpi = 100.0!
        Me.GroupHeader4.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("NVE", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)})
        Me.GroupHeader4.HeightF = 45.12499!
@ -1111,12 +1111,12 @@ Partial Public Class reportUebergabe
    Friend WithEvents GroupFooter2 As DevExpress.XtraReports.UI.GroupFooterBand
    Friend WithEvents XrLine5 As DevExpress.XtraReports.UI.XRLine
    Friend WithEvents GroupHeader3 As DevExpress.XtraReports.UI.GroupHeaderBand
-    Friend WithEvents XrLabel44 As DevExpress.XtraReports.UI.XRLabel
+    Friend WithEvents labelEmpfaenger As DevExpress.XtraReports.UI.XRLabel
    Friend WithEvents XrLabel45 As DevExpress.XtraReports.UI.XRLabel
    Friend WithEvents XrLabel54 As DevExpress.XtraReports.UI.XRLabel
    Friend WithEvents labelSendungNr As DevExpress.XtraReports.UI.XRLabel
    Friend WithEvents labelPalettenanzahl As DevExpress.XtraReports.UI.XRLabel
-    Friend WithEvents XrLabel42 As DevExpress.XtraReports.UI.XRLabel
+    Friend WithEvents labelColliCode As DevExpress.XtraReports.UI.XRLabel
    Friend WithEvents XrLabel35 As DevExpress.XtraReports.UI.XRLabel
    Friend WithEvents XrLabel34 As DevExpress.XtraReports.UI.XRLabel
    Friend WithEvents labelGewicht As DevExpress.XtraReports.UI.XRLabel
--- a/SchaumKommiCollo/KommiCollo/reportUebergabe.resx
+++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.resx
@ -150,6 +150,7 @@
      ,[HINW_TEXT]
      ,[HINW_TEXT_ERG]
 	,[BORDERONR]
+	,[KUNDEN_ID]
  FROM [SCHAUM_IID].[dbo].[VWHUP_REPORT1]</value>
  </data>
  <data name="CustomSqlQuery2.Sql" xml:space="preserve">
@ -157,6 +158,6 @@
 INNER JOIN VWHUP_REPORT1 T1 ON T.SENDUNGNR = T1.GUID</value>
  </data>
  <data name="SqlDataSource1.ResultSchemaSerializable" xml:space="preserve">
-    <value>PERhdGFTZXQgTmFtZT0iU3FsRGF0YVNvdXJjZTEiPjxWaWV3IE5hbWU9IlF1ZXJ5Ij48RmllbGQgTmFtZT0iR1VJRCIgVHlwZT0iSW50MzIiIC8+PEZpZWxkIE5hbWU9IkxBRDEiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iTEFEX1NUUkFTU0UiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iTEFEX0xLWl9QTFpfT1JUIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkZFUlRJRyIgVHlwZT0iQm9vbGVhbiIgLz48RmllbGQgTmFtZT0iU0VORFVOR05SIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IlNER19SRUZFUkVOWiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVAiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iRU1QX1pVU0FUWiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfU1RSQVNTRSIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfUExaX1NUUiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfTEtaIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkVNUF9PUlQiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iRU1QX09URUlMIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkFCSE9MREFUVU0iIFR5cGU9IkRhdGVUaW1lIiAvPjxGaWVsZCBOYW1lPSJTREdfR0VXSUNIVCIgVHlwZT0iRG91YmxlIiAvPjxGaWVsZCBOYW1lPSJTREdfU1RFTExQTEFFVFpFIiBUeXBlPSJJbnQxNiIgLz48RmllbGQgTmFtZT0iU0RHX0ZSQU5LQVRVUiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJOVkUiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iUE9TSU5IQUxUIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IlBPU19HRVdJQ0hUIiBUeXBlPSJEb3VibGUiIC8+PEZpZWxkIE5hbWU9IlBBQ0tTVFVFQ0tBTlpBSEwiIFR5cGU9IkJ5dGUiIC8+PEZpZWxkIE5hbWU9IlBBTEVUVEVOQU5aQUhMIiBUeXBlPSJJbnQzMiIgLz48RmllbGQgTmFtZT0iQ09ERSIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJCRU1FUktVTkciIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iSElOV19DT0RFIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkhJTldfVEVYVCIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJISU5XX1RFWFRfRVJHIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkJPUkRFUk9OUiIgVHlwZT0iSW50MzIiIC8+PC9WaWV3PjxWaWV3IE5hbWU9IlF1ZXJ5X0hpbndlaXN0ZXh0Ij48RmllbGQgTmFtZT0iVEVYVCIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJDT0RFIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkJFWkVJQ0hOVU5HIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IlNFTkRVTkdOUiIgVHlwZT0iSW50MzIiIC8+PC9WaWV3PjxSZWxhdGlvbiBNYXN0ZXI9IlF1ZXJ5IiBEZXRhaWw9IlF1ZXJ5X0hpbndlaXN0ZXh0Ij48S2V5Q29sdW1uIE1hc3Rlcj0iR1VJRCIgRGV0YWlsPSJTRU5EVU5HTlIiIC8+PC9SZWxhdGlvbj48L0RhdGFTZXQ+</value>
+    <value>PERhdGFTZXQgTmFtZT0iU3FsRGF0YVNvdXJjZTEiPjxWaWV3IE5hbWU9IlF1ZXJ5Ij48RmllbGQgTmFtZT0iR1VJRCIgVHlwZT0iSW50MzIiIC8+PEZpZWxkIE5hbWU9IkxBRDEiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iTEFEX1NUUkFTU0UiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iTEFEX0xLWl9QTFpfT1JUIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkZFUlRJRyIgVHlwZT0iQm9vbGVhbiIgLz48RmllbGQgTmFtZT0iU0VORFVOR05SIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IlNER19SRUZFUkVOWiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVAiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iRU1QX1pVU0FUWiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfU1RSQVNTRSIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfUExaX1NUUiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJFTVBfTEtaIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkVNUF9PUlQiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iRU1QX09URUlMIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkFCSE9MREFUVU0iIFR5cGU9IkRhdGVUaW1lIiAvPjxGaWVsZCBOYW1lPSJTREdfR0VXSUNIVCIgVHlwZT0iRG91YmxlIiAvPjxGaWVsZCBOYW1lPSJTREdfU1RFTExQTEFFVFpFIiBUeXBlPSJJbnQxNiIgLz48RmllbGQgTmFtZT0iU0RHX0ZSQU5LQVRVUiIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJOVkUiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iUE9TSU5IQUxUIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IlBPU19HRVdJQ0hUIiBUeXBlPSJEb3VibGUiIC8+PEZpZWxkIE5hbWU9IlBBQ0tTVFVFQ0tBTlpBSEwiIFR5cGU9IkJ5dGUiIC8+PEZpZWxkIE5hbWU9IlBBTEVUVEVOQU5aQUhMIiBUeXBlPSJJbnQzMiIgLz48RmllbGQgTmFtZT0iQ09ERSIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJCRU1FUktVTkciIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iSElOV19DT0RFIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkhJTldfVEVYVCIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJISU5XX1RFWFRfRVJHIiBUeXBlPSJTdHJpbmciIC8+PEZpZWxkIE5hbWU9IkJPUkRFUk9OUiIgVHlwZT0iSW50MzIiIC8+PEZpZWxkIE5hbWU9IktVTkRFTl9JRCIgVHlwZT0iU3RyaW5nIiAvPjwvVmlldz48VmlldyBOYW1lPSJRdWVyeV9IaW53ZWlzdGV4dCI+PEZpZWxkIE5hbWU9IlRFWFQiIFR5cGU9IlN0cmluZyIgLz48RmllbGQgTmFtZT0iQ09ERSIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJCRVpFSUNITlVORyIgVHlwZT0iU3RyaW5nIiAvPjxGaWVsZCBOYW1lPSJTRU5EVU5HTlIiIFR5cGU9IkludDMyIiAvPjwvVmlldz48UmVsYXRpb24gTWFzdGVyPSJRdWVyeSIgRGV0YWlsPSJRdWVyeV9IaW53ZWlzdGV4dCI+PEtleUNvbHVtbiBNYXN0ZXI9IkdVSUQiIERldGFpbD0iU0VORFVOR05SIiAvPjwvUmVsYXRpb24+PC9EYXRhU2V0Pg==</value>
  </data>
 </root>
--- a/SchaumKommiCollo/KommiCollo/reportUebergabe.vb
+++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.vb
@ -13,9 +13,11 @@ Public Class reportUebergabe
    Private sendungen As Integer = 0
    Private kolli As Integer = 0
    Private gewicht As Double = 0.00
+
    Private letzteSendung As Integer = 0
    Private letzteNve As String = String.Empty
-    Private letzerCode As String = String.Empty
+    Private letzterCode As String = String.Empty
+    Private letzterEmpfänger As String = String.Empty

    Private Sub labelAnzahlSendungen_SummaryReset(sender As Object, e As EventArgs) Handles labelAnzahlSendungen.SummaryReset
        sendungen = 0
@ -23,38 +25,53 @@ Public Class reportUebergabe
        gewicht = 0.00

        letzteSendung = 0
-
    End Sub

+    ''' <summary>
+    ''' Pro Sendungsnummer die Anzahl der Sendungen sowie die Anzahl der Stellplätze hochzählen
+    ''' </summary>
    Private Sub labelSendungNr_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelSendungNr.BeforePrint
        Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR")
        Dim sdgStellplaetze As Integer = GetCurrentColumnValue("SDG_STELLPLAETZE")

+        ' Wenn sich die Sendungsnummer geändert hat
        If sendungsNr <> letzteSendung Then
            sendungen = sendungen + 1
            kolli = kolli + sdgStellplaetze
        End If
    End Sub

+    ''' <summary>
+    ''' Pro Sendungsnummer das Gewicht aufaddieren
+    ''' </summary>
    Private Sub labelGewicht_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelGewicht.BeforePrint
        Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR")

+        ' Wenn sich die Sendungsnummer geändert hat
        If sendungsNr <> letzteSendung Then
            gewicht = gewicht + CDbl(GetCurrentColumnValue("SDG_GEWICHT"))
-            letzteSendung = sendungsNr
        End If
    End Sub

+    ''' <summary>
+    ''' Summe der Colli ausgeben
+    ''' </summary>
    Private Sub labelSummeKolli_SummaryGetResult(sender As Object, e As DevExpress.XtraReports.UI.SummaryGetResultEventArgs) Handles labelSummeKolli.SummaryGetResult
        e.Result = kolli
        e.Handled = True
    End Sub

+    ''' <summary>
+    ''' Gesamtgewicht ausgeben
+    ''' </summary>
    Private Sub labelSummeGewicht_SummaryGetResult(sender As Object, e As DevExpress.XtraReports.UI.SummaryGetResultEventArgs) Handles labelSummeGewicht.SummaryGetResult
        e.Result = gewicht
        e.Handled = True
    End Sub

+    ''' <summary>
+    ''' Gesamtanzahl der Sendungen ausgeben
+    ''' </summary>
    Private Sub labelAnzahlSendungen_SummaryGetResult(sender As Object, e As DevExpress.XtraReports.UI.SummaryGetResultEventArgs) Handles labelAnzahlSendungen.SummaryGetResult
        e.Result = sendungen
        e.Handled = True
@ -64,34 +81,41 @@ Public Class reportUebergabe
        Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR")
        Dim nve As String = GetCurrentColumnValue("NVE")
        Dim code As String = GetCurrentColumnValue("CODE")
+        Dim empfänger As String = GetCurrentColumnValue("EMP")

+        ' Wenn Sich die Sendung nicht geändert hat
        If sendungsNr = letzteSendung Then
-
-            If Not (nve <> letzteNve And code <> letzerCode) Then
+            ' Wenn NVE oder Colli gleich sind
+            If nve = letzteNve Or code = letzterCode Then
+                ' Druck abbrechen
                e.Cancel = True
            End If
-
-            letzteNve = nve
-            letzerCode = code
-
-
-            'gewicht = gewicht + CDbl(GetCurrentColumnValue("SDG_GEWICHT"))
-            'letzteSendung = sendungsNr
-
+        Else
+            ' Aktuelle Sendungsnummer speichern
+            letzteSendung = sendungsNr
        End If
+
+        letzteNve = nve
+        letzterCode = code
    End Sub

-    Private Sub XrLabel42_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles XrLabel42.BeforePrint
+    Private Sub labelColliCode_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelColliCode.BeforePrint
        Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR")
        Dim nve As String = GetCurrentColumnValue("NVE")
        Dim code As String = GetCurrentColumnValue("CODE")

        If sendungsNr = letzteSendung Then

-            If Not (nve <> letzteNve And code <> letzerCode) Then
+            If Not (nve <> letzteNve And code <> letzterCode) Then
                e.Cancel = True
            End If

        End If
    End Sub
+
+    Private Sub labelEmpfaenger_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelEmpfaenger.BeforePrint
+        Dim empfänger As String = GetCurrentColumnValue("EMP")
+
+        letzterEmpfänger = empfänger
+    End Sub
 End Class