Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml
===================================================================
diff -u -r35744 -r35745
--- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml	(.../Test.cls.xml)	(revision 35744)
+++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml	(.../Test.cls.xml)	(revision 35745)
@@ -79,8 +79,8 @@
 	
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).bottomtotoploading,"True") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).partialloadonfloor,"True") 
-	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).id,"11111") 
-	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).containerid,"11111") 
+	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).id,"DHL.stapelaar.EuroPallet") 
+	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).containerid,"DHL.stapelaar.EuroPallet") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).containertype,"Rectangular") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).depth,"1200.00") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).width,"800.00") 
@@ -108,8 +108,8 @@
 	
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).bottomtotoploading,"True") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).partialloadonfloor,"True") 
-	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).id,"22222") 
-	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).containerid,"22222") 
+	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).id,"DHL.stapelaar.WegwerpPallet") 
+	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).containerid,"DHL.stapelaar.WegwerpPallet") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).containertype,"Rectangular") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).depth,"1500.00") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).width,"800.00") 
@@ -127,6 +127,27 @@
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).valuemax,"999999999.00")
 ]]></Implementation>
 </Method>
+
+<Method name="Test : Compose geeft cubeiq request met solution weer">
+<Implementation><![CDATA[
+	#dim CollisOpPallet As APPS.TRANSP.Stapeling.dto.CollisOpPallet = ##class(vhTest.Utils.APPS.TRANSP.Stapeling.dto.CollisOpPallet).GeefCollisOpPallet()
+	
+	#dim RequestComposer As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestComposer = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestComposer).%New()
+	#dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet)
+	
+	Do $$$AssertEquals(cubeiqrequest.solutions.id, "DHL.stapelaar.Solution")
+	Do $$$AssertEquals(cubeiqrequest.solutions.solutionid, "DHL.stapelaar.Solution")
+	Do $$$AssertContains(cubeiqrequest.solutions.date, ..GeefHuidigeDatum())
+	Do $$$AssertEquals(cubeiqrequest.solutions.stage, "1")
+]]></Implementation>
+</Method>
+
+<Method name="GeefHuidigeDatum">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $$FormatDateTime^vhLib("dd/mm/YYYY",$H)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml
===================================================================
diff -u -r35744 -r35745
--- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35744)
+++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35745)
@@ -13,6 +13,7 @@
 	Set Requestcubeiq.containersettings = ..GeefcontainerSettings()
 	Do Requestcubeiq.containers.Insert(..GeefEuroPallet())
 	Do Requestcubeiq.containers.Insert(..GeefWegwerpPallet())
+	Set Requestcubeiq.solutions = ..GeefSolution()
 	
 	#dim CollisOpPalletIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CollisOpPallet)
 	while CollisOpPalletIterator.HasNext()
@@ -48,6 +49,7 @@
 </Method>
 
 <Method name="GeefcontainerSettings">
+<Private>1</Private>
 <ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.containersetting</ReturnType>
 <Implementation><![CDATA[
 	#dim ContainerSetting As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.containersetting = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.containersetting).%New()
@@ -62,13 +64,14 @@
 </Method>
 
 <Method name="GeefEuroPallet">
+<Private>1</Private>
 <ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container</ReturnType>
 <Implementation><![CDATA[
 	#dim Container As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container).%New()
 	Set Container.bottomtotoploading="True"
 	Set Container.partialloadonfloor="True" 
-	Set Container.id="11111"
-	Set Container.containerid="11111"
+	Set Container.id="DHL.stapelaar.EuroPallet"
+	Set Container.containerid="DHL.stapelaar.EuroPallet"
 	Set Container.containertype="Rectangular"
 	Set Container.depth="1200.00"
 	Set Container.width="800.00"
@@ -90,13 +93,14 @@
 </Method>
 
 <Method name="GeefWegwerpPallet">
+<Private>1</Private>
 <ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container</ReturnType>
 <Implementation><![CDATA[
 	#dim Container As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container).%New()
 	Set Container.bottomtotoploading="True"
 	Set Container.partialloadonfloor="True" 
-	Set Container.id="22222"
-	Set Container.containerid="22222"
+	Set Container.id="DHL.stapelaar.WegwerpPallet"
+	Set Container.containerid="DHL.stapelaar.WegwerpPallet"
 	Set Container.containertype="Rectangular"
 	Set Container.depth="1500.00"
 	Set Container.width="800.00"
@@ -116,6 +120,26 @@
 	Quit Container
 ]]></Implementation>
 </Method>
+
+<Method name="GeefSolution">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.solution</ReturnType>
+<Implementation><![CDATA[
+	#dim solution As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.solution = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.solution).%New()
+	Set solution.id = "DHL.stapelaar.Solution"
+	Set solution.solutionid = "DHL.stapelaar.Solution"
+	Set solution.date = ..GeefHuidigeDatum()
+	Set solution.stage = "1"
+	Quit solution
+]]></Implementation>
+</Method>
+
+<Method name="GeefHuidigeDatum">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $$FormatDateTime^vhLib("dd/mm/YYYY",$H)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml
===================================================================
diff -u -r35744 -r35745
--- vhTest/Mock/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35744)
+++ vhTest/Mock/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35745)
@@ -15,24 +15,6 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("Compose",CollisOpPallet)
 ]]></Implementation>
 </Method>
-
-<Method name="GeefEuroPallet">
-<ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEuroPallet")
-]]></Implementation>
-</Method>
-
-<Method name="GeefWegwerpPallet">
-<ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefWegwerpPallet")
-]]></Implementation>
-</Method>
-
-<Method name="GeefcontainerSettings">
-<ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.containersetting</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefcontainerSettings")
-]]></Implementation>
-</Method>
 </Class>