Index: OBJTimpl/WMSOrder/GepicktePallet/Docs.cls.xml
===================================================================
diff -u -r67876 -r70198
--- OBJTimpl/WMSOrder/GepicktePallet/Docs.cls.xml	(.../Docs.cls.xml)	(revision 67876)
+++ OBJTimpl/WMSOrder/GepicktePallet/Docs.cls.xml	(.../Docs.cls.xml)	(revision 70198)
@@ -48,14 +48,59 @@
 			while PalletIterator.HasNext() {
 				set rsPallet = PalletIterator.Next()
 				#dim TempDoc as APPS.common.Print.Kolommen.Document = Builder.GeefDocument(ConsolidatieNr,rsPallet.GetDataByName("DOELPALLET"))
+				Do ##class(vhLib.Logger).%New().Info("Afdrukken alle gepickte pallet inhoud ","Cons : "_ConsolidatieNr _ " Pallet " _ rsPallet.GetDataByName("DOELPALLET")_ " palet klaar")
 				Do Document.Append(TempDoc)
+				Do ##class(vhLib.Logger).%New().Info("Afdrukken alle gepickte pallet inhoud ","Cons : "_ConsolidatieNr _ " Pallet " _ rsPallet.GetDataByName("DOELPALLET") _ "toegevoegd aan document" )
 			}
 			Do Document.Print("Magazijn",$Select(Printer="": ..BepaalPrinter(ConsolidatieNr),1:Printer))
+			Do ##class(vhLib.Logger).%New().Info("Inhoud alle gepickte palet inhoud ","Cons : "_ConsolidatieNr _ " Afgedrukt")
 		}
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="GepicktePallettenInhoudViaCons">
+<FormalSpec>ConsolidatieNummer:%String,Printer:%String=""</FormalSpec>
+<Implementation><![CDATA[
+	#dim TempDoc as APPS.common.Print.Kolommen.Document
+	#dim PrevIdentNr as %String = ""
+	#dim PalletIterator as TECH.ResultSetIterator = ..InhoudOphaler.GeefIteratorVoorConsolidatie(ConsolidatieNummer)
+	#dim LastPalet as %String = ""
+	if PalletIterator.HasNext() {
+		If ..MoetDocumentAfgedruktworden(ConsolidatieNummer) {
+			Set Builder = ##class(OBJTimpl.WMSOrder.GepicktePallet.DocumentBuilder).%New()
+			
+			#dim Document As APPS.common.Print.Kolommen.Document = Builder.GeefLeegDocument(ConsolidatieNummer)			
+			Do ##class(vhLib.Logger).%New().Info("Afdrukken alle gepickte pallet inhoud","Cons : "_ConsolidatieNummer)
+
+			do {	
+				#dim rsPallet as %ResultSet = PalletIterator.Next()
+				if $$$Not(LastPalet = rsPallet.GetDataByName("DOELPALLET") ) {
+					if $$$Not(LastPalet=""){
+						Do Builder.SortDocument(TempDoc)
+						Do Document.Append(TempDoc)
+						Set TempDoc = Builder.GeefLeegDocument(ConsolidatieNummer)
+					} else {
+						Set TempDoc = Builder.GeefLeegDocument(ConsolidatieNummer)
+					}
+					Set LastPalet = rsPallet.GetDataByName("DOELPALLET")
+					Do Builder.VoegToePaletLijn(TempDoc,rsPallet.GetDataByName("DOELPALLET"))
+				}
+				Do Builder.VoegToeProductLijn(TempDoc,rsPallet,PrevIdentNr)
+				Set PrevIdentNr = rsPallet.GetDataByName("IDENTNR")
+			} while PalletIterator.HasNext()
+			if $$$HasLength(LastPalet) {
+				Do Builder.SortDocument(TempDoc)
+				Do Document.Append(TempDoc)
+			}			
+			Do Document.VerwijderKolom(5)
+			Do Document.Print("Magazijn",$Select(Printer="": ..BepaalPrinter(ConsolidatieNummer),1:Printer))
+			Do ##class(vhLib.Logger).%New().Info("Inhoud alle gepickte palet inhoud ","Cons : "_ConsolidatieNummer _ " Afgedrukt")
+		} 
+	}
+]]></Implementation>
+</Method>
+
 <Method name="BepaalPrinter">
 <FormalSpec>ConsolidatieNr:%String</FormalSpec>
 <Private>1</Private>
