Index: WSimpl/Halux/PPS/MatService.cls.xml
===================================================================
diff -u -r66538 -r66540
--- WSimpl/Halux/PPS/MatService.cls.xml	(.../MatService.cls.xml)	(revision 66538)
+++ WSimpl/Halux/PPS/MatService.cls.xml	(.../MatService.cls.xml)	(revision 66540)
@@ -3,25 +3,25 @@
 <Class name="WSimpl.Halux.PPS.MatService">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="ProductieSequentieRepository">
-<Type>APPS.Halux.common.ProductieSequentieRepository</Type>
+<Property name="BatchService">
+<Type>APPS.Halux.common.impl.BatchService</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="ProductApi">
-<Type>DOM.PM.ProductAPI</Type>
+<Property name="GeefMatAfmetingenHelper">
+<Type>WSimpl.Halux.PPS.MatService.GeefAfmetingenHelper</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductieSequentieRepository:APPS.Halux.common.ProductieSequentieRepository="",ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
+<FormalSpec>BatchService:APPS.Halux.common.impl.BatchService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..ProductieSequentieRepository = $$$Implementation(ProductieSequentieRepository, ##class(APPS.Halux.common.impl.ProductieSequentieRepository).%New())
-	Set ..ProductApi = $$$Implementation(ProductApi, ##class(DOM.DomeinContext).%New().GeefProductAPI())
+	Set ..BatchService = $$$Inject(BatchService, ##class(APPS.Halux.common.impl.BatchService).%New())
+	Set ..GeefMatAfmetingenHelper = ##class(WSimpl.Halux.PPS.MatService.GeefAfmetingenHelper).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -34,7 +34,7 @@
 	Set Response = ##class(WS.Halux.PPS.MatService.GeefAfmetingenResponse).%New()
 	Try {
 		#dim BatchId As %Integer = GeefAfmetingenRequest.BatchId
-		#dim Batch As APPS.Halux.common.Batch = ##class(APPS.Halux.common.impl.BatchService).%New().GeefBatch(BatchId)
+		#dim Batch As APPS.Halux.common.Batch = ..BatchService.GeefBatch(BatchId)
 		#dim Categorie As APPS.Halux.common.enu.Categorie = Batch.GeefCategorie()
 		#dim MatAfmetingenIterator As TECH.Iterator = ..GeefMatAfmetingenIterator(BatchId, Categorie)
 		
@@ -65,8 +65,7 @@
 <Private>1</Private>
 <ReturnType>TECH.ListIterator</ReturnType>
 <Implementation><![CDATA[
-	Set GeefMatAfmetingenHelper = ##class(WSimpl.Halux.PPS.MatService.GeefAfmetingenHelper).%New()
-	#dim UitvoeringLijstIterator As TECH.ListIterator = GeefMatAfmetingenHelper.GeefUitvoeringIterator(BatchId, Categorie)
+	#dim UitvoeringLijstIterator As TECH.ListIterator = ..GeefMatAfmetingenHelper.GeefUitvoeringIterator(BatchId, Categorie)
 	#dim MatAfmetingenLijst As %ListOfObjects = ##class(%ListOfObjects).%New()
 	
 	While (UitvoeringLijstIterator.HasNext()) {