jj: fix calc of anzahl sendungen, gewicht

SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb

@@ -94,15 +94,15 @@ Partial Public Class reportUebergabe
         Me.XrLabel46 = New DevExpress.XtraReports.UI.XRLabel()
         Me.XrLabel58 = New DevExpress.XtraReports.UI.XRLabel()
         Me.GroupHeader3 = New DevExpress.XtraReports.UI.GroupHeaderBand()
-        Me.XrLabel44 = New DevExpress.XtraReports.UI.XRLabel()
-        Me.XrLabel45 = New DevExpress.XtraReports.UI.XRLabel()
-        Me.XrLabel54 = New DevExpress.XtraReports.UI.XRLabel()
         Me.labelSendungNr = New DevExpress.XtraReports.UI.XRLabel()
         Me.labelPalettenanzahl = New DevExpress.XtraReports.UI.XRLabel()
         Me.XrLabel42 = 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.XrLabel54 = New DevExpress.XtraReports.UI.XRLabel()
+        Me.XrLabel45 = New DevExpress.XtraReports.UI.XRLabel()
         Me.XrLabel55 = New DevExpress.XtraReports.UI.XRLabel()
         Me.GroupHeader1 = New DevExpress.XtraReports.UI.GroupHeaderBand()
         Me.GroupHeader2 = New DevExpress.XtraReports.UI.GroupHeaderBand()
@@ -873,54 +873,14 @@ Partial Public Class reportUebergabe
         '
         'GroupHeader3
         '
-        Me.GroupHeader3.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.labelSendungNr, Me.labelPalettenanzahl, Me.XrLabel42, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.XrLabel44, Me.XrLabel54, Me.XrLabel45, Me.XrLabel55})
         Me.GroupHeader3.Dpi = 100.0!
         Me.GroupHeader3.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("CODE", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)})
         Me.GroupHeader3.GroupUnion = DevExpress.XtraReports.UI.GroupUnion.WholePage
-        Me.GroupHeader3.HeightF = 45.12499!
+        Me.GroupHeader3.HeightF = 0!
         Me.GroupHeader3.KeepTogether = True
         Me.GroupHeader3.Level = 1
         Me.GroupHeader3.Name = "GroupHeader3"
         '
-        'XrLabel44
-        '
-        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"
-        '
-        'XrLabel45
-        '
-        Me.XrLabel45.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_PLZ_STR")})
-        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.SizeF = New System.Drawing.SizeF(156.9534!, 11.54167!)
-        Me.XrLabel45.StylePriority.UseFont = False
-        Me.XrLabel45.Text = "XrLabel33"
-        '
-        'XrLabel54
-        '
-        Me.XrLabel54.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_STRASSE")})
-        Me.XrLabel54.Dpi = 100.0!
-        Me.XrLabel54.Font = New System.Drawing.Font("Arial", 8.25!)
-        Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0!, 22.99995!)
-        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.SizeF = New System.Drawing.SizeF(156.9534!, 10.58332!)
-        Me.XrLabel54.StylePriority.UseFont = False
-        Me.XrLabel54.Text = "XrLabel34"
-        '
         'labelSendungNr
         '
         Me.labelSendungNr.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.SENDUNGNR")})
@@ -1002,12 +962,51 @@ Partial Public Class reportUebergabe
         Me.labelGewicht.SizeF = New System.Drawing.SizeF(58.89133!, 14.66667!)
         Me.labelGewicht.StylePriority.UseFont = False
         '
+        'XrLabel44
+        '
+        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"
+        '
+        'XrLabel54
+        '
+        Me.XrLabel54.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_STRASSE")})
+        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.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.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.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.Dpi = 100.0!
         Me.XrLabel55.Font = New System.Drawing.Font("Arial", 8.25!)
-        Me.XrLabel55.LocationFloat = New DevExpress.Utils.PointFloat(0!, 12.5!)
+        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
@@ -1027,15 +1026,16 @@ Partial Public Class reportUebergabe
         '
         Me.GroupHeader2.Dpi = 100.0!
         Me.GroupHeader2.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("EMP", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)})
-        Me.GroupHeader2.HeightF = 45.12499!
+        Me.GroupHeader2.HeightF = 0!
         Me.GroupHeader2.Level = 3
         Me.GroupHeader2.Name = "GroupHeader2"
         '
         '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.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 = 0!
+        Me.GroupHeader4.HeightF = 45.12499!
         Me.GroupHeader4.Name = "GroupHeader4"
         '
         'XrSubreport1

SchaumKommiCollo/KommiCollo/reportUebergabe.vb

@@ -13,16 +13,22 @@ 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 Sub labelAnzahlSendungen_SummaryReset(sender As Object, e As EventArgs) Handles labelAnzahlSendungen.SummaryReset
         sendungen = 0
         kolli = 0
         gewicht = 0.00
+
+        letzteSendung = 0
     End Sub
 
     Private Sub labelSendungNr_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelSendungNr.BeforePrint
+        Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR")
+
+        If sendungsNr <> letzteSendung Then
             sendungen = sendungen + 1
+        End If
     End Sub
 
     Private Sub labelPalettenanzahl_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelPalettenanzahl.BeforePrint
@@ -30,7 +36,12 @@ Public Class reportUebergabe
     End Sub
 
     Private Sub labelGewicht_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelGewicht.BeforePrint
+        Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR")
+
+        If sendungsNr <> letzteSendung Then
             gewicht = gewicht + CDbl(GetCurrentColumnValue("SDG_GEWICHT"))
+            letzteSendung = sendungsNr
+        End If
     End Sub
 
     Private Sub labelSummeKolli_SummaryGetResult(sender As Object, e As DevExpress.XtraReports.UI.SummaryGetResultEventArgs) Handles labelSummeKolli.SummaryGetResult