Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r73960 -r75019
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 73960)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 75019)
@@ -113,11 +113,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductRepository">
-<Type>Prod.ProductRepository</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="ProductTypeAPI">
 <Type>DOM.PM.impl.ProductTypeAPIimpl</Type>
 <Private>1</Private>
@@ -174,7 +169,6 @@
 	Set ..Mailer = $$$Inject(Mailer,##class(AXimpl.Dynamics.SalesOrderIn.Converter.Mailer).%New())
 	Set ..LeverAdresMaker = $$$Inject(LeverAdresMaker,##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter.LeverAdresMaker).%New())
 	Set ..LandRepository  = $$$Inject(LandRepository,##class(DOM.common.Locatie.impl.LandRepository).%New())
-	Set ..ProductRepository = $$$Inject(ProductRepository,##class(Prod.ProductRepository).%New())
 	Set ..ProductTypeAPI = $$$Inject(ProductTypeAPI,##class(DOM.DomeinContext).Instance().GeefProductTypeAPI())
 	Set ..DataMProductRepository = $$$Inject(DataMProductRepository, ##class(DOM.PM.impl.DataM.DataMProductRepository).%New())
 	Set ..ProductService = $$$Inject(ProductService, ##class(WSimpl.AX.CalculatedProduct.ProductService).%New())
@@ -570,7 +564,7 @@
 <Implementation><![CDATA[
 	#dim PrijsOrderLijn As DOM.VKP.PrijsOrderlijn
 	#dim ProductId As %String = ""
-	#dim ReedsGekendeProductId As %Integer
+	#dim ReedsGekendeProductId As %String = ""
 	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig
 	#dim CID As %String = ""
 	
@@ -612,14 +606,14 @@
 <Implementation><![CDATA[
 	#dim IsProductIdHergebruikt As %Boolean = $$$False
 	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = ..GeefJSONParsedVhConfig(OrderLine.VhConfig)
-	If (..VhConfigRepository.BestaatVhConfigVoorCID(CID))
+	If (..VhConfigRepository.BestaatVhConfigVoorInventTransId(OrderLine.InventTransId))
 	{
-		Do ..VhConfigRepository.VerwijderCID(CID)
+		Do ##class(vhLib.Logger).%New("PVR DEBUG").Warning(..%ClassName(), " VhConfigVoorInventTransId bestaat "_OrderLine.InventTransId)
+		Set ReedsGekendeProductId = ..VhConfigRepository.GeefAdminProductNrVoorInventTransId(OrderLine.InventTransId)
+		Do ##class(vhLib.Logger).%New("PVR DEBUG").Warning(..%ClassName(), " VhConfigVoorInventTransId bestaat met id" _ ReedsGekendeProductId)
+		Do ..VhConfigRepository.VerwijderInventTransId(OrderLine.InventTransId)
 	}
 	
-	Do ..VhConfigRepository.SaveVhConfig(CID, VhConfig, OrderLine.ProductHash)
-	Set ReedsGekendeProductId = ..GeefProductIdVanDossierCodeVoorMaatwerkModel(OrderLine.DossierCode, VhConfig.Model)
-	
 	Do ..VhConfigHelper.ZetVhConfig(VhConfig)
 	Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
 	Set ProductData.CID = CID
@@ -641,6 +635,8 @@
 	
 	#dim MaatwerkProduct As DOM.PM.MaatwerkProduct = ..BerekeningServiceProduct.MaakProductVanKenmerken(..VhConfigHelper.GeefIngegevenKenmerken(), ..KlantID, 1, ProductData, VhConfig)
 	
+	Do ..VhConfigRepository.SaveVhConfig(CID, VhConfig, OrderLine.ProductHash, $$$False, OrderLine.InventTransId, MaatwerkProduct.GeefID())
+	
 	If ((ReedsGekendeProductId > 0) && IsProductIdHergebruikt) {
 		Do ..Logger.Warning("SalesOrderIn - ProductCreatie", "Product '"_ReedsGekendeProductId_"' opnieuw gemaakt in Cache! DossierNummer = '"_OrderLine.DossierCode_"'")			
 		Do ..UnlockProduct(ReedsGekendeProductId)
@@ -979,29 +975,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefProductIdVanDossierCodeVoorMaatwerkModel">
-<FormalSpec>DossierCode:%String,MaatwerkModel:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[
-	#dim ProductId As %Integer = 0
-	#dim GenType As %String = $Piece(MaatwerkModel, "_", 2)
-	#dim ProductenIterator As TECH.Iterator = ..ProductRepository.ZoekViaDossierCode(DossierCode, GenType)
-	
-	While ProductenIterator.HasNext() {
-		#dim Product As Prod.Product = ProductenIterator.Next()
-		
-		If (MaatwerkModel = "M_LBX") {
-			Set:(..ProductTypeAPI.IsLegraboxProduct(Product.ProductNr)) ProductId = Product.ProductNr
-		} Else {
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("MaatwerkModel " _ MaatwerkModel _ " is nog niet geïmplementeerd."))
-		}
-	}
-	
-	Quit ProductId
-]]></Implementation>
-</Method>
-
 <Method name="GeefJSONParsedVhConfig">
 <FormalSpec>VhConfig:%String</FormalSpec>
 <Private>1</Private>