Index: WSimpl/Vhisie4/QRcodeNaarKenmerkenService.cls.xml
===================================================================
diff -u -r54069 -r54071
--- WSimpl/Vhisie4/QRcodeNaarKenmerkenService.cls.xml	(.../QRcodeNaarKenmerkenService.cls.xml)	(revision 54069)
+++ WSimpl/Vhisie4/QRcodeNaarKenmerkenService.cls.xml	(.../QRcodeNaarKenmerkenService.cls.xml)	(revision 54071)
@@ -18,8 +18,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="BarcodeService">
+<Type>APPS.algemeen.BarcodeService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>LadeRegistratieService:APPS.VKP.Maatwerk.LadeRegistratieService="",ConfiguratorService:APPS.VKP.Maatwerk.impl.ConfiguratorService="",AppsNaarEconConverter:ECONimpl.PM.Maatwerk.AppsConverter=""</FormalSpec>
+<FormalSpec>LadeRegistratieService:APPS.VKP.Maatwerk.LadeRegistratieService="",ConfiguratorService:APPS.VKP.Maatwerk.impl.ConfiguratorService="",AppsNaarEconConverter:ECONimpl.PM.Maatwerk.AppsConverter="",BarcodeService:APPS.algemeen.BarcodeService=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -28,6 +33,7 @@
 	Set ..LadeRegistratieService = $$$Inject(LadeRegistratieService, ##class(APPS.VKP.Maatwerk.impl.LadeRegistratieService).%New())
 	Set ..ConfiguratorService = $$$Inject(ConfiguratorService, ##class(APPS.VKP.Maatwerk.impl.ConfiguratorService).%New())
 	Set ..AppsNaarEconConverter = $$$Inject(AppsNaarEconConverter, ##class(ECONimpl.PM.Maatwerk.AppsConverter).%New())
+	Set ..BarcodeService = $$$Inject(BarcodeService, ##class(APPS.algemeen.BarcodeService).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -44,7 +50,7 @@
 	If (##class(TECH.StringUtils).StartsWith(QRdata,"AdminProductnummer")) {
 		Set ProductNummer = $Piece(QRdata,"=",2)
 	} ElseIf (##class(TECH.StringUtils).StartsWith(QRdata,"Ladecode")) {
-		Set ProductNummer = ..BepaalProductNummerViaLadecode($Piece(QRdata,"=",2))
+		Set ProductNummer = ..BarcodeService.GeefProductIDVoorBarcode(##class(TECH.StringUtils).Replace($Piece(QRdata,"=",2),".",""))
 	} Else {
 		#dim RegistratieCode = ..GeefRegistratieCode(QRdata)
 		If RegistratieCode="" {
@@ -111,61 +117,6 @@
 	Do EconKenmerken.SetAt("V1","Data.Kenmerken.Verpakkingtype")
 ]]></Implementation>
 </Method>
-
-<Method name="BepaalProductNummerViaLadecode">
-<FormalSpec>Ladecode:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	Set Ladecode = ##class(TECH.StringUtils).Replace(Ladecode,".","")
-	#dim LadeType As %String = $Extract(Ladecode)
-	Set Ladecode = $Extract(Ladecode,2,5)
-	
-	Set pxCriteria=##class(BL.Prod.sub.pxSearchCriteria).%New()
-	Do ..LegeCriteria(.pxCriteria)
-	Set pxCriteria.Usage="ALL"
-	Set pxCriteria.At="D"
-	Set pxCriteria.SearchTxt=$G(Ladecode)
-	Set pxCriteria.MaxCount=20
-	
-	#dim Producten As %CacheString
-	Do ##class(BL.Prod.Search).SearchIndex(pxCriteria, .Producten)
-	
-	#dim Product As Prod.Product
-	Set ProductRepository = ##class(Prod.ProductRepository).%New()
-	
-	#dim Resultaat As %String = ""
-	#dim Teller As %Integer = 1
-	While Teller <= pxCriteria.SelectCount {
-		Set Product = ProductRepository.GeefViaID(Producten(Teller))
-		If ((Product.GenType = "TBX") && (LadeType = "T") ||
-		   ((Product.GenType = "LBX") && (LadeType = "L")) ||
-		   ((Product.GenType = "TAX") && (LadeType = "H")))
-		{
-			Set Resultaat = Producten(Teller)
-		}
-		Set Teller = Teller + 1
-	}
-	Quit Resultaat
-]]></Implementation>
-</Method>
-
-<Method name="LegeCriteria">
-<FormalSpec><![CDATA[&pxCriteria:BL.Prod.sub.pxSearchCriteria]]></FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set pxCriteria.StockType=""
-	Set pxCriteria.ProductType=""
-	Set pxCriteria.Alias=""
-	Set pxCriteria.Active=""
-	Set pxCriteria.Saleable=""
-	Set pxCriteria.Pool=""
-	Set pxCriteria.VerifyCustomer=""
-	Set pxCriteria.LimitCustomer=""
-	Set pxCriteria.LimitSupplier=""
-	Set pxCriteria.CheckCallBack=""
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/Vhisie4/QRcodeNaarKenmerken/GeefKenmerken/Test.cls.xml
===================================================================
diff -u -r54069 -r54071
--- vhUnitTest/WSimpl/Vhisie4/QRcodeNaarKenmerken/GeefKenmerken/Test.cls.xml	(.../Test.cls.xml)	(revision 54069)
+++ vhUnitTest/WSimpl/Vhisie4/QRcodeNaarKenmerken/GeefKenmerken/Test.cls.xml	(.../Test.cls.xml)	(revision 54071)
@@ -15,7 +15,7 @@
 
 <Parameter name="Ladecode">
 <Type>%String</Type>
-<Default>L.A1.11.5</Default>
+<Default>L.A1.11.2</Default>
 </Parameter>
 
 <Property name="Request">
@@ -183,18 +183,22 @@
 	
 	#dim Kenmerken = ##class(vhTest.Utils.APPS.PM.Maatwerk.dto.TAORKenmerken).StandaardLade()
 	Set ConfiguratorServiceMock = ##class(vhTest.Mock.APPS.VKP.Maatwerk.ConfiguratorService).%New()
-	Do ConfiguratorServiceMock.VerwachtMethodCall("GeefOnverwerkteKenmerkenVanProduct","1928724").DanReturn(Kenmerken)
+	Do ConfiguratorServiceMock.VerwachtMethodCall("GeefOnverwerkteKenmerkenVanProduct",..#ProductNummer).DanReturn(Kenmerken)
 	
 	Set AppsConverterMock = ##class(vhTest.Mock.ECONimpl.PM.Maatwerk.AppsConverter).%New()
 	Do AppsConverterMock.VerwachtMethodCall("ConverteerAppsNaarEcon",Kenmerken).DanReturn(##class(ECON.PM.Maatwerk.dto.TaxKenmerken).%New())
 	
-	Set QRNaarKenmerkenService = ##class(WSimpl.Vhisie4.QRcodeNaarKenmerkenService).%New(LadeRegistratieServiceMock, ConfiguratorServiceMock, AppsConverterMock)
+	Set BarcodeServiceMock = ##class(vhTest.Mock.APPS.algemeen.BarcodeService).%New()
+	Do BarcodeServiceMock.VerwachtMethodCall("GeefProductIDVoorBarcode",##class(TECH.StringUtils).Replace(..#Ladecode,".","")).DanReturn(..#ProductNummer)
 	
+	Set QRNaarKenmerkenService = ##class(WSimpl.Vhisie4.QRcodeNaarKenmerkenService).%New(LadeRegistratieServiceMock, ConfiguratorServiceMock, AppsConverterMock, BarcodeServiceMock)
+	
 	#dim Response As WS.Vhisie4.QRcodeNaarKenmerkenResponse = QRNaarKenmerkenService.GeefKenmerken(..Request)
 	
 	Do LadeRegistratieServiceMock.Verifieer()
 	Do ConfiguratorServiceMock.Verifieer()
 	Do AppsConverterMock.Verifieer()
+	Do BarcodeServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -207,18 +211,22 @@
 	
 	#dim Kenmerken = ##class(vhTest.Utils.APPS.PM.Maatwerk.dto.TAORKenmerken).StandaardLade()
 	Set ConfiguratorServiceMock = ##class(vhTest.Mock.APPS.VKP.Maatwerk.ConfiguratorService).%New()
-	Do ConfiguratorServiceMock.VerwachtMethodCall("GeefOnverwerkteKenmerkenVanProduct","1928724").DanReturn(Kenmerken)
+	Do ConfiguratorServiceMock.VerwachtMethodCall("GeefOnverwerkteKenmerkenVanProduct",..#ProductNummer).DanReturn(Kenmerken)
 	
 	Set AppsConverterMock = ##class(vhTest.Mock.ECONimpl.PM.Maatwerk.AppsConverter).%New()
 	Do AppsConverterMock.VerwachtMethodCall("ConverteerAppsNaarEcon",Kenmerken).DanReturn(##class(ECON.PM.Maatwerk.dto.TaxKenmerken).%New())
 	
-	Set QRNaarKenmerkenService = ##class(WSimpl.Vhisie4.QRcodeNaarKenmerkenService).%New(LadeRegistratieServiceMock, ConfiguratorServiceMock, AppsConverterMock)
+	Set BarcodeServiceMock = ##class(vhTest.Mock.APPS.algemeen.BarcodeService).%New()
+	Do BarcodeServiceMock.VerwachtMethodCall("GeefProductIDVoorBarcode",##class(TECH.StringUtils).Replace(..#Ladecode,".","")).DanReturn(..#ProductNummer)
 	
+	Set QRNaarKenmerkenService = ##class(WSimpl.Vhisie4.QRcodeNaarKenmerkenService).%New(LadeRegistratieServiceMock, ConfiguratorServiceMock, AppsConverterMock, BarcodeServiceMock)
+	
 	#dim Response As WS.Vhisie4.QRcodeNaarKenmerkenResponse = QRNaarKenmerkenService.GeefKenmerken(..Request)
 	
 	Do LadeRegistratieServiceMock.Verifieer()
 	Do ConfiguratorServiceMock.Verifieer()
 	Do AppsConverterMock.Verifieer()
+	Do BarcodeServiceMock.Verifieer()
 ]]></Implementation>
 </Method>