Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml
===================================================================
diff -u -r55042 -r55058
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 55042)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 55058)
@@ -3,6 +3,11 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter.Convert.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Parameter name="ProductId">
+<Type>%String</Type>
+<Default>1000</Default>
+</Parameter>
+
 <Parameter name="ProductId1">
 <Type>%String</Type>
 <Default>1001</Default>
@@ -69,13 +74,13 @@
 	
 	Set ..UitleveringId = "0_1234"
 	Set ReceptieAfmeldenInputDto = ##class(AXimpl.Dynamics.InventoryOut.Converter.dto.ReceptieAfmeldenInput).%New()
-	Set ReceptieAfmeldenInputDto.ProductID = 1000
+	Set ReceptieAfmeldenInputDto.ProductID = ..#ProductId
 	Set ReceptieAfmeldenInputDto.ToeleveringID = "100"
 	Set ReceptieAfmeldenInputDto.ToeleveringLijnCode = "100"
 	Set ReceptieAfmeldenInputDto.ReceptieTijdstip = "201106300915"
 	Set ..GUID = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	Set ..Request = ##class(AXimpl.Request).%New("Inventory/ReceptieAfgemeld", ..UitleveringId, ReceptieAfmeldenInputDto)
-	Set ..RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", "1000")
+	Set ..RequestInventoryOut = ##class(AXimpl.Request).%New("Inventory/Update", ..#ProductId)
 	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProducten(..#ProductId1, ..#ProductId3)
  	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProducten(..#ProductId1, ..#ProductId3)
 ]]></Implementation>
@@ -104,12 +109,12 @@
 
 <Method name="Test: Standaardgedrag met 1 InventSync van 1 productlijn">
 <Implementation><![CDATA[
-	Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct",1000).DanReturn($$$False)
-	Do ..InventoryOutConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(1))
+	Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
+	Do ..InventoryOutConverterStub.IndienMethodCall("Convert", $$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(1))
 	
 	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..MaakBouwsteenIteratorFactory(1), ..ProductApi, ..ProductTypeApi)
 	
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request, ..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.GetAt(1).ProdId,"100_100_201106300915")
@@ -119,12 +124,12 @@
 
 <Method name="Test: antwoord met 2 InventSync van 1 productlijn">
 <Implementation><![CDATA[
-	Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct",1000).DanReturn($$$False)
-	Do ..InventoryOutConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(2))
+	Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
+	Do ..InventoryOutConverterStub.IndienMethodCall("Convert", $$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(2))
 	
 	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..MaakBouwsteenIteratorFactory(1), ..ProductApi, ..ProductTypeApi)
 	
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request, ..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),2)
@@ -133,12 +138,12 @@
 
 <Method name="Test: InventSync geeft error -&gt; opeten">
 <Implementation><![CDATA[
-	Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct",1000).DanReturn($$$False)
-	Do ..InventoryOutConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanException($$$DummyException)
+	Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$False)
+	Do ..InventoryOutConverterStub.IndienMethodCall("Convert", $$$ElkeWaarde).DanException($$$DummyException)
 	
 	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..MaakBouwsteenIteratorFactory(1), ..ProductApi, ..ProductTypeApi)
 	
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request, ..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),0)
@@ -154,23 +159,23 @@
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen conversie nodig voor converter 'AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter.Convert' en Id '100_100'")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("AXimpl.NoConversionNeededException",Substrings))
 	
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request, ..GUID)
 ]]></Implementation>
 </Method>
 
-<Method name="zTest: SpaceTower met 3 verschillende Kinderen">
+<Method name="Test: SpaceTower met 3 verschillende Kinderen">
 <Implementation><![CDATA[
-	Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct",1000).DanReturn($$$True)
-	Do ..ProductApi.IndienMethodCall("GeefProduct", 1000).DanReturn(..GeefSpaceTower())
+	Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$True)
+	Do ..ProductApi.IndienMethodCall("GeefProduct", ..#ProductId).DanReturn(..GeefSpaceTower())
 	
-	Do ..InventoryOutConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(2))
+	Do ..InventoryOutConverterStub.IndienMethodCall("Convert", $$$ElkeWaarde).DanReturn(..MaakInventSyncAntwoord(6))
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..MaakBouwsteenIteratorFactory(3), ..ProductApi, ..ProductTypeApi)
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(..InventoryOutConverterStub, ..MaakBouwsteenIteratorFactory(3, 1), ..ProductApi, ..ProductTypeApi)
 	
-	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request, ..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
-	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),2)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),6)
 ]]></Implementation>
 </Method>
 
@@ -197,20 +202,22 @@
 </Method>
 
 <Method name="MaakBouwsteenIteratorFactory">
