Index: OBJTimpl/WMSOrder/OphalenGepicktePalletInhoud.cls.xml
===================================================================
diff -u -r67785 -r67852
--- OBJTimpl/WMSOrder/OphalenGepicktePalletInhoud.cls.xml	(.../OphalenGepicktePalletInhoud.cls.xml)	(revision 67785)
+++ OBJTimpl/WMSOrder/OphalenGepicktePalletInhoud.cls.xml	(.../OphalenGepicktePalletInhoud.cls.xml)	(revision 67852)
@@ -60,17 +60,25 @@
 	_ " 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 "
+	_ " 	(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 "
-	_ " 	) "
-	_ " inner join DCEREPORT_CONTAINERS        tocont on tocont.OID = pa.TO_CONTAINER_OID "
-	_ " left join DCEREPORT_ITEMS             item on item.OID = pa.ITEM_OID "
+	_ " 	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
+	_ "		from DCEREPORT_PICK_ACTUALS pa1 "
+	_ "		where pa.PICKORDER_OID = pl.PICKORDER_OID "
+	_ "		and pa1.PICKLINE_OID = pl.OID "
+	_ "		and pa1.FROM_CONTAINER_OID != pa1.TO_CONTAINER_OID "
+	_ "		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= ? "
 	_ " and tocont.LPN = ? "
@@ -96,7 +104,7 @@
 	#dim Status as %String = ""
 	#Dim SqlStatement as %String = ""
 	
-	Set SqlStatement = "select distinct cont.lpn DOELPALLET, loc.FULLNAME TOLOC "
+	Set SqlStatement = "select distinct cont.lpn DOELPALLET, loc.FULLNAME TOLOC, oo.id CONSNR "
 	_ " 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 "