Index: zTryout/WV/PM/KAD/RecalcBS.cls.xml
===================================================================
diff -u -r44330 -r44346
--- zTryout/WV/PM/KAD/RecalcBS.cls.xml	(.../RecalcBS.cls.xml)	(revision 44330)
+++ zTryout/WV/PM/KAD/RecalcBS.cls.xml	(.../RecalcBS.cls.xml)	(revision 44346)
@@ -17,18 +17,47 @@
 
 <Method name="VerwerkLijst">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>ProductIds:%ListOfDataTypes</FormalSpec>
+<FormalSpec><![CDATA[ProductIds:%ListOfDataTypes,&mdPrijzenRecalcBS:%String]]></FormalSpec>
 <Implementation><![CDATA[
 	#dim OperatieScope As TECH.OperatieScope = ##class(TECH.OperatieScope).StartMetTx()
+	Kill mdPrijzenRecalcBS
 
 	Try {			
 		Set Iterator = ##class(TECH.ListIterator).%New(ProductIds)
 		While (Iterator.HasNext()) {
 			#dim PRNr As %String = Iterator.Next()
+			#dim GADataProd As Prod.GAData.Product = ""
 			Continue:($$$PRGet($$$KortTekst)?1"GEN.HAL".E)
-			Do ..RebuildBouwSteenFromWizard(PRNr)
-			Write !,"Rebuild van "_PRNr
+
+			Set mdPrijzenRecalcBS(PRNr,"A")= $$$PRGet($$$CifPPLEUR)
+			Do ..RebuildBouwSteenFromWizard(PRNr, , .GADataProd)
+			If $IsObject(GADataProd) { Set mdPrijzenRecalcBS(PRNr,"B") = GADataProd.CalcKostAll()  }
+			
+			#dim PrijsDelta = $J(mdPrijzenRecalcBS(PRNr,"A") - $G(mdPrijzenRecalcBS(PRNr,"B")) ,0,4)
+			#dim LadeInfo As %String = $LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"KLAS"))_ "    "_$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"ODSP"))
+			Write !,"Rebuild van "_PRNr_ " Delta: "_ PrijsDelta
+			;write !
+			;zw mdPrijzenRecalcBS(PRNr)
+			Set mdPrijzenRecalcBS(PRNr,"Delta") = PrijsDelta
+			
+			If $$$Not($D(mdPrijzenRecalcBS(PRNr,"B"))) {
+				Set i = $Increment(mdPrijzenRecalcBS("CHECK"))
+				Set mdPrijzenRecalcBS("CHECK",PRNr)="Fout in berekening!" _ "   - " _ LadeInfo
+			}
+			ElseIf $$$Not($$$ValIsBetween(PrijsDelta,0.10,0.75)) {
+				Set i = $Increment(mdPrijzenRecalcBS("CHECK"))
+				Set mdPrijzenRecalcBS("CHECK",PRNr)=$J(PrijsDelta,9) _ "   - " _ LadeInfo
+				Merge mdPrijzenRecalcBS("CHECKD",PRNr)=mdPrijzenRecalcBS(PRNr)
+			}
+			;write !
+			
 		}
+		
+		If $D(mdPrijzenRecalcBS("CHECK")) {
+			Write !!,"*** AANDACHT *** ",!
+			zw mdPrijzenRecalcBS("CHECK")
+			Write !,"Prijsverschil ligt buiten de verwachte marges."
+		}
 
 		Do OperatieScope.Gelukt()
 
@@ -45,6 +74,8 @@
 <Private>1</Private>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
+	Quit ##class(TECH.ListUtils).CreateListOfDataTypes( 1700578, 1700579, 1700580, 1700584, 1701964 )   ; Test-reeks 
+	
 	#dim lbProductIds As %List = $LB(
 		1700578, 1700579, 1700580, 1700584, 1700585, 1700586, 1700604, 1700605, 1700606, 1700607, 1700608, 1700609, 1700610, 1700611, 1700612, 1700613, 1700614, 1700658, 1700659, 
 		1700660, 1700661, 1700662, 1700663, 1700664, 1700665, 1700666, 1700667, 1700668, 1700669, 1700670, 1700671, 1700672, 1700673, 1700674, 1700679, 1700680, 1700681, 1700682, 
@@ -335,14 +366,14 @@
 <Description>
   d ##class(zTryout.WV.PM.KAD.RecalcBS).Do() </Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>PRNr:%String,NoSa:%String="N"</FormalSpec>
+<FormalSpec><![CDATA[PRNr:%String,NoSa:%String="N",&GADataProd:Prod.GAData.Product]]></FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	Kill Gen
 	New GenTyp,MPRNr
 	Set GenTyp=$P($$GENTYP^HAD(PRNr),"\",1,2)
 	Set MPRNr=PRNr
-	Do RebuildBouwSteenFromWizard^PRBS(NoSa)
+	Do RebuildBouwSteenFromWizard^PRBS(NoSa,.GADataProd)   ; Herberekende GAData Product teruggeven via .local 
 	Quit
 ]]></Implementation>
 </Method>