Index: OBJTimpl/WMSOrder/GepicktePallet/DocumentBuilder.cls.xml
===================================================================
diff -u -r67876 -r70198
--- OBJTimpl/WMSOrder/GepicktePallet/DocumentBuilder.cls.xml	(.../DocumentBuilder.cls.xml)	(revision 67876)
+++ OBJTimpl/WMSOrder/GepicktePallet/DocumentBuilder.cls.xml	(.../DocumentBuilder.cls.xml)	(revision 70198)
@@ -33,6 +33,74 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLeegDocument">
+<FormalSpec>ConsolidatieNummer:%String</FormalSpec>
+<ReturnType>APPS.common.Print.Kolommen.Document</ReturnType>
+<Implementation><![CDATA[
+	#dim BONNr as %String = $Extract(ConsolidatieNummer,5,10)
+	;#dim Bon as DOM.VKP.Bon = ..OrderAPI.GeefBon(BONNr)
+	#dim Titel as %String = ..GeefVerzendwijze(BONNr)_" : "_ ..GeefKlantNaam(BONNr)
+	Set Document = ##class(APPS.common.Print.Kolommen.Document).%New("GepicktePalletInhoud",Titel,"Consolidatie:"_ConsolidatieNummer)
+	Do Document.VoegKolomToe() ; sorteerkolom, na sorteren terug verwijderen
+	Quit Document
+]]></Implementation>
+</Method>
+
+<Method name="SortDocument">
+<FormalSpec>Document:APPS.common.Print.Kolommen.Document</FormalSpec>
+<ReturnType>APPS.common.Print.Kolommen.Document</ReturnType>
+<Implementation><![CDATA[
+	Do Document.Sorteer(##class(TECH.Comparator.StringComparator).%New(),5)
+	Quit Document
+]]></Implementation>
+</Method>
+
+<Method name="VoegToePaletLijn">
+<FormalSpec>Document:APPS.common.Print.Kolommen.Document,LPN:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do Document.GeefKolom(1).Insert("========")
+	Do Document.GeefKolom(2).Insert("========")
+	Do Document.GeefKolom(3).Insert("============")
+	Do Document.GeefKolom(4).Insert("=>"_ LPN _ "<==============================")
+	Do Document.GeefKolom(5).Insert(" 1")
+	
+	Do Document.VoegLijnToe("\\\\ 2","\")
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeProductLijn">
+<FormalSpec>Document:APPS.common.Print.Kolommen.Document,rs:%ResultSet,PrevPRNR:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do Document.GeefKolom(1).Insert(+rs.GetDataByName("QTYTARGET"))
+	Do Document.GeefKolom(2).Insert(+rs.GetDataByName("AANTAL"))
+	
+	#dim identrs as %ResultSet = ..IdentLookupService.GeefAdminIdentNrs(rs.GetDataByName("IDENTNR"))
+	if identrs.HasNext() {
+		#dim rsi = identrs.Next()
+		#dim PRNr as %String = rsi.GetDataByName("Product")
+		Do Document.GeefKolom(3).Insert(rsi.GetDataByName("ItemID"))
+		Do Document.GeefKolom(4).Insert(rsi.GetDataByName("KortTekst"))
+		do Document.GeefKolom(5).Insert($$SORTKEY^PRODUKT(PRNr))
+		If $$$Not(PrevPRNR = PRNr) {
+			Do Document.GeefKolom(5).Insert($$SORTKEY^PRODUKT(PRNr) _ "1")
+		}
+	} else {
+		Do Document.GeefKolom(3).Insert(rs.GetDataByName("IDENTNR"))
+		Do Document.GeefKolom(4).Insert("gn korttekst")
+		Do Document.GeefKolom(5).Insert(rs.GetDataByName("IDENTNR"))
+		If $$$Not(PrevPRNR = PRNr) {
+			Do Document.GeefKolom(5).Insert(rs.GetDataByName("IDENTNR" _ "1"))
+		}
+	}
+	if $$$Not(PrevPRNR = PRNr) {
+		Do Document.GeefKolom(1).Insert("")
+		Do Document.GeefKolom(2).Insert("")
+		Do Document.GeefKolom(3).Insert("")
+		Do Document.GeefKolom(4).Insert("")
+	}
+]]></Implementation>
+</Method>
+
 <Method name="GeefDocument">
 <FormalSpec>ConsolidatieNummer:%String,LPN:%String</FormalSpec>
 <ReturnType>APPS.common.Print.Kolommen.Document</ReturnType>
