Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter/Convert/Test.cls.xml
===================================================================
diff -u -r51882 -r55297
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 51882)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 55297)
@@ -32,14 +32,17 @@
 	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
 	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub)
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
 	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, )
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.Count(),1)
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).PickId,"123456")
-	;Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).ShippingDate,$$$CurrentDate)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).ShippingDate,$$$CurrentDate)
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),1)
 ]]></Implementation>
 </Method>
@@ -71,8 +74,11 @@
 	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
 	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1,2), OrderWMSHoofdingRepositoryStub)
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
 	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1,2), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, )
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
@@ -101,7 +107,7 @@
 	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
 	Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(0))
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(0),,)
 	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
@@ -139,8 +145,12 @@
 	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
 	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2,2), OrderWMSHoofdingRepositoryStub)
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1002").DanReturn($$$False)
 	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2,2), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, )
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
@@ -178,8 +188,11 @@
 	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
 	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub)
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
 	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, )
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
@@ -216,8 +229,12 @@
 	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
 	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2), OrderWMSHoofdingRepositoryStub)
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1002").DanReturn($$$False)
 	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, )
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
@@ -295,8 +312,11 @@
 	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
 	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
 	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub)
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
 	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, )
+	
 	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
 	
@@ -305,6 +325,97 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: uitlevering met 2 producten, waarvan het 2e een SpaceTower is">
+<Implementation><![CDATA[
+	#dim UitleveringID = $$$DummyInteger
+	
+	Set Request = ##class(AXimpl.Request).%New("Inventory/PickingCompleet", UitleveringID)
+	
+	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(2)
+	
+	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(Antwoord)
+	
+	Set Bonlijnen = ##class(%ListOfObjects).%New()
+	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("100",1))
+	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("100",2))
+	
+	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
+	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
+	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
+	
+	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon)
+	
+	#dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New()
+	Set OrderWMSHoofding.DueOutTime = $$$CurrentDate
+	
+	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
+	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
+	
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1002").DanReturn($$$True)
+	
+	Set SpaceTowerServiceStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.SpaceTowerService).%New()
+	Do SpaceTowerServiceStub.IndienMethodCall("GeefSpaceTowerBouwsteenIterator", "1002").DanReturn(..GeefSpaceTowerBouwsteenIterator())
+	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2,2), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, SpaceTowerServiceStub)
+	
+	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.Count(),2)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: uitlevering met 2 producten, beide zijn SpaceTowers">
+<Implementation><![CDATA[
+	#dim UitleveringID = $$$DummyInteger
+	
+	Set Request = ##class(AXimpl.Request).%New("Inventory/PickingCompleet", UitleveringID)
+	
+	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(2)
+	
+	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(Antwoord)
+	
+	Set Bonlijnen = ##class(%ListOfObjects).%New()
+	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("100",1))
+	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("100",2))
+	
+	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
+	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
+	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
+	
+	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon)
+	
+	#dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New()
+	Set OrderWMSHoofding.DueOutTime = $$$CurrentDate
+	
+	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
+	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
+	
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$True)
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1002").DanReturn($$$True)
+	
+	Set SpaceTowerServiceStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.SpaceTowerService).%New()
+	Do SpaceTowerServiceStub.IndienMethodCall("GeefSpaceTowerBouwsteenIterator", "1001").DanReturn(..GeefSpaceTowerBouwsteenIterator())
+	Do SpaceTowerServiceStub.IndienMethodCall("GeefSpaceTowerBouwsteenIterator", "1002").DanReturn(..GeefSpaceTowerBouwsteenIterator())
+	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2,2), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, SpaceTowerServiceStub)
+	
+	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.Count(),2)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),2)
+]]></Implementation>
+</Method>
+
 <Method name="MaakInventSyncAntwoord">
 <FormalSpec>AantalInventSync:%Integer</FormalSpec>
 <Private>1</Private>
@@ -350,6 +461,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefSpaceTowerBouwsteenIterator">
+<Private>1</Private>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim BouwsteenKind1 As AXimpl.Admin.DOM.PM.Bouwsteen = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
+	#dim BouwsteenKind2 As AXimpl.Admin.DOM.PM.Bouwsteen = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
+	
+	#dim BouwsteenLijst As %ListOfObjects = ##class(%ListOfObjects).%New()
+	Do BouwsteenLijst.Insert(BouwsteenKind1)
+	Do BouwsteenLijst.Insert(BouwsteenKind2)
+	
+	#dim SpaceTowerBouwsteenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(BouwsteenLijst)
+	
+	Quit SpaceTowerBouwsteenIterator
+]]></Implementation>
+</Method>
+
 <Method name="MaakProductApiStub">
 <FormalSpec>AantalProducten:%Integer</FormalSpec>
 <Private>1</Private>
Index: AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml
===================================================================
diff -u -r55257 -r55297
--- AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml	(.../PickingCompleetConverter.cls.xml)	(revision 55257)
+++ AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml	(.../PickingCompleetConverter.cls.xml)	(revision 55297)
@@ -38,8 +38,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductTypeApi">
+<Type>DOM.PM.ProductTypeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SpaceTowerService">
+<Type>AXimpl.Dynamics.InventoryOut.Converter.SpaceTowerService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,DataMOrderApi:DOM.VKP.impl.DataM.DataMOrderAPI,BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory,OrderWMSHoofdingRepository:Flow.OrderWMS.HoofdingRepository=""</FormalSpec>
+<FormalSpec>InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,DataMOrderApi:DOM.VKP.impl.DataM.DataMOrderAPI,BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory,OrderWMSHoofdingRepository:Flow.OrderWMS.HoofdingRepository="",ProductTypeApi:DOM.PM.impl.ProductTypeAPIimpl="",SpaceTowerService:AXimpl.Dynamics.InventoryOut.Converter.SpaceTowerService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -49,6 +59,8 @@
 	Set ..DataMOrderApi = $$$Inject(DataMOrderApi, ##class(DOM.DomeinContext).Instance().GeefOrderAPI())
 	Set ..BouwsteenIteratorFactory = $$$Inject(BouwsteenIteratorFactory,##class(AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New())
 	Set ..OrderWMSHoofdingRepository = $$$Inject(OrderWMSHoofdingRepository, ##class(Flow.OrderWMS.HoofdingRepository).%New())
+	Set ..ProductTypeApi = $$$Inject(ProductTypeApi, ##class(DOM.PM.impl.ProductTypeAPIimpl).%New())
+	Set ..SpaceTowerService = $$$Inject(SpaceTowerService, ##class(AXimpl.Dynamics.InventoryOut.Converter.SpaceTowerService).%New())
 	
 	Set ..IsOngewenstProductFilter = ##class(AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
 	
@@ -99,7 +111,11 @@
 				Do DoorTeGevenLijnen.Insert(Lijn.GeefProductID())
 			}
 			
-			Set ..BouwsteenIterator = ..BouwsteenIteratorFactory.Maak(Lijn.GeefProductID())
+			If ..ProductTypeApi.IsSpaceTowerProduct(Lijn.GeefProductID()) {
+				Set ..BouwsteenIterator = ..SpaceTowerService.GeefSpaceTowerBouwsteenIterator(Lijn.GeefProductID())
+			} Else {
+				Set ..BouwsteenIterator = ..BouwsteenIteratorFactory.Maak(Lijn.GeefProductID())
+			}
 			
 			While ..BouwsteenIterator.HasNext(){
 				#dim Bouwsteen As AXimpl.Admin.DOM.PM.Bouwsteen = ..BouwsteenIterator.Next()