Index: APPS/MAG/UGLYPicking/dto/PalletReservatie.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/dto/PalletReservatie.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/dto/PalletReservatie.cls.xml	(revision 1590)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.dto.PalletReservatie">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="BonNr">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="ProductID">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="PalletID">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="Magazijn">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="Sectie">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+</Class>
+</Export>
Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1578 -r1590
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1578)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1590)
@@ -46,9 +46,12 @@
 </Method>
 
 <Method name="GeefPalletInhoud">
-<FormalSpec>PalletID:%String</FormalSpec>
+<FormalSpec>dtoPalletReservatie:APPS.MAG.UGLYPicking.dto.PalletReservatie</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Pallet</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+	
+	Quit ..Service.GeefPalletInhoud(dtoPalletReservatie)
+]]></Implementation>
 </Method>
 
 <Method name="GeefProductLijnen">
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r1586 -r1590
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1586)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1590)
@@ -44,6 +44,119 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestGeefPalletInhoud">
+<Implementation><![CDATA[
+	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
+	
+	Do ..MaakProducten()
+	Do ..MaakPalletReservatie()
+	
+	set dtoPalletReservatie = ##class(APPS.MAG.UGLYPicking.dto.PalletReservatie).%New()
+	set dtoPalletReservatie.BonNr = 999999
+	set dtoPalletReservatie.Magazijn = "UNITTEST"
+	set dtoPalletReservatie.PalletID = 1234
+	set dtoPalletReservatie.ProductID = 1000
+	set dtoPalletReservatie.Sectie = "UT-SECTIE"
+	
+	set dtoPallet = Service.GeefPalletInhoud(dtoPalletReservatie)
+	
+	do $$$AssertEquals(dtoPallet.Inhouden.Size,2,"Aantal inhouden")
+	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(1).VerpakkingOmschrijving,"Kx2","Controle omschrijving")
+	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(1).AantalTePicken,7,"Controle aantal te picken")
+	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(1).AantalResterend,(1000-15)\2,"Controle aantal resterend")
+	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(2).VerpakkingOmschrijving,"Stuks","Controle omschrijving")
+	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(2).AantalTePicken,1,"Controle aantal te picken")
+	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(2).AantalResterend,1,"Controle aantal resterend")
+	
+	Do ..VerwijderPalletReservatie()
+	
+	Do ..VerwijderProducten()
+	
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="MaakPalletReservatie">
+<Implementation><![CDATA[
+	set PalletReservatie = ##class(Flow.OrderWMS.PalletReservatie).%New()
+	set PalletReservatie.ConsolidatieNr = 999999
+	set PalletReservatie.Magazijn = "UNITTEST"
+	set PalletReservatie.PalletID = 1234
+	do PalletReservatie.ProductSetObjectId(1000)
+	set PalletReservatie.Sectie = "UT-SECTIE"
+	set PalletReservatie.AantalTePicken = 15
+	set PalletReservatie.AantalOpPallet = 1000
+	do PalletReservatie.%Save()
+	
+	set PalletReservatie = ##class(Flow.OrderWMS.PalletReservatie).%New()
+	set PalletReservatie.ConsolidatieNr = 999998
+	set PalletReservatie.Magazijn = "UNITTEST"
+	set PalletReservatie.PalletID = 1235
+	do PalletReservatie.ProductSetObjectId(1001)
+	set PalletReservatie.Sectie = "UT-SECTIE"
+	set PalletReservatie.AantalTePicken = 10
+	set PalletReservatie.AantalOpPallet = 1000
+	do PalletReservatie.%Save()
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderPalletReservatie">
+<Implementation><![CDATA[
+	set ID = 999999 _"||" _"UNITTEST"_ "||" _ 1234 _ "||"_ 1000 _ "||" _ "UT-SECTIE"
+	do ##class(Flow.OrderWMS.PalletReservatie).%DeleteId(ID)
+	set ID = 999998 _"||" _"UNITTEST"_ "||" _ 1235 _ "||"_ 1001 _ "||" _ "UT-SECTIE"
+	do ##class(Flow.OrderWMS.PalletReservatie).%DeleteId(ID)
+]]></Implementation>
+</Method>
+
+<Method name="MaakProducten">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#define PRNrStart 1000
+	#define PRNrStop  1001
+	#define ProductPrijs 10
+	
+	for PRNr = $$$PRNrStart:1:$$$PRNrStop {  
+		Set Nr = $translate($justify(PRNr - $$$PRNrStart,2)," ",0)
+	    for Node=1:1:5 set ^KPR(PRNr,Node)="\"
+
+		set KortTekst = "UT.UTPROD"_Nr_"\TEST PRODUCT "_Nr	
+		set ^KPR(PRNr,"I1")="01CH \01CH04ACC \01CH04ACC01MPL/BL \374"
+		
+		Set ^KPR(PRNr,0) = KortTekst
+	    set $piece(^KPR(PRNr,2),"\",25)="0.123.45"_$extract(Nr,1)_"."_$extract(Nr,2)
+	    set $piece(^KPR(PRNr,0),"\",14)=PRNr	   ; fysische stock
+	    set $piece(^KPR(PRNr,2),"\",14)="BAR"_PRNr ; barcode 
+		set ^KPR(PRNr,"I")=""
+		set ^KPR(PRNr,"J")=""
+		set ^KPR(PRNr,"J5005")="5005\ \"
+		if PRNr=1000 { 
+			set $piece(^KPR(PRNr,"J5005"),"\",15)= 2 			  ; normale verpakking 
+		}
+		if PRNr=1001 {
+			set $piece(^KPR(PRNr,"J5005"),"\",16)= 10 			  ; grootverpakking
+		}
+		set $piece(^KPR(PRNr,"J5005"),"\",17)= "EUR"			  ; muntcode
+		set $piece(^KPR(PRNr,"J5005"),"\",19)= $$$ProductPrijs
+		
+		do BLDIND^PRODUKT2(PRNr) 
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderProducten">
+<Private>1</Private>
+<Implementation><![CDATA[
+	for PRNr = $$$PRNrStart:1:$$$PRNrStop {  
+		do DELIND^PRODUKT2(PRNr)
+		Kill ^KPR(PRNr) 
+		Kill ^PRSTOCK("D",PRNr)
+		Kill ^Prod.Ken.DataDefinitieD(PRNr)
+		For SubID=1:1:5 Kill ^Prod.Ken.DataDefinitieD(PRNr_"."_SubID)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="TestGeefBonnen">
 <Implementation><![CDATA[
 	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
Index: APPS/MAG/UGLYPicking/dto/OrderInfo.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/dto/OrderInfo.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/dto/OrderInfo.cls.xml	(revision 1590)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.dto.OrderInfo">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="OrderID">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="KlantReferentie">
+<Type>%String</Type>
+</Property>
+</Class>
+</Export>
Index: APPS/MAG/UGLYPicking/dto/Pallet.cls.xml
===================================================================
diff -u -r1576 -r1590
--- APPS/MAG/UGLYPicking/dto/Pallet.cls.xml	(.../Pallet.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/Pallet.cls.xml	(.../Pallet.cls.xml)	(revision 1590)
@@ -2,12 +2,18 @@
 <Export generator="Cache" version="9">
 <Class name="APPS.MAG.UGLYPicking.dto.Pallet">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="PalletID">
-<Type>%String</Type>
+<Property name="PalletReservatie">
+<Type>PalletReservatie</Type>
 </Property>
 
+<Property name="Orders">
+<Type>OrderInfo</Type>
+<Collection>list</Collection>
+</Property>
+
 <Property name="Inhouden">
 <Type>APPS.MAG.UGLYPicking.dto.Inhoud</Type>
 <Collection>list</Collection>
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1586 -r1590
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1586)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1590)
@@ -166,51 +166,99 @@
 </Method>
 
 <Method name="GeefPalletInhoud">
-<FormalSpec>PalletID:%String</FormalSpec>
+<FormalSpec>dtoPalletReservatie:APPS.MAG.UGLYPicking.dto.PalletReservatie</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.Pallet</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+	set OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
+	
+	set dtoPallet = ##class(APPS.MAG.UGLYPicking.dto.Pallet).%New()
+	//set dtoPallet.PalletReservatie = dtoPalletReservatie
+	
+	set PalletReservatieID = dtoPalletReservatie.BonNr_"||"_dtoPalletReservatie.Magazijn_"||"_dtoPalletReservatie.PalletID_"||"_dtoPalletReservatie.ProductID_"||"_dtoPalletReservatie.Sectie
+	
+	set PalletReservatie=##class(Flow.OrderWMS.PalletReservatie).%OpenId(PalletReservatieID)
+	set itOrderNrs = ##class(TECH.ListbuildIterator).%New(PalletReservatie.GetOrderNrList())
+	while itOrderNrs.HasNext() {
+		set OrderID = itOrderNrs.Next()
+		set dtoOrderInfo = ##class(APPS.MAG.UGLYPicking.dto.OrderInfo).%New()
+		set dtoOrderInfo.OrderID = OrderID
+		set dtoOrderInfo.KlantReferentie = OrderAPI.GeefOrder(OrderID).GeefKlantReferentie()
+		do dtoPallet.Orders.Insert(dtoOrderInfo)
+	}
+	
+	set AantalTePicken = PalletReservatie.AantalTePicken
+	set AantalResterend = PalletReservatie.AantalOpPallet - PalletReservatie.AantalTePicken
+	
+	set rsVerpakkingen = ##class(%ResultSet).%New("Prod.ProductPrijs:GetVerpakkingen")
+	do rsVerpakkingen.Execute(PalletReservatie.Product.ProductNr)
+	if rsVerpakkingen.Next() {
+		if rsVerpakkingen.Get("GrootVerpakking")>1 {
+			set AantalInVerpakking = rsVerpakkingen.Get("GrootVerpakking")
+			set dtoInhoud = ..BuildInhoud("Gx"_AantalInVerpakking,AantalInVerpakking,.AantalTePicken,.AantalResterend)
+			do dtoPallet.Inhouden.Insert(dtoInhoud)
+		}
+		if rsVerpakkingen.Get("NormaleVerpakking")>1 {
+			set AantalInVerpakking = rsVerpakkingen.Get("NormaleVerpakking")
+			set dtoInhoud = ..BuildInhoud("Kx"_AantalInVerpakking,AantalInVerpakking,.AantalTePicken,.AantalResterend)
+			do dtoPallet.Inhouden.Insert(dtoInhoud)
+		}
+	}
+	if AantalTePicken>0 {
+		set dtoInhoud=..BuildInhoud("Stuks",1,.AantalTePicken,.AantalResterend)
+		do dtoPallet.Inhouden.Insert(dtoInhoud)
+	}
+	quit dtoPallet
+]]></Implementation>
 </Method>
 
+<Method name="BuildInhoud">
+<FormalSpec>Omschrijving,AantalInVerpakking,AantalTePicken,AantalResterend</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.MAG.UGLYPicking.dto.Inhoud</ReturnType>
+<Implementation><![CDATA[
+	set dtoInhoud = ##class(APPS.MAG.UGLYPicking.dto.Inhoud).%New()
+	set dtoInhoud.VerpakkingOmschrijving = Omschrijving
+	set dtoInhoud.AantalTePicken = AantalTePicken\AantalInVerpakking
+	set AantalTePicken = AantalTePicken#AantalInVerpakking
+	set dtoInhoud.AantalResterend = AantalResterend\AantalInVerpakking
+	set AantalResterend = AantalResterend#AantalInVerpakking
+	quit dtoInhoud
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductLijnen">
 <FormalSpec>BonNr:%Integer</FormalSpec>
 <ReturnType>APPS.MAG.UGLYPicking.dto.ProductLijnen</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="NeemSessieOver">
 <FormalSpec>Sessie:APPS.MAG.UGLYPicking.dto.Sessie</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="PalletOpvragenAutoMagazijn">
 <FormalSpec>ProductLijn:APPS.MAG.UGLYPicking.dto.ProductLijn</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="ReservatieProbleemOplossen">
 <FormalSpec>ProductLijn:APPS.MAG.UGLYPicking.dto.ProductLijn,NieuwReservatieAantal:%Integer</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="StelUit">
 <FormalSpec>Bon:APPS.MAG.UGLYPicking.dto.Bon,UitstelOptie:APPS.MAG.UGLYPicking.enu.UitstelOptie</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VoerPickingUit">
 <FormalSpec>Product:APPS.MAG.UGLYPicking.dto.GepickedProduct</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefSessie">
 <Private>1</Private>
 <ReturnType>APPS.MAG.UGLYPicking.impl.Sessie</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 </Export>