Index: OBJTimpl/WMSOrder/OphalenGepicktePalletInhoud.cls.xml
===================================================================
diff -u -r68860 -r70198
--- OBJTimpl/WMSOrder/OphalenGepicktePalletInhoud.cls.xml	(.../OphalenGepicktePalletInhoud.cls.xml)	(revision 68860)
+++ OBJTimpl/WMSOrder/OphalenGepicktePalletInhoud.cls.xml	(.../OphalenGepicktePalletInhoud.cls.xml)	(revision 70198)
@@ -49,6 +49,80 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefIteratorVoorConsolidatie">
+<FormalSpec>ConsolidatieNr:%String</FormalSpec>
+<ReturnType>TECH.ResultSetIterator</ReturnType>
+<Implementation><![CDATA[
+	#dim ResultSet as %ResultSet
+	Set ResultSet  = ..GeefResultSetVoorConsolidatie(ConsolidatieNr)
+	Set Iterator=##class(TECH.ResultSetIterator).%New(ResultSet)
+	Quit Iterator
+]]></Implementation>
+</Method>
+
+<Method name="GeefResultSetVoorConsolidatie">
+<FormalSpec>ConsolidatieNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ResultSet</ReturnType>
+<Implementation><![CDATA[
+    Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
+	#dim Status as %String = ""
+	#Dim SqlStatement as %String = ""
+	Set SqlStatement = "select orders.ID CONSNR,olines.name LIJNNR,olines.QTYTARGET,pa.QTY AANTAL,item.NAME IDENTNR,tocont.LPN DOELPALLET "
+	_ " from DCEREPORT_OUTBOUNDORDERS orders "
+	_ " inner join DCEREPORT_OUTBOUNDLINES    olines on olines.OUTBOUNDORDER_OID = orders.oid "
+	_ " inner join DCEREPORT_PICKORDERS       po on po.ORDER_OID = orders.OID "
+	_ " inner join DCEREPORT_PICKLINES        pl on pl.ORDER_OID = olines.OUTBOUNDORDER_OID and pl.ORDERLINE_OID = olines.oid and pl.PICKORDER_OID = po.oid "
+	_ " inner join DCEREPORT_PICK_ACTUALS     pa on pa.OID IN ( "
+	_ " 	(select paoid from "    ; deze om actuals van een pallet over de rugzakken goed te krijgen, per tussenstap is er pickactual record, we willen het laatste
+	_ " 		(select ROW_NUMBER() over (order by pa1.dtsstart desc) as rownum, pa1.oid paoid "
+	_ " 		from DCEREPORT_PICK_ACTUALS pa1 "
+	_ " 		where pa.PICKORDER_OID = pl.PICKORDER_OID "
+	_ " 		and pa1.PICKLINE_OID = pl.OID "
+	_ " 		and pa1.TO_CONTAINER_OID = pa.TO_CONTAINER_OID "
+	_ " 		and pa1.FROM_CONTAINER_OID = pa1.TO_CONTAINER_OID "
+	_ " 		) as paLast "
+	_ " 	where rownum=1) "
+	_ "		union "
+	_ "		(select pa1.oid paoid "    ; deze voor de andere , daar kan bvb van 2 paletten voor één lijn gepicked worden (de from container is dan verschillend van de to container
+	_ "		from DCEREPORT_PICK_ACTUALS pa1 "
+	_ "		where pa.PICKORDER_OID = pl.PICKORDER_OID "
+	_ "		and pa1.PICKLINE_OID = pl.OID "
+	_ "		and isnull(pa1.FROM_CONTAINER_OID,0) != pa1.TO_CONTAINER_OID " ; indien kardex, geen geen from container opvangen.
+	_ "		and pa1.TO_CONTAINER_OID = pa.TO_CONTAINER_OID "
+	_ "		) "
+	_ " ) "
+	_ " inner join DCEREPORT_CONTAINERS tocont on tocont.OID = pa.TO_CONTAINER_OID "	
+	_ " left join DCEREPORT_ITEMS item on item.OID = pa.ITEM_OID "
+	_ " where "
+	_ "  orders.id= '"_ ConsolidatieNr _"' "
+	_ " and tocont.LPN in ( "
+	_ " select distinct cont.lpn DOELPALLET "
+ 	_ " from DCEREPORT_OUTBOUNDLINES ol "
+ 	_ " inner join DCEREPORT_OUTBOUND_ACTUALS oa on oa.OUTBOUNDLINE_OID = ol.OID and oa.OUTBOUNDORDER_OID = ol.OUTBOUNDORDER_OID "
+	_ " inner join DCEREPORT_LOCATIONS loc on loc.OID = oa.TO_LOCATION_OID "
+	_ " inner join DCEREPORT_ITEMS item on item.oid = oa.ITEM_OID "
+	_ " inner join DCEREPORT_OUTBOUNDORDERS oo on oo.OID = ol.OUTBOUNDORDER_OID "
+	_ " inner join DCEREPORT_CONTAINERS cont on cont.OID = oa.CONTAINER_OID "
+	_ " where oo.ID = '"_ ConsolidatieNr _"' "
+	_ " ) "
+	_ " order by DOELPALLET,IDENTNR "		
+    try
+    {
+    	Set Status = rs.Prepare(SqlStatement,,..SqlConnection)
+    	if ($$$ISERR(Status)){
+			w $$ParseStatus^vhLib(Status)
+    	}
+    	
+	    w !, rs.Execute()    
+    } catch {
+	    do ..SqlConnection.Disconnect()
+	    do ##class(TECH.ExceptionHandler).Rethrow()
+    }
+    Quit rs
+]]></Implementation>
+</Method>
+
 <Method name="GeefIterator">
 <FormalSpec>ConsolidatieNr:%String,LPN:%String</FormalSpec>
 <ReturnType>TECH.ResultSetIterator</ReturnType>
@@ -84,15 +158,16 @@
 	_ " 		) as paLast "
 	_ " 	where rownum=1) "
 	_ "		union "
-	_ "		(select pa1.oid paoid "    ; deze voor de andere , daar kan bvb van 2 palleten voor één lijn gepickted worden (de from container is dan verschillend van de to container
+	_ "		(select pa1.oid paoid "    ; deze voor de andere , daar kan bvb van 2 paletten voor één lijn gepicked worden (de from container is dan verschillend van de to container
 	_ "		from DCEREPORT_PICK_ACTUALS pa1 "
 	_ "		where pa.PICKORDER_OID = pl.PICKORDER_OID "
 	_ "		and pa1.PICKLINE_OID = pl.OID "
 	_ "		and isnull(pa1.FROM_CONTAINER_OID,0) != pa1.TO_CONTAINER_OID " ; indien kardex, geen geen from container opvangen.
 	_ "		and pa1.TO_CONTAINER_OID = pa.TO_CONTAINER_OID "
 	_ "		) "
 	_ " ) "
-	_ " inner join DCEREPORT_CONTAINERS        tocont on tocont.OID = pa.TO_CONTAINER_OID "	_ " left join DCEREPORT_ITEMS             item on item.OID = pa.ITEM_OID "
+	_ " inner join DCEREPORT_CONTAINERS tocont on tocont.OID = pa.TO_CONTAINER_OID "	
+	_ " left join DCEREPORT_ITEMS item on item.OID = pa.ITEM_OID "
 	_ " where "
 	_ "  orders.id= ? "
 	_ " and tocont.LPN = ? "