Index: APPS/MAG/UglyPickingService.cls.xml
===================================================================
diff -u -r1617 -r1649
--- APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1617)
+++ APPS/MAG/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1649)
@@ -45,10 +45,10 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="GeefPalletInhoud">
+<Method name="GeefPalletPickingOpdracht">
 <FormalSpec>BonNr:%String,ProductID:%String,PalletID:%String</FormalSpec>
-<ReturnType>APPS.MAG.UGLYPicking.dto.Pallet</ReturnType>
-<Implementation><![CDATA[	Quit ..Service.GeefPalletInhoud(BonNr,ProductID,PalletID)
+<ReturnType>APPS.MAG.UGLYPicking.dto.PalletPickingOpdracht</ReturnType>
+<Implementation><![CDATA[	Quit ..Service.GeefPalletPickingOpdracht(BonNr,ProductID,PalletID)
 ]]></Implementation>
 </Method>
 
Index: APPS/MAG/UGLYPicking/dto/Inhoud.cls.xml
===================================================================
diff -u -r1576 -r1649
--- APPS/MAG/UGLYPicking/dto/Inhoud.cls.xml	(.../Inhoud.cls.xml)	(revision 1576)
+++ APPS/MAG/UGLYPicking/dto/Inhoud.cls.xml	(.../Inhoud.cls.xml)	(revision 1649)
@@ -3,17 +3,24 @@
 <Class name="APPS.MAG.UGLYPicking.dto.Inhoud">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="AantalResterend">
 <Type>%Integer</Type>
+<InitialExpression>0</InitialExpression>
+<Required>1</Required>
 </Property>
 
 <Property name="AantalTePicken">
 <Type>%Integer</Type>
+<InitialExpression>0</InitialExpression>
+<Required>1</Required>
 </Property>
 
-<Property name="VerpakkingOmschrijving">
-<Type>%String</Type>
+<Property name="AantalInVerpakking">
+<Type>%Integer</Type>
+<InitialExpression>0</InitialExpression>
+<Required>1</Required>
 </Property>
 </Class>
 </Export>
FishEye: Tag 1649 refers to a dead (removed) revision in file `APPS/MAG/UGLYPicking/dto/Pallet.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r1645 -r1649
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1645)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml	(.../UglyPickingService.cls.xml)	(revision 1649)
@@ -167,14 +167,14 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
-<Method name="GeefPalletInhoud">
+<Method name="GeefPalletPickingOpdracht">
 <FormalSpec>BonNr:%String,ProductID:%String,PalletID:%String</FormalSpec>
-<ReturnType>APPS.MAG.UGLYPicking.dto.Pallet</ReturnType>
+<ReturnType>APPS.MAG.UGLYPicking.dto.PalletPickingOpdracht</ReturnType>
 <Implementation><![CDATA[
-	set OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
 	
-	set dtoPallet = ##class(APPS.MAG.UGLYPicking.dto.Pallet).%New()
-	
+	set dtoPalletPickingOpdracht = ##class(APPS.MAG.UGLYPicking.dto.PalletPickingOpdracht).%New()
+
+	set OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
 	set PalletReservatieID = ..BepaalPalletReservatieID(BonNr,ProductID,PalletID) 
 	
 	set PalletReservatie=##class(Flow.OrderWMS.PalletReservatie).%OpenId(PalletReservatieID)
@@ -184,31 +184,35 @@
 		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)
+		do dtoPalletPickingOpdracht.Orders.Insert(dtoOrderInfo)
 	}
 	
 	set AantalTePicken = PalletReservatie.AantalTePicken
 	set AantalResterend = PalletReservatie.AantalOpPallet - PalletReservatie.AantalTePicken
 	
+	set dtoPalletPickingOpdracht.GrootVerpakking = ##class(APPS.MAG.UGLYPicking.dto.Inhoud).%New()
+	set dtoPalletPickingOpdracht.NormaalVerpakking = ##class(APPS.MAG.UGLYPicking.dto.Inhoud).%New()
+	set dtoPalletPickingOpdracht.StukVerpakking = ##class(APPS.MAG.UGLYPicking.dto.Inhoud).%New()
+	
 	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)
+			set dtoInhoud = ..BuildInhoud(AantalInVerpakking,.AantalTePicken,.AantalResterend)
+			set dtoPalletPickingOpdracht.GrootVerpakking = dtoInhoud
 		}
 		if rsVerpakkingen.Get("NormaleVerpakking")>1 {
 			set AantalInVerpakking = rsVerpakkingen.Get("NormaleVerpakking")
-			set dtoInhoud = ..BuildInhoud("Kx"_AantalInVerpakking,AantalInVerpakking,.AantalTePicken,.AantalResterend)
-			do dtoPallet.Inhouden.Insert(dtoInhoud)
-		}
+			set dtoInhoud = ..BuildInhoud(AantalInVerpakking,.AantalTePicken,.AantalResterend)
+			set dtoPalletPickingOpdracht.NormaalVerpakking = dtoInhoud
+		} 
 	}
 	if AantalTePicken>0 {
-		set dtoInhoud=..BuildInhoud("Stuks",1,.AantalTePicken,.AantalResterend)
-		do dtoPallet.Inhouden.Insert(dtoInhoud)
+		set dtoInhoud=..BuildInhoud(1,.AantalTePicken,.AantalResterend)
+		set dtoPalletPickingOpdracht.StukVerpakking = dtoInhoud
 	}
-	quit dtoPallet
+	quit dtoPalletPickingOpdracht
 ]]></Implementation>
 </Method>
 
@@ -230,12 +234,12 @@
 </Method>
 
 <Method name="BuildInhoud">
-<FormalSpec>Omschrijving:%String,AantalInVerpakking:%Integer,AantalTePicken:%Integer,AantalResterend:%Integer</FormalSpec>
+<FormalSpec>AantalInVerpakking:%Integer,AantalTePicken:%Integer,AantalResterend:%Integer</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.AantalInVerpakking = AantalInVerpakking
 	set dtoInhoud.AantalTePicken = AantalTePicken\AantalInVerpakking
 	set AantalTePicken = AantalTePicken#AantalInVerpakking
 	set dtoInhoud.AantalResterend = AantalResterend\AantalInVerpakking
@@ -419,6 +423,7 @@
 	}
 	
 	if '$IsObject(PalletReservatie.AssociatedZeroPallet) {
+		
 		do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Interne fout: de pallet-reservatie is niet meer gekoppeld aan een geldige zero-pallet'!"))	
 	}
 	
Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml
===================================================================
diff -u -r1645 -r1649
--- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1645)
+++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml	(.../TestUglyPickingService.cls.xml)	(revision 1649)
@@ -52,34 +52,33 @@
 	Do ..MaakPalletReservatie()
 	
 	
-	set dtoPallet = Service.GeefPalletInhoud(999999,1000,1234)
+	set dtoPallet = Service.GeefPalletPickingOpdracht(999999,1000,1234)
 	
-	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 $$$AssertEquals(dtoPallet.GrootVerpakking.AantalInVerpakking,0,"Controle AantalInVerpakking")
+	do $$$AssertEquals(dtoPallet.GrootVerpakking.AantalTePicken,0,"Controle aantal te picken")
+	do $$$AssertEquals(dtoPallet.GrootVerpakking.AantalResterend,0,"Controle aantal resterend")
+	do $$$AssertEquals(dtoPallet.NormaalVerpakking.AantalInVerpakking,2,"Controle AantalInVerpakking")
+	do $$$AssertEquals(dtoPallet.NormaalVerpakking.AantalTePicken,7,"Controle aantal te picken")
+	do $$$AssertEquals(dtoPallet.NormaalVerpakking.AantalResterend,(1000-15)\2,"Controle aantal resterend")
+	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalInVerpakking,1,"Controle AantalInVerpakking")
+	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalTePicken,1,"Controle aantal te picken")
+	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalResterend,1,"Controle aantal resterend")
 	
-	set dtoPallet = Service.GeefPalletInhoud(999998,1001,1235)
+	set dtoPallet = Service.GeefPalletPickingOpdracht(999998,1001,1235)
 	
-	do $$$AssertEquals(dtoPallet.Inhouden.Size,2,"Aantal inhouden")
-	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(1).VerpakkingOmschrijving,"Gx10","Controle omschrijving")
-	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(1).AantalTePicken,4,"Controle aantal te picken")
-	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(1).AantalResterend,(1000-45)\10,"Controle aantal resterend")
-	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(2).VerpakkingOmschrijving,"Stuks","Controle omschrijving")
-	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(2).AantalTePicken,5,"Controle aantal te picken")
-	do $$$AssertEquals(dtoPallet.Inhouden.GetAt(2).AantalResterend,5,"Controle aantal resterend")
+	do $$$AssertEquals(dtoPallet.GrootVerpakking.AantalInVerpakking,10,"Controle AantalInVerpakking")
+	do $$$AssertEquals(dtoPallet.GrootVerpakking.AantalTePicken,4,"Controle aantal te picken")
+	do $$$AssertEquals(dtoPallet.GrootVerpakking.AantalResterend,(1000-45)\10,"Controle aantal resterend")
+	do $$$AssertEquals(dtoPallet.NormaalVerpakking.AantalInVerpakking,0,"Controle AantalInVerpakking")
+	do $$$AssertEquals(dtoPallet.NormaalVerpakking.AantalTePicken,0,"Controle aantal te picken")
+	do $$$AssertEquals(dtoPallet.NormaalVerpakking.AantalResterend,0,"Controle aantal resterend")
+	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalInVerpakking,1,"Controle AantalInVerpakking")
+	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalTePicken,5,"Controle aantal te picken")
+	do $$$AssertEquals(dtoPallet.StukVerpakking.AantalResterend,5,"Controle aantal resterend")
 	
 	Do ..VerwijderPalletReservatie()
 	Do ..VerwijderProducten()
 	
-	Set Service = ##class(APPS.MAG.UGLYPicking.impl.UglyPickingService).%New()
-	Do ..MaakBon(1234)
-	Set Bon = Service.GeefBon(1234)
-	
-	
 	Quit
 ]]></Implementation>
 </Method>
Index: APPS/MAG/UGLYPicking/dto/PalletPickingOpdracht.cls.xml
===================================================================
diff -u
--- APPS/MAG/UGLYPicking/dto/PalletPickingOpdracht.cls.xml	(revision 0)
+++ APPS/MAG/UGLYPicking/dto/PalletPickingOpdracht.cls.xml	(revision 1649)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.MAG.UGLYPicking.dto.PalletPickingOpdracht">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,%XML.Adaptor</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Orders">
+<Type>OrderInfo</Type>
+<Collection>list</Collection>
+</Property>
+
+<Property name="GrootVerpakking">
+<Type>APPS.MAG.UGLYPicking.dto.Inhoud</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="NormaalVerpakking">
+<Type>APPS.MAG.UGLYPicking.dto.Inhoud</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="StukVerpakking">
+<Type>APPS.MAG.UGLYPicking.dto.Inhoud</Type>
+<Required>1</Required>
+</Property>
+</Class>
+</Export>
Index: WS/MAG/UGLYPicking/UGLYPickingService.cls.xml
===================================================================
diff -u -r1642 -r1649
--- WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1642)
+++ WS/MAG/UGLYPicking/UGLYPickingService.cls.xml	(.../UGLYPickingService.cls.xml)	(revision 1649)
@@ -52,11 +52,11 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPalletInhoud">
+<Method name="GeefPalletPickingOpdracht">
 <FormalSpec>BonNr:%String,ProductID:%String,PalletID:%String</FormalSpec>
-<ReturnType>APPS.MAG.UGLYPicking.dto.Pallet</ReturnType>
+<ReturnType>APPS.MAG.UGLYPicking.dto.PalletPickingOpdracht</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefPalletInhoud(BonNr,ProductID,PalletID)
+<Implementation><![CDATA[	Quit ##class(APPS.MAG.UglyPickingService).%New().GeefPalletPickingOpdracht(BonNr,ProductID,PalletID)
 ]]></Implementation>
 </Method>