Index: WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService.cls.xml
===================================================================
diff -u -r37350 -r37352
--- WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService.cls.xml	(.../BijladenPickToLightService.cls.xml)	(revision 37350)
+++ WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService.cls.xml	(.../BijladenPickToLightService.cls.xml)	(revision 37352)
@@ -8,12 +8,19 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OnderdeelLocatieRepository">
+<Type>WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.data.OnderdeelLocatieRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>OnderdeelLocatieRepository:WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.data.OnderdeelLocatieRepository=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..OnderdeelLocatieRepository = $$$Inject(OnderdeelLocatieRepository, ##class(WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.data.OnderdeelLocatieRepository).%New())
 	Set ..ProductApi = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	
 	Quit $$$OK
@@ -26,87 +33,39 @@
 <Implementation><![CDATA[
 	#dim Locatie As TECH.String = ""
 	
-
-	Do ##class(Tools.Wlip).%New(42).ScheidingsLijn()
+	If (##class(TECH.StringUtils).StartsWith(Id, "VH")) {
+		Set Locatie = "komt op dozen voor Wase werkplaats"
+	} Else {
+		Set Locatie = ..GeefLocatieVoorBlumBarcode(Id)
+	}
 	
-	Do ..LoopDoorNodes(Id)
-	//Do ..GeefLocatieVoorProduct(685060)	
-
 	Quit Locatie
 ]]></Implementation>
 </Method>
 
-<Method name="LoopDoorNodes">
-<FormalSpec>Id:TECH.String</FormalSpec>
+<Method name="GeefLocatieVoorBlumBarcode">
+<FormalSpec>Barcode:TECH.String</FormalSpec>
 <Private>1</Private>
+<ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[
-	If (##class(TECH.StringUtils).StartsWith(Id, "MVI")) {
-		#dim BarCode As TECH.String = ##class(TECH.StringUtils).StripFirstPart(Id, "MVI")		
-		Do ##class(Tools.Wlip).%New(42).String("Gescande barcode:" _ BarCode)
-
-		Set Data = "qsdf"
+	#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 = "") {
+		#dim Product As Prod.Product = ProductIterator.Next()
 		
-		#dim Counter As TECH.Integer = 0
-		
-		While $$$Not(Data = "") {
-			Set Counter = Counter + 1
-			
-			Set Data = $Order(^KPR(Counter))
-			
-			If ($data(^KPR(Counter, 2))) {
-				If $$$Not($piece(^KPR(Counter, 2), "\", 14) = "") {
-					If ($piece(^KPR(Counter, 2), "\", 14) = BarCode) {
-						Do ##class(Tools.Wlip).%New(42).String("############### " _ Counter _ ": " _ ^KPR(Counter, 2))
-						
-						Do ..GeefLocatieVoorProduct(Counter)	
-					}
-				}
-			}			
+		If (..OnderdeelLocatieRepository.BestaatViaID(Product.%Id())) {			
+			#dim OnderdeelLocatie As WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.data.OnderdeelLocatie = ..OnderdeelLocatieRepository.GeefViaID(Product.%Id())			
+			Set Locatie = OnderdeelLocatie.Locatie
 		}
-		
-		Do ##class(Tools.Wlip).%New(42).String("END")
-
 	}
 	
-	Quit "afgelopen"
+	Quit Locatie
 ]]></Implementation>
 </Method>
-
-<Method name="GeefLocatieVoorIdentNummer">
-<FormalSpec>IdentNummer:TECH.String</FormalSpec>
-<Private>1</Private>
-<ReturnType>TECH.String</ReturnType>
-<Implementation><![CDATA[	Quit ##class(Prod.Product).IdentNrToPRNr()
-]]></Implementation>
-</Method>
-
-<Method name="GeefLocatieVoorProduct">
-<FormalSpec>ProductId:TECH.String</FormalSpec>
-<Private>1</Private>
-<ReturnType>TECH.String</ReturnType>
-<Implementation><![CDATA[
-	#dim Product As DOM.PM.MaatwerkProduct = ..ProductApi.GeefProduct(ProductId)
-	
-	Do ##class(Tools.Wlip).%New(42).String("------------------------------------")
-	
-	Do ##class(Tools.Wlip).%New(42).String("korttekst:" _ Product.GeefKorttekst())
-	Do ##class(Tools.Wlip).%New(42).String("identnr: " _ Product.GeefIdentNr())
-	Do ##class(Tools.Wlip).%New(42).String("id: " _ Product.GeefID())
-	
-	#dim Iterator As TECH.Iterator = Product.GeefKindBouwstenenIterator()
-
-	While (Iterator.HasNext()) {
-		#dim BouwSteen As DOM.PM.Bouwstenen.BouwsteenKind = Iterator.Next()
-		#dim IdentNummer As TECH.String = BouwSteen.KindProduct.IdentNummer
-		#dim ProductNummer As TECH.String = ##class(Prod.Product).IdentNrToPRNr(IdentNummer)
-		
-		Do ##class(Tools.Wlip).%New(42).String("KindBouwSteen identnr:" _ IdentNummer)
-		Do ##class(Tools.Wlip).%New(42).String("KindBouwSteen productnr:" _ ProductNummer)
-	}		
-
-	Quit "locatie voor ProductId"
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: Prod/ProductGateway.cls.xml
===================================================================
diff -u
--- Prod/ProductGateway.cls.xml	(revision 0)
+++ Prod/ProductGateway.cls.xml	(revision 37352)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Prod.ProductGateway">
+<Super>TECH.RegisteredObject,TECH.Persistent.Gateway</Super>
+
+<Property name="DataClassName">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>DataClassName:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..DataClassName = DataClassName
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OpenId">
+<FormalSpec>Id:%String</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	Quit $ClassMethod(..DataClassName, "%OpenId", Id)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: Prod/ProductRepository.cls.xml
===================================================================
diff -u
--- Prod/ProductRepository.cls.xml	(revision 0)
+++ Prod/ProductRepository.cls.xml	(revision 37352)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Prod.ProductRepository">
+<Super>TECH.Persistentie.impl.Repository,TECH.RegisteredObject</Super>
+
+<Parameter name="DataClassName">
+<Type>%String</Type>
+<Default>Prod.Product</Default>
+</Parameter>
+
+<Method name="%OnNew">
+<FormalSpec>Gateway:Prod.ProductGateway,QueryAPI:TECH.Query.QueryAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do ##super(Gateway, QueryAPI)
+	
+	Set ..Gateway = $$$Inject(Gateway, ##class(Prod.ProductGateway).%New(..#DataClassName))
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ZoekViaBarcode">
+<FormalSpec>Barcode:TECH.String</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
+	#dim SqlStatement As TECH.String = "SELECT ID FROM " _ SqlTableName _ " WHERE BarcodeWaarde = ?"
+
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement, $ListBuild(Barcode)))
+	#dim Opener As TECH.Persistentie.Repository.ResultSetItemOpener = ##class(TECH.Persistentie.Repository.ResultSetItemOpener).%New($this)
+	#dim ResultSetIterator As TECH.Iterator = ##class(TECH.ResultSetIterator).%New(ResultSet)
+	#dim Result As TECH.Iterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator, Opener)
+
+	Quit Result
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>