From 5de68174225540a196af1633a1a15d3c6b706083 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Fri, 22 Jun 2018 11:30:57 +0200
Subject: [PATCH] jj: fix report

---
 .../KommiCollo/reportUebergabe.vb             | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/SchaumKommiCollo/KommiCollo/reportUebergabe.vb b/SchaumKommiCollo/KommiCollo/reportUebergabe.vb
index 3037105..b099c1d 100644
--- a/SchaumKommiCollo/KommiCollo/reportUebergabe.vb
+++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.vb
@@ -14,6 +14,8 @@ Public Class reportUebergabe
     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 Sub labelAnzahlSendungen_SummaryReset(sender As Object, e As EventArgs) Handles labelAnzahlSendungen.SummaryReset
         sendungen = 0
@@ -21,20 +23,19 @@ Public Class reportUebergabe
         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")
+        Dim sdgStellplaetze As Integer = GetCurrentColumnValue("SDG_STELLPLAETZE")
 
         If sendungsNr <> letzteSendung Then
             sendungen = sendungen + 1
+            kolli = kolli + sdgStellplaetze
         End If
     End Sub
 
-    Private Sub labelPalettenanzahl_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelPalettenanzahl.BeforePrint
-        kolli = kolli + GetCurrentColumnValue("PALETTENANZAHL")
-    End Sub
-
     Private Sub labelGewicht_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelGewicht.BeforePrint
         Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR")
 
@@ -58,4 +59,39 @@ Public Class reportUebergabe
         e.Result = sendungen
         e.Handled = True
     End Sub
+
+    Private Sub labelPalettenanzahl_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelPalettenanzahl.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
+                e.Cancel = True
+            End If
+
+            letzteNve = nve
+            letzerCode = code
+
+
+            'gewicht = gewicht + CDbl(GetCurrentColumnValue("SDG_GEWICHT"))
+            'letzteSendung = sendungsNr
+
+        End If
+    End Sub
+
+    Private Sub XrLabel42_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles XrLabel42.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
+                e.Cancel = True
+            End If
+
+        End If
+    End Sub
 End Class
\ No newline at end of file