Index: APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml
===================================================================
diff -u -r73889 -r75019
--- APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 73889)
+++ APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 75019)
@@ -9,10 +9,12 @@
 </Parameter>
 
 <Method name="SaveVhConfig">
-<FormalSpec>CID:%String,VhConfig:APPS.PM.Maatwerk.dto.VhConfig,ProductHash:%String,IsTestData:%Boolean=0</FormalSpec>
+<FormalSpec>CID:%String,VhConfig:APPS.PM.Maatwerk.dto.VhConfig,ProductHash:%String,IsTestData:%Boolean=0,InventTransId:%String="",AdminProductNr:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	Set MaatwerkConfiguratieData = ##class(APPS.PM.Maatwerk.dto.MaatwerkConfiguratieData).%New()
+	Set MaatwerkConfiguratieData.AdminProductNr = AdminProductNr
 	Set MaatwerkConfiguratieData.CID = CID
+	Set MaatwerkConfiguratieData.InventTransId = InventTransId
 	Set MaatwerkConfiguratieData.VhConfig = VhConfig
 	Set MaatwerkConfiguratieData.ProductHash = ProductHash
 	Set MaatwerkConfiguratieData.IsTestData = IsTestData
@@ -32,6 +34,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwijderInventTransId">
+<FormalSpec>InventTransId:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim SQLTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
+	#dim SqlStatement As TECH.String = "DELETE FROM " _SQLTableName _" WHERE (InventTransId = ?)"
+	#dim lbParams As %List = $LB(InventTransId)
+	
+	Do ..QueryAPI.ExecuteDynamicQuery(SqlStatement,lbParams)
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderTestData">
 <Implementation><![CDATA[
 	#dim SQLTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
@@ -49,6 +62,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatVhConfigVoorInventTransId">
+<FormalSpec>InventTransId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..BestaatViaFilter("InventTransId = ?", $LB(InventTransId))
+]]></Implementation>
+</Method>
+
 <Method name="GeefVhConfig">
 <FormalSpec>CID:%String,IsTestData:%Boolean=0</FormalSpec>
 <ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
@@ -58,6 +78,16 @@
 	Quit MaatwerkConfiguratieData.VhConfig
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAdminProductNrVoorInventTransId">
+<FormalSpec>InventTransId:%String</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
+<Implementation><![CDATA[
+	#dim MaatwerkConfiguratieData As APPS.PM.Maatwerk.dto.MaatwerkConfiguratieData = ..GeefViaFilter("InventTransId = ?", $LB(InventTransId))
+	
+	Quit MaatwerkConfiguratieData.AdminProductNr
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/PM/Maatwerk/dto/MaatwerkConfiguratieData.cls.xml
===================================================================
diff -u -r75002 -r75019
--- APPS/PM/Maatwerk/dto/MaatwerkConfiguratieData.cls.xml	(.../MaatwerkConfiguratieData.cls.xml)	(revision 75002)
+++ APPS/PM/Maatwerk/dto/MaatwerkConfiguratieData.cls.xml	(.../MaatwerkConfiguratieData.cls.xml)	(revision 75019)
@@ -8,6 +8,14 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="InventTransId">
+<Type>%String</Type>
+</Property>
+
+<Property name="AdminProductNr">
+<Type>%String</Type>
+</Property>
+
 <Property name="VhConfig">
 <Type>APPS.PM.Maatwerk.dto.VhConfig</Type>
 </Property>
@@ -44,6 +52,12 @@
 <Value name="5">
 <Value>ProductHash</Value>
 </Value>
+<Value name="6">
+<Value>InventTransId</Value>
+</Value>
+<Value name="7">
+<Value>AdminProductNr</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
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>
Index: vhTest/Mock/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml
===================================================================
diff -u -r73887 -r75019
--- vhTest/Mock/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 73887)
+++ vhTest/Mock/APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(.../VhConfigRepository.cls.xml)	(revision 75019)
@@ -22,6 +22,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatVhConfigVoorInventTransId">
+<FormalSpec>InventTransId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BestaatVhConfigVoorInventTransId",InventTransId)
+]]></Implementation>
+</Method>
+
 <Method name="BestaatViaID">
 <FormalSpec>ID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
@@ -42,6 +49,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAdminProductNrVoorInventTransId">
+<FormalSpec>InventTransId:%String</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefAdminProductNrVoorInventTransId",InventTransId)
+]]></Implementation>
+</Method>
+
 <Method name="GeefVhConfig">
 <FormalSpec>CID:%String,IsTestData:%Boolean=0</FormalSpec>
 <ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
@@ -63,8 +77,8 @@
 </Method>
 
 <Method name="SaveVhConfig">
-<FormalSpec>CID:%String,VhConfig:APPS.PM.Maatwerk.dto.VhConfig,ProductHash:%String,IsTestData:%Boolean=0</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("SaveVhConfig",CID,VhConfig,ProductHash,IsTestData)
+<FormalSpec>CID:%String,VhConfig:APPS.PM.Maatwerk.dto.VhConfig,ProductHash:%String,IsTestData:%Boolean=0,InventTransId:%String="",AdminProductNr:%String=""</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("SaveVhConfig",CID,VhConfig,ProductHash,IsTestData,InventTransId,AdminProductNr)
 ]]></Implementation>
 </Method>
 
@@ -74,6 +88,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerwijderInventTransId">
+<FormalSpec>InventTransId:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderInventTransId",InventTransId)
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderTestData">
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderTestData")
 ]]></Implementation>
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml
===================================================================
diff -u -r72718 -r75019
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 72718)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 75019)
@@ -245,10 +245,8 @@
 	Set ListIterator = ##class(TECH.ListIterator).%New(ListOfProducts)
 	
 	Set ProductRepositoryMock = ##class(vhTest.Mock.Prod.ProductRepository).%New()
-	Do ProductRepositoryMock.VerwachtMethodCall("ZoekViaDossierCode","ABCDE", "LBX").DanReturn(ListIterator)
 	
 	Set ProductTypeAPIMock = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
-	Do ProductTypeAPIMock.VerwachtMethodCall("IsLegraboxProduct","123456").DanReturn($$$True)
 	
 	Set DataMProductRepositoryMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository).%New()
 	Do DataMProductRepositoryMock.VerwachtMethodCall("VerwijderViaID","123456", $$$False).DanDoeNiks().ExactAantalKeer(0)
@@ -259,7 +257,6 @@
 	Do BerekeningServiceProductMock.VerwachtMethodCall("MaakProductVanKenmerken", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(MaatwerkProduct)
 	
 	Set ProductServiceMock = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-	Do ProductServiceMock.VerwachtMethodCall("HeeftBezwaarVoorProductDelete","123456", "").DanReturn($$$True)
 
 	#dim ProductOrderlijnMock As vhTest.Mock.DOM.VKP.impl.DataM.DataMProductOrderlijn = ##class(vhTest.Utils.DOM.VKP.ProductOrderlijn).StandaardProductLijn()
 	Do ProductOrderlijnMock.VerwachtMethodCall("ZetAxInventTransId",StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1).OrderLine.GetAt(1).InventTransId).DanDoeNiks()
@@ -293,9 +290,6 @@
 	Do ProductOrderlijnMock.Verifieer()
 	Do ProductBepalerMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
-	Do ProductRepositoryMock.Verifieer()
-	Do ProductTypeAPIMock.Verifieer()
-	Do ProductServiceMock.Verifieer()
 	Do DataMProductRepositoryMock.Verifieer()
 	Do BerekeningServiceProductMock.Verifieer()
 ]]></Implementation>