-<FormalSpec>AantalBouwstenenIterators:%Integer</FormalSpec>
+<FormalSpec>AantalBouwstenenIterators:%Integer,IsCorrectieNodigVanwegeKindBouwstenen:%Integer=0</FormalSpec>
 <Private>1</Private>
 <ReturnType>vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory</ReturnType>
 <Implementation><![CDATA[
-	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(1000)
+	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(..#ProductId)
 	
+	#dim ProductId As %Integer
 	#dim ii As %Integer
 	For ii=0:1:AantalBouwstenenIterators-1 {
 		Set BouwsteenDummy = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-		Set BouwsteenDummy.ProductId = "100"_ii
+		Set ProductId = 100_ii + IsCorrectieNodigVanwegeKindBouwstenen
+		Set BouwsteenDummy.ProductId = ProductId
 		Set Bouwstenen = ##class(%ListOfDataTypes).%New()
 		Do Bouwstenen.Insert(BouwsteenDummy)
 		#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen)
-		Do BouwsteenIteratorFactory.IndienMethodCall("Maak","100"_ii).DanReturn(BouwsteenIterator)
+		Do BouwsteenIteratorFactory.IndienMethodCall("Maak",ProductId).DanReturn(BouwsteenIterator)
 	}
 	
 	Quit BouwsteenIteratorFactory
@@ -238,7 +245,7 @@
 <Private>1</Private>
 <ReturnType>DOM.PM.Product</ReturnType>
 <Implementation><![CDATA[
-	#dim SpaceTower As DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New(1000)
+	#dim SpaceTower As DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New(..#ProductId)
 	Do SpaceTower.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(..GeefKindBouwstenenIteratorVanSpaceTower())
 	
 	Quit SpaceTower
Index: AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter.cls.xml
===================================================================
diff -u -r55042 -r55058
--- AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter.cls.xml	(.../ReceptieAfmeldenConverter.cls.xml)	(revision 55042)
+++ AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter.cls.xml	(.../ReceptieAfmeldenConverter.cls.xml)	(revision 55058)
@@ -124,21 +124,30 @@
 <ReturnType>AXimpl.Admin.DOM.PM.BouwsteenIterator</ReturnType>
 <Implementation><![CDATA[
 	#dim SpaceTower As DOM.PM.Product = ..ProductApi.GeefProduct(ProductId)
-	#dim SpaceTowerKindProductenIterator As TECH.Iterator = SpaceTower.GeefKindBouwstenenIterator()
+	#dim SpaceTowerKindIterator As TECH.Iterator = SpaceTower.GeefKindBouwstenenIterator()
 	#dim BouwsteenKind As DOM.PM.Bouwstenen.BouwsteenKind
-	#dim BouwsteenIteratorArray As %String = ##class(%ArrayOfDataTypes).%New()
-	#dim Count As %Integer = 0
+	#dim BouwsteenKindProductIdLijst As %ListOfObjects = ##class(%ListOfObjects).%New()
+	#dim BouwsteenKindIterator1 As TECH.Iterator
+	#dim BouwsteenKindIterator2 As TECH.Iterator
+	#dim BouwsteenKindIterator3 As TECH.Iterator
+	#dim BouwsteenKindIterator4 As TECH.Iterator
+	#dim BouwsteenKindIterator5 As TECH.Iterator
 	
-	While SpaceTowerKindProductenIterator.HasNext() {
-		Set BouwsteenKind = SpaceTowerKindProductenIterator.Next()
+	While SpaceTowerKindIterator.HasNext() {
+		Set BouwsteenKind = SpaceTowerKindIterator.Next()
 		If BouwsteenKind.Type = "K" {
-			Set Count = Count + 1
-			Do BouwsteenIteratorArray.SetAt(Count, ..BouwsteenIteratorFactory.Maak(BouwsteenKind.KindProduct.GeefID()))
+			Do BouwsteenKindProductIdLijst.Insert(..BouwsteenIteratorFactory.Maak(BouwsteenKind.KindProduct.GeefID()))
 		}
 	}
+	// OPGELET: Voorlopig voorzien voor SpaceTowers met maximaal 5 VERSCHILLENDE ProductGroep-BouwsteenKinderen (P.s.: Aantallen doen er niet toe voor de InventSync)
+	Set BouwsteenKindIterator1 = $select($$$HasLength(BouwsteenKindProductIdLijst.GetAt(1)):BouwsteenKindProductIdLijst.GetAt(1),1:##class(TECH.ListbuildIterator).%New( "" ))
+	Set BouwsteenKindIterator2 = $select($$$HasLength(BouwsteenKindProductIdLijst.GetAt(2)):BouwsteenKindProductIdLijst.GetAt(2),1:##class(TECH.ListbuildIterator).%New( "" ))
+	Set BouwsteenKindIterator3 = $select($$$HasLength(BouwsteenKindProductIdLijst.GetAt(3)):BouwsteenKindProductIdLijst.GetAt(3),1:##class(TECH.ListbuildIterator).%New( "" ))
+	Set BouwsteenKindIterator4 = $select($$$HasLength(BouwsteenKindProductIdLijst.GetAt(4)):BouwsteenKindProductIdLijst.GetAt(4),1:##class(TECH.ListbuildIterator).%New( "" ))
+	Set BouwsteenKindIterator5 = $select($$$HasLength(BouwsteenKindProductIdLijst.GetAt(5)):BouwsteenKindProductIdLijst.GetAt(5),1:##class(TECH.ListbuildIterator).%New( "" ))
 	
 	#dim IteratorOfIterators As TECH.IteratorOfIterators = ##class(TECH.IteratorOfIterators).%New()
-	Do IteratorOfIterators.SetIterators(BouwsteenIteratorArray)
+	Do IteratorOfIterators.SetIterators(BouwsteenKindIterator1, BouwsteenKindIterator2, BouwsteenKindIterator3, BouwsteenKindIterator4, BouwsteenKindIterator5)
 	
 	Quit IteratorOfIterators
 ]]></Implementation>