Index: AXimpl/Admin/VKP/SalesPriceService/ProductDataFactory.cls.xml
===================================================================
diff -u -r49398 -r50895
--- AXimpl/Admin/VKP/SalesPriceService/ProductDataFactory.cls.xml	(.../ProductDataFactory.cls.xml)	(revision 49398)
+++ AXimpl/Admin/VKP/SalesPriceService/ProductDataFactory.cls.xml	(.../ProductDataFactory.cls.xml)	(revision 50895)
@@ -3,15 +3,33 @@
 <Class name="AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="MessageManager">
+<Type>AXimpl.MessageManager</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>MessageManager:AXimpl.MessageManager</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..MessageManager = $$$Inject(MessageManager, ##class(AXimpl.MessageManager).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="MaakProductData">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>ProductNummer:%String,CifPpl:%String</FormalSpec>
+<FormalSpec>ProductNummer:%String,CifPpl:%String=""</FormalSpec>
 <ReturnType>AXimpl.Admin.VKP.SalesPriceService.ProductData</ReturnType>
 <Implementation><![CDATA[
 	#dim ProductData As AXimpl.Admin.VKP.SalesPriceService.ProductData = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductData).%New()
 		
 	Set ProductData.ProductNummer = ProductNummer
 	Set ProductData.CifPpl = CifPpl
+	Set ProductData.MessageId = ..MessageManager.GenerateID()
 	
 	Quit ProductData
 ]]></Implementation>
Index: AXimpl/Admin/VKP/SalesPriceService/ProductData.cls.xml
===================================================================
diff -u -r49398 -r50895
--- AXimpl/Admin/VKP/SalesPriceService/ProductData.cls.xml	(.../ProductData.cls.xml)	(revision 49398)
+++ AXimpl/Admin/VKP/SalesPriceService/ProductData.cls.xml	(.../ProductData.cls.xml)	(revision 50895)
@@ -10,6 +10,10 @@
 <Property name="CifPpl">
 <Type>%String</Type>
 </Property>
+
+<Property name="MessageId">
+<Type>%String</Type>
+</Property>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/ProductDataLijst/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/ProductDataLijst/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/ProductDataLijst/Test.cls.xml	(revision 50895)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: FindByMessageId">
+<Implementation><![CDATA[
+	#dim ProductDataFactory As AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory).%New()
+	#dim ProductData1 As AXimpl.Admin.VKP.SalesPriceService.ProductData = ProductDataFactory.MaakProductData("ProductNummer1", "")
+	#dim ProductData2 As AXimpl.Admin.VKP.SalesPriceService.ProductData = ProductDataFactory.MaakProductData("ProductNummer2", "")
+	#dim ProductData3 As AXimpl.Admin.VKP.SalesPriceService.ProductData = ProductDataFactory.MaakProductData("ProductNummer3", "")
+	
+	#dim ProductDataLijst As AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst).%New()
+	Do ProductDataLijst.Insert(ProductData1)
+	Do ProductDataLijst.Insert(ProductData2)
+	Do ProductDataLijst.Insert(ProductData3)
+	
+	#dim ProductData As AXimpl.Admin.VKP.SalesPriceService.ProductData = ProductDataLijst.FindByMessageId(ProductData2.MessageId)
+	
+	Do $$$AssertEquals(ProductData2, ProductData)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/Admin/VKP/SalesPriceService/ProductDataLijst.cls.xml
===================================================================
diff -u
--- AXimpl/Admin/VKP/SalesPriceService/ProductDataLijst.cls.xml	(revision 0)
+++ AXimpl/Admin/VKP/SalesPriceService/ProductDataLijst.cls.xml	(revision 50895)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Admin.VKP.SalesPriceService.ProductDataLijst">
+<Super>%ListOfDataTypes</Super>
+
+<Property name="LookupTabel">
+<Type>TECH.MultiDim</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+</Property>
+
+<Method name="Insert">
+<FormalSpec>ProductData:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##super(ProductData)
+	
+	Set ..LookupTabel(ProductData.MessageId) = ProductData
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="FindByMessageId">
+<FormalSpec>MessageId:%String</FormalSpec>
+<ReturnType>AXimpl.Admin.VKP.SalesPriceService.ProductData</ReturnType>
+<Implementation><![CDATA[	Quit ..LookupTabel(MessageId)
+]]></Implementation>
+</Method>
+
+<Storage name="Custom">
+<Type>%Library.CompleteCustomStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/ProductDataFactory/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/ProductDataFactory/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Admin/VKP/SalesPriceService/ProductDataFactory/Test.cls.xml	(revision 50895)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: MaakProductData">
+<Implementation><![CDATA[
+	#dim RandomProductNummer As %String = "RandomProductNummer"
+	#dim RandomCifPpl As %String = "RandomCifPpl"
+	#dim RandomMessageId As %String = "RandomMessageId"
+	
+	#dim MessageManagerMock As vhTest.Mock.AXimpl.MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
+	Do MessageManagerMock.VerwachtMethodCall("GenerateID").DanReturn(RandomMessageId)
+	
+	#dim ProductDataFactory As AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory = ##class(AXimpl.Admin.VKP.SalesPriceService.ProductDataFactory).%New(MessageManagerMock)
+	#dim ProductData As AXimpl.Admin.VKP.SalesPriceService.ProductData = ProductDataFactory.MaakProductData(RandomProductNummer, RandomCifPpl)
+	
+	Do $$$AssertEquals(ProductData.ProductNummer, RandomProductNummer)
+	Do $$$AssertEquals(ProductData.CifPpl, RandomCifPpl)
+	Do $$$AssertEquals(ProductData.MessageId, RandomMessageId)
+	
+	Do MessageManagerMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>