Index: AX/Uitgaand/PM/GtinCode/impl/GtinCodeIteratorFilter.cls.xml
===================================================================
diff -u -r48126 -r48294
--- AX/Uitgaand/PM/GtinCode/impl/GtinCodeIteratorFilter.cls.xml	(.../GtinCodeIteratorFilter.cls.xml)	(revision 48126)
+++ AX/Uitgaand/PM/GtinCode/impl/GtinCodeIteratorFilter.cls.xml	(.../GtinCodeIteratorFilter.cls.xml)	(revision 48294)
@@ -18,6 +18,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductApi">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -26,6 +31,7 @@
 <Implementation><![CDATA[
 	Set ..SoprIteratorFilter = ##class(AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
 	Set ..IsOngewenstProductInMigratieFilter = ##class(AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
+	Set ..ProductApi = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	Set ..BarcodeWaardeLijst = ##class(%ListOfDataTypes).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -35,7 +41,8 @@
 <FormalSpec>Item:TECH.ResultSet</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(Item.GetData(1))
+	#dim ProductNr As %String = ..ProductApi.GeefProductIdVoorIdentNummer(Item.GetData(1))
+	Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(ProductNr)
 	#dim IsValid As %Boolean = $$$False
 	
 	If ((Product.Basis.BarcodeWaarde > 0) && ..SoprIteratorFilter.IsValid(Product) && $$$Not(..IsOngewenstProductInMigratieFilter.IsValid(Product)) && (..IsUniekeBarcode(Product))) {
Index: AX/Uitgaand/PM/GtinCode/impl/GtinCodeIterator.cls.xml
===================================================================
diff -u -r48051 -r48294
--- AX/Uitgaand/PM/GtinCode/impl/GtinCodeIterator.cls.xml	(.../GtinCodeIterator.cls.xml)	(revision 48051)
+++ AX/Uitgaand/PM/GtinCode/impl/GtinCodeIterator.cls.xml	(.../GtinCodeIterator.cls.xml)	(revision 48294)
@@ -30,6 +30,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductApi">
+<Type>DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ResultSet">
 <Type>TECH.ResultSet</Type>
 <Private>1</Private>
@@ -50,6 +55,7 @@
 	Set ..AxEntiteitLogger = $$$Inject(AxEntiteitLogger,##class(AX.Uitgaand.PM.impl.LoggerProductenMigratie).%New())
 	Do ..AxEntiteitLogger.ResetLoggingAxEntiteit(..AxEntiteit, ..Vestiging)
 	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
+	Set ..ProductApi = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	Do ..VoerUitQuery()
 	Set Filter = ##class(AX.Uitgaand.PM.GtinCode.impl.GtinCodeIteratorFilter).%New()
 	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
@@ -63,11 +69,9 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND KortTekst NOT LIKE 'IO%' AND (NonAktief IS null OR NonAktief = '2')"
-	_" UNION SELECT ID FROM Prod.Product WHERE GenerischeRoutine = '254796' UNION SELECT ID FROM Prod.Product WHERE ID = '1804877'"
-	/*_" and ID in (1432226,1432225,1425096,1425095,682391,1359867,1168696,1168689,830507,1155640,161442,906194,709825,924268,"
-	_"1124771,1038806,1039173,1039208,1247980,353741,353743,353744,254245,254258,1259381,161441,665626,1067709,1067714,268026,"
-	_"1168369,668615,878186,878220,1169509,1194443,383880,830257)"*/
+	Set SqlStatement = "SELECT IdentNummer,ID FROM Prod.Product WHERE isnull(Gentype,'')='' and korttekst not like 'GEN%' AND KortTekst NOT LIKE 'IO%' "
+	_"AND (NonAktief IS null OR NonAktief = '2') UNION SELECT IdentNummer,ID FROM Prod.Product WHERE GenerischeRoutine = '254796' "
+	_"UNION SELECT IdentNummer,ID FROM Prod.Product WHERE ID = '1804877' ORDER BY IdentNummer"
 	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
 ]]></Implementation>
 </Method>
@@ -81,7 +85,8 @@
 <Method name="Next">
 <ReturnType>AXdixf.GtinCode.GtinCode</ReturnType>
 <Implementation><![CDATA[
-	set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next().GetData(1))
+	#dim ProductNr As %String = ..ProductApi.GeefProductIdVoorIdentNummer(..DynIterator.Next().GetData(1))
+	Set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(ProductNr)
 	#dim ConvertedProduct As AXdixf.GtinCode.GtinCode = ..Converter.Convert(Product)
 	
 	Do ..AxEntiteitLogger.LogAxEntiteit(Product.Basis.ProductNr, ..AxEntiteit, ..Vestiging)