Index: zTryout/WV/PM/TBXBouwstenenFixer.cls.xml
===================================================================
diff -u -r34431 -r45622
--- zTryout/WV/PM/TBXBouwstenenFixer.cls.xml	(.../TBXBouwstenenFixer.cls.xml)	(revision 34431)
+++ zTryout/WV/PM/TBXBouwstenenFixer.cls.xml	(.../TBXBouwstenenFixer.cls.xml)	(revision 45622)
@@ -4,6 +4,107 @@
 <IncludeCode>vhLib.Macro</IncludeCode>
 <Super>TECH.RegisteredObject</Super>
 
+<Method name="VerwerkLijstVanBuiltInIds">
+<Description>
+Oproepen via 
+  Do ##class(zTryout.WV.PM.TBXBouwstenenFixer).%New().VerwerkLijstVanBuiltInIds() </Description>
+<Implementation><![CDATA[
+	Do ..VerwerkLijst( ..GeefBuiltInLijstProductIds(), "851568", "1719202" )
+	Do ..VerwerkLijst( ..GeefRugOnlyProductIds()     , "649159", "1719202" )
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkLijst">
+<FormalSpec><![CDATA[ProductIds:%ListOfDataTypes,FromRugId:%String,ToRugId:%String,&mdVervangenRugIds:%String]]></FormalSpec>
+<Implementation><![CDATA[
+	#dim OperatieScope As TECH.OperatieScope = ##class(TECH.OperatieScope).StartMetTx()
+	Kill mdVervangenRugIds
+
+	Try {			
+		Set Iterator = ##class(TECH.ListIterator).%New(ProductIds)
+		While (Iterator.HasNext()) {
+			#dim ProductId As %String = Iterator.Next()
+
+			#dim GADataId As %String = ""
+			Continue:($$$Not(..CheckGADataExists(ProductId,.GADataId)))
+			
+			Write !,"  "_GADataId
+			
+			Set mdVervangenRugIds(ProductId,"A")= GADataId
+			If $$$Not($LG($G(^Prod.GAData.ProductD(GADataId,"I","PR1DIM017")),1) = "PRRUGHS") {
+				#dim GADataProduct As Prod.GAData.Product = ##class(Prod.GAData.Product).OpenWithCalc(GADataId)
+				Set GADataProduct = ""
+				Set mdVervangenRugIds("CHECK",ProductId) = "GADataProduct '"_GADataId_"' recalced."
+			}
+			
+			If $$$Not($LG($G(^Prod.GAData.ProductD(GADataId,"I","PR1DIM017")),1) = "PRRUGHS") {
+				Set mdVervangenRugIds("CHECK",ProductId) = GADataId_" - PR1DIM017 is geen RugHS."
+				Continue
+			}
+			If $LG($G(^Prod.GAData.ProductD(GADataId,"I","PR1DIM017")),6) = "" {
+				Set mdVervangenRugIds("CHECK",ProductId) = GADataId_" - PR1DIM017 geen fixedIds."
+				Continue
+			}
+			#dim OrigRugId As %String = $G(^Prod.GAData.ProductD(GADataId,"I","PR1DIM017","P","PRNr"))
+			If OrigRugId = ToRugId {
+				Continue
+			}
+			If $$$Not(OrigRugId = FromRugId) {
+				Set mdVervangenRugIds("CHECK",ProductId) = GADataId_" - PR1DIM017 PRNr is niet het verwachte RugID : '"_OrigRugId_"'. "
+				Continue
+			}
+			Set ^Prod.GAData.ProductD(GADataId,"I","PR1DIM017","P","PRNr") = ToRugId
+			Set mdVervangenRugIds(ProductId,"B") = "From "_OrigRugId_" to "_ToRugId_"."
+			Write !,ProductId_ ": From "_OrigRugId_" to "_ToRugId_"."
+		}
+		
+		If $D(mdVervangenRugIds("CHECK")) {
+			Write !!,"*** AANDACHT *** ",!
+			zw mdVervangenRugIds("CHECK")
+			Write !,"Meldingen bij het vervangen van RugIds."
+		}
+
+		Do OperatieScope.Gelukt()
+
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do OperatieScope.Gefaald() 
+		Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefBuiltInLijstProductIds">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	;Quit ##class(TECH.ListUtils).CreateListOfDataTypes( 684101, 692147, 1700578, 733779, 733781 )   ; Test-reeks 
+	
+	#dim lbProductIds As %List = $LB(
+		684101, 692147, 733779, 902385, 902386, 906176, 906398, 906399, 907433, 907437, 907438, 907439, 907441, 907442, 907443, 913094, 913645, 913646, 913647, 
+		913648, 913653, 913656, 913660, 913661, 923434, 923436, 923437, 923441, 937835, 937842, 939786, 942898, 943175, 943176, 943177, 957230, 957231, 957232, 957234, 957235, 
+		957236, 957238, 957239, 957240, 957241, 957243, 957244, 957245, 957246, 967373, 967374, 981902, 
+		1062210, 1074469, 1074478, 1074479, 1080775, 1103213, 1120491, 1124311, 1126419, 1126420, 1138803, 1148977, 1177165, 1177166, 1197170, 1198789, 1198802, 1198804, 1253205, 
+		1261994, 1261995, 1261996, 1274831, 1288410, 1288413, 1288415, 1307217, 1310877, 1408608, 1444300, 1504394, 1565004, 1570023, 1623286, 1688308, 1707587, 1722140, 1741103
+	)
+
+	Quit ##class(TECH.ListUtils).ListbuildToList(lbProductIds)
+	
+	;Set TeHerrekenenProductIDs = ##class(%ListOfDataTypes).%New()
+	;Do TeHerrekenenProductIDs.Insert(1701933)
+	;Quit TeHerrekenenProductIDs
+]]></Implementation>
+</Method>
+
+<Method name="GeefRugOnlyProductIds">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListUtils).CreateListOfDataTypes(733781, 733786)
+]]></Implementation>
+</Method>
+
 <Method name="RecalcAllTOBFabrPrep">
 <Description>
 Oproepen via 
@@ -45,8 +146,8 @@
 <FormalSpec><![CDATA[PRNr:%String,&GADataID:%String]]></FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Set GADataID=$P(^KPR(PRNr,"G"),"\",13)
-	#dim blnExists As %Boolean = ##class(Prod.GAData.Product).%ExistsId(GADataID)
+	Set GADataID=$P($G(^KPR(PRNr,"G")),"\",13)
+	#dim blnExists As %Boolean = $L(GADataID) && (##class(Prod.GAData.Product).%ExistsId(GADataID))
 	If $$$Not(blnExists) {
 		// No persistent object for GADataID 
 		Write !!,"Geen GAData Product gevonden voor PRNr "_PRNr_"  (GADataID="_GADataID_"). ",!