Index: vhUnitTest/WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService/Test.cls.xml	(revision 37421)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.BijladenPickToLightService.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="ProductId">
+<Type>%Integer</Type>
+<Default>1000</Default>
+</Parameter>
+
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ 	Do ##class(vhUnitTest.DOM.PM.TestData).%New().CreeerTestData(..#ProductId, ..#ProductId)
+ 	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ 	Do ##class(vhUnitTest.DOM.PM.TestData).%New().VerwijderTestData(..#ProductId, ..#ProductId)
+ 	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Test: Repositories worden opgeroepen">
+<Implementation><![CDATA[
+	#dim RandomLocatie As TECH.String = "RandomLocatie"
+	#dim Product As Prod.Product = ##class(Prod.Product).%OpenId(..#ProductId)
+	#dim ProductIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(Product)
+	
+	#dim OnderdeelLocatie As WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.data.OnderdeelLocatie = ##class(WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.data.OnderdeelLocatie).%New()
+	Set OnderdeelLocatie.Locatie = RandomLocatie	
+	
+	#dim ProductRepositoryMock As vhTest.Mock.Prod.ProductRepository = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryMock.VerwachtMethodCall("ZoekViaBarcode", ..#ProductId).DanReturn(ProductIterator)
+	
+	#dim OnderdeelLocatieRepositoryMock As vhTest.Mock.TECH.Persistentie.Repository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
+	Do OnderdeelLocatieRepositoryMock.VerwachtMethodCall("BestaatViaID", ..#ProductId).DanReturn($$$True)
+	Do OnderdeelLocatieRepositoryMock.VerwachtMethodCall("GeefViaID", ..#ProductId).DanReturn(OnderdeelLocatie)
+	
+	#dim Service As WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.BijladenPickToLightService = ##class(WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.BijladenPickToLightService).%New(ProductRepositoryMock, OnderdeelLocatieRepositoryMock)
+	#dim Locatie As TECH.String = Service.GeefLocatie(..#ProductId)
+	
+	Do $$$AssertEquals(Locatie, OnderdeelLocatie.Locatie)
+	
+	Do ProductRepositoryMock.Verifieer()
+	Do OnderdeelLocatieRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService.cls.xml
===================================================================
diff -u -r37352 -r37421
--- WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService.cls.xml	(.../BijladenPickToLightService.cls.xml)	(revision 37352)
+++ WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService.cls.xml	(.../BijladenPickToLightService.cls.xml)	(revision 37421)
@@ -3,8 +3,8 @@
 <Class name="WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.BijladenPickToLightService">
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="ProductApi">
-<Type>DOM.PM.ProductAPI</Type>
+<Property name="ProductRepository">
+<Type>Prod.ProductRepository</Type>
 <Private>1</Private>
 </Property>
 
@@ -14,14 +14,14 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>OnderdeelLocatieRepository:WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.data.OnderdeelLocatieRepository=""</FormalSpec>
+<FormalSpec>ProductRepository:Prod.ProductRepository="",OnderdeelLocatieRepository:WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.data.OnderdeelLocatieRepository=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..ProductRepository = $$$Inject(ProductRepository, ##class(Prod.ProductRepository).%New())
 	Set ..OnderdeelLocatieRepository = $$$Inject(OnderdeelLocatieRepository, ##class(WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.data.OnderdeelLocatieRepository).%New())
-	Set ..ProductApi = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -32,29 +32,9 @@
 <ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[
 	#dim Locatie As TECH.String = ""
+	#dim ProductIterator As TECH.Iterator = ..ProductRepository.ZoekViaBarcode(Id)
 	
-	If (##class(TECH.StringUtils).StartsWith(Id, "VH")) {
-		Set Locatie = "komt op dozen voor Wase werkplaats"
-	} Else {
-		Set Locatie = ..GeefLocatieVoorBlumBarcode(Id)
-	}
-	
-	Quit Locatie
-]]></Implementation>
-</Method>
-
-<Method name="GeefLocatieVoorBlumBarcode">
-<FormalSpec>Barcode:TECH.String</FormalSpec>
-<Private>1</Private>
-<ReturnType>TECH.String</ReturnType>
-<Implementation><![CDATA[
-	#dim ProductNummers As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
-	#dim ProductRepository As Prod.ProductRepository = ##class(Prod.ProductRepository).%New()
-	#dim ProductIterator As TECH.Iterator = ProductRepository.ZoekViaBarcode(Barcode)
-	
-	#dim Locatie As TECH.String = ""
-	
-	While (ProductIterator.HasNext() && Locatie = "") {
+	While (ProductIterator.HasNext() && (Locatie = "")) {
 		#dim Product As Prod.Product = ProductIterator.Next()
 		
 		If (..OnderdeelLocatieRepository.BestaatViaID(Product.%Id())) {