Index: AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml
===================================================================
diff -u -r56865 -r57026
--- AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 56865)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 57026)
@@ -19,15 +19,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository</FormalSpec>
+<FormalSpec>SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository,BatchService:APPS.Halux.common.BatchService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..SalesOrderLineStatusRepository = $$$Inject(SalesOrderLineStatusRepository, ##class(AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository).%New())
+	Set ..BatchService = $$$Inject(BatchService, ##class(APPS.Halux.common.impl.BatchService).%New())
 
-	Set ..BatchService = ##class(APPS.Halux.common.impl.BatchService).%New()
 	Set ..Logger = ##class(vhLib.Logger).%New()
 	
 	Quit $$$OK
@@ -57,23 +57,25 @@
 
 <Method name="GeefToeleveringenReedsInBatch">
 <FormalSpec>Order:DOM.VKP.Order</FormalSpec>
-<ReturnType>%ListOfDataTypes</ReturnType>
+<ReturnType>%ArrayOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	#dim OrderLijnIterator As TECH.ListIterator
 	#dim OrderLijn As DOM.VKP.ProductOrderlijn
 	#dim ToeleveringId As %String
 	#dim BatchId As %String
 
-	Set ToeleveringenReedsInBatch = ##class(%ListOfDataTypes).%New()
+	Set ToeleveringenReedsInBatch = ##class(%ArrayOfDataTypes).%New()
 	
 	Set OrderLijnIterator = Order.GeefProductOrderLijnIterator()
 	While OrderLijnIterator.HasNext() {
 		Set OrderLijn = OrderLijnIterator.Next()
 		Set ToeleveringId = OrderLijn.GeefToeleveringID()
-		Set BatchId = ..BatchService.ZoekBijhorendeBatchIdVoorToelevering(ToeleveringId)
-		If $$$HasLength(BatchId) Do ToeleveringenReedsInBatch.Insert(ToeleveringId)   ; ofwel:  Do ToeleveringenReedsInBatch.SetAt(BatchId, ToeleveringId) 
+		If $$$Not(ToeleveringenReedsInBatch.IsDefined(ToeleveringId)) {
+			Set BatchId = ..BatchService.ZoekBijhorendeBatchIdVoorToelevering(ToeleveringId)
+			If $$$HasLength(BatchId) Do ToeleveringenReedsInBatch.SetAt(BatchId,ToeleveringId)
+		}
 	}
-	Quit ##class(TECH.ListUtils).RemoveDuplicateItems(ToeleveringenReedsInBatch)
+	Quit ToeleveringenReedsInBatch
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml
===================================================================
diff -u -r56865 -r57026
--- vhTest/Fake/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 56865)
+++ vhTest/Fake/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 57026)
@@ -14,7 +14,7 @@
 
 <Method name="GeefToeleveringenReedsInBatch">
 <FormalSpec>Order:DOM.VKP.Order</FormalSpec>
-<ReturnType>%ListOfDataTypes</ReturnType>
+<ReturnType>%ArrayOfDataTypes</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml
===================================================================
diff -u -r56865 -r57026
--- vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 56865)
+++ vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/ToeleveringService.cls.xml	(.../ToeleveringService.cls.xml)	(revision 57026)
@@ -9,15 +9,15 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository</FormalSpec>
+<FormalSpec>SalesOrderLineStatusRepository:AXdata.Dynamics.SalesLineStatus.SalesOrderLineStatusRepository,BatchService:APPS.Halux.common.BatchService=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefToeleveringenReedsInBatch">
 <FormalSpec>Order:DOM.VKP.Order</FormalSpec>
-<ReturnType>%ListOfDataTypes</ReturnType>
+<ReturnType>%ArrayOfDataTypes</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefToeleveringenReedsInBatch",Order)
 ]]></Implementation>
 </Method>