Index: vhUnitTest/vhConsistency/Checks/Bouwstenen.cls.xml
===================================================================
diff -u
--- vhUnitTest/vhConsistency/Checks/Bouwstenen.cls.xml	(revision 0)
+++ vhUnitTest/vhConsistency/Checks/Bouwstenen.cls.xml	(revision 1688)
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.vhConsistency.Checks.Bouwstenen">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestCorrectProduct">
+<Description>
+do ##class(vhUnitTest.Manager).RunTest("/Display=all","vhConsistency.Checks")</Description>
+<Implementation><![CDATA[
+	do mpTestCorrectProduct
+	
+	set BouwsteenCheck = ##class(vhConsistency.Checks.Bouwstenen).%New()
+	do BouwsteenCheck.ControlePRBSBSOne(1000)
+	do BouwsteenCheck.ControlePRBSIPOne(1001)
+	do BouwsteenCheck.ControlePRBSIPOne(1002)
+	do BouwsteenCheck.ControlePRLINKDOne(1000)
+	do BouwsteenCheck.ControlePRLINKIKMOne(1001)
+	do BouwsteenCheck.ControlePRLINKIKMOne(1002)
+	do $$$AssertEquals(BouwsteenCheck.GeefAantalMeldingen(),0,"er mogen geen fouten gevonden zijn")
+	
+	do vpTestCorrectProduct
+	quit
+	
+mpTestCorrectProduct	
+	set ^PRBS("BS",1000)="M\KP"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           
+	set ^PRBS("BS",1000,"KIND.001")="1001\1\K\\\\\\\\P\"
+	set ^PRBS("BS",1000,"KIND.002")="1002\1\K\\\\\\\\P\"
+	
+	set ^PRBS("IP",1001,1000,"KIND.001")="K"
+	set ^PRBS("IP",1002,1000,"KIND.002")="K"
+	
+	set ^PRLINK("D",1000,1001)="1\"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
+	set ^PRLINK("D",1000,1002)="1\"
+	
+	set ^PRLINK("IKM",1001,1000)=""                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
+	set ^PRLINK("IKM",1002,1000)=""                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
+	
+	quit	
+
+vpTestCorrectProduct
+	kill ^PRBS("BS",1000)
+	kill ^PRBS("IP",1001)
+	kill ^PRBS("IP",1002)
+	
+	kill ^PRLINK("D",1000)
+	
+	kill ^PRLINK("IKM",1001)
+	kill ^PRLINK("IKM",1002)
+	
+	quit
+]]></Implementation>
+</Method>
+
+<Method name="TestFoutAantal">
+<Implementation><![CDATA[
+	do mpTestFoutAantal
+	
+	set BouwsteenCheck = ##class(vhConsistency.Checks.Bouwstenen).%New()
+	do BouwsteenCheck.ControlePRBSBSOne(1000)
+	do BouwsteenCheck.ControlePRBSIPOne(1001)
+	do BouwsteenCheck.ControlePRBSIPOne(1002)
+	do BouwsteenCheck.ControlePRLINKDOne(1000)
+	do BouwsteenCheck.ControlePRLINKIKMOne(1001)
+	do BouwsteenCheck.ControlePRLINKIKMOne(1002)
+	do $$$AssertEquals(BouwsteenCheck.GeefAantalMeldingen(),2,"Controle aantal meldingen")
+	set strMelding = BouwsteenCheck.GeefMelding()
+	do strMelding.Rewind()
+	do $$$AssertEquals(BouwsteenCheck.GeefInterneMelding(1),"^PRLINK(""D"",1000,1001) - aantal verschillend","Melding 1")
+	do $$$AssertEquals(BouwsteenCheck.GeefInterneMelding(2),"^PRBS(""BS"",1000,""KIND.001"") - aantal verschillend","Melding 2")
+	
+	do vpTestFoutAantal
+	quit
+	
+mpTestFoutAantal
+	set ^PRBS("BS",1000)="M\KP"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           
+	set ^PRBS("BS",1000,"KIND.001")="1001\2\K\\\\\\\\P\"
+	set ^PRBS("BS",1000,"KIND.002")="1002\1\K\\\\\\\\P\"
+	
+	set ^PRBS("IP",1001,1000,"KIND.001")="K"
+	set ^PRBS("IP",1002,1000,"KIND.002")="K"
+	
+	set ^PRLINK("D",1000,1001)="1\"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
+	set ^PRLINK("D",1000,1002)="1\"
+	
+	set ^PRLINK("IKM",1001,1000)=""                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
+	set ^PRLINK("IKM",1002,1000)=""                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
+	
+	quit	
+
+vpTestFoutAantal
+	kill ^PRBS("BS",1000)
+	kill ^PRBS("IP",1001)
+	kill ^PRBS("IP",1002)
+	
+	kill ^PRLINK("D",1000)
+	
+	kill ^PRLINK("IKM",1001)
+	kill ^PRLINK("IKM",1002)
+	
+	quit
+]]></Implementation>
+</Method>
+
+<Method name="aTestC">
+<Implementation><![CDATA[	write "C",!
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhConsistency/Check.cls.xml
===================================================================
diff -u -r1327 -r1688
--- vhConsistency/Check.cls.xml	(.../Check.cls.xml)	(revision 1327)
+++ vhConsistency/Check.cls.xml	(.../Check.cls.xml)	(revision 1688)
@@ -31,7 +31,7 @@
 	Set Stream = ##class(%GlobalCharacterStream).%New()
 	
 	Do Stream.Write(##this.%ClassName(1)_" : GEFAALD"_$C(10,13))
-	If ($Data(..MeldingNr)){
+	If (..MeldingNr) > 0 {
 		For i = 0 : 1 : (..MeldingNr-1) {
 			If ($Data(^HULP($Job,"Melding",i))){
 				Do Stream.Write($C(9)_^HULP($Job,"Melding",i))
@@ -45,10 +45,15 @@
 <Method name="VoegMeldingToe">
 <FormalSpec>Melding:%String</FormalSpec>
 <Implementation><![CDATA[
-	If ('$Data(..MeldingNr)) Set ..MeldingNr = 0 w "..MeldingNr : "_..MeldingNr,!
 	Set ^HULP($Job,"Melding",..MeldingNr) = Melding_$C(10,13)
 	Set ..MeldingNr = ..MeldingNr + 1
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAantalMeldingen">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..MeldingNr
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhConsistency/Checks/Bouwstenen.cls.xml
===================================================================
diff -u
--- vhConsistency/Checks/Bouwstenen.cls.xml	(revision 0)
+++ vhConsistency/Checks/Bouwstenen.cls.xml	(revision 1688)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhConsistency.Checks.Bouwstenen">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhConsistency.Check</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Status">
+<Type>%Status</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="InterneMeldingen">
+<Type>%String</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
+<Method name="VoerUit">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	do ..ControleerBouwstenen()
+	quit ..Status
+]]></Implementation>
+</Method>
+
+<Method name="ControleerBouwstenen">
+<Implementation><![CDATA[
+	do ..ControlePRBSBS()
+	do ..ControlePRBSIP()
+	do ..ControlePRLINKD()
+	do ..ControlePRLINKIKM()
+	quit ..Status
+]]></Implementation>
+</Method>
+
+<Method name="ControlePRBSBS">
+<Implementation><![CDATA[
+	Set MPRNr=1
+	While MPRNr {
+		Set MPRNr=$O(^PRBS("BS",MPRNr))
+		Continue:'MPRNr
+		do ..ControlePRBSBSOne(MPRNr)
+	}
+	
+	quit ..Status
+]]></Implementation>
+</Method>
+
+<Method name="ControlePRBSIP">
+<Implementation><![CDATA[
+	Set KPRNr=1
+	While KPRNr {
+		Set KPRNr=$O(^PRBS("IP",KPRNr))
+		Continue:'KPRNr
+		do ..ControlePRBSIPOne(KPRNr)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ControlePRLINKD">
+<Implementation><![CDATA[
+	Set MPRNr=1
+	While MPRNr {
+		Set MPRNr=$O(^PRLINK("D",MPRNr))
+		Continue:'MPRNr
+		do ..ControlePRLINKDOne(MPRNr)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ControlePRLINKIKM">
+<Implementation><![CDATA[
+	Set KPRNr=1
+	While KPRNr {
+		Set KPRNr=$O(^PRLINK("IKM",KPRNr))
+		Continue:'KPRNr
+		do ..ControlePRLINKIKMOne(KPRNr)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ControlePRBSBSOne">
+<FormalSpec>MPRNr:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	; Controle ^PRBS("BS") tov ^PRBS("IP") en ^PRLINK("D")
+		Set BSKey=" "
+		While $L(BSKey) {
+			Set BSKey=$O(^PRBS("BS",MPRNr,BSKey))
+			Continue:BSKey=""
+			Set KPRNr=$P(^PRBS("BS",MPRNr,BSKey),"\",1)
+			Continue:'KPRNr
+			Set BSType=$P(^PRBS("BS",MPRNr,BSKey),"\",3)
+			If BSType'="K",BSType'="H" Continue
+			If $G(^PRBS("IP",KPRNr,MPRNr,BSKey))'=BSType Do ..VoegErrorMeldingToe($ZR,"type bouwsteen verschillend")
+			Continue:BSType'="K"
+			Set Aantal=$P(^PRBS("BS",MPRNr,BSKey),"\",2)
+			Continue:'Aantal
+			Set OrgVerp=$P(^PRBS("BS",MPRNr,BSKey),"\",12)
+			If $P($G(^PRLINK("D",MPRNr,KPRNr)),"\",1)'=Aantal  Do ..VoegErrorMeldingToe($ZR,"aantal verschillend")
+			If $P($G(^PRLINK("D",MPRNr,KPRNr)),"\",2)'=OrgVerp  Do ..VoegErrorMeldingToe($ZR,"Orgaluxverpakking onbekend")
+		}
+]]></Implementation>
+</Method>
+
+<Method name="ControlePRBSIPOne">
+<FormalSpec>KPRNr:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set MPRNr=1
+	While MPRNr {
+		Set MPRNr=$O(^PRBS("IP",KPRNr,MPRNr))
+		Continue:'MPRNr
+		Set BSKey=" "
+		While $L(BSKey) {
+			Set BSKey=$O(^PRBS("IP",KPRNr,BSKey))
+			Continue:BSKey=""
+			Set BSType=$P(^PRBS("IP",KPRNr,MPRNr,BSKey),"\",1)
+			If $P($G(^PRBS("BS",MPRNr,KPRNr,BSKey)),"\",3)'=BSType  Do ..VoegErrorMeldingToe($ZR,"type bouwsteen verschillend")
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ControlePRLINKDOne">
+<FormalSpec>MPRNr:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	
+	Set KPRNr=1
+	While KPRNr {
+		Set KPRNr=$O(^PRLINK("D",MPRNr,KPRNr))
+		Continue:'KPRNr
+		Set Aantal=$P(^PRLINK("D",MPRNr,KPRNr),"\",1)
+		Set OrgVerp=$P(^PRLINK("D",MPRNr,KPRNr),"\",2)
+		Set BSKey=$O(^PRBS("IP",KPRNr,MPRNr,""))
+		If BSKey=""  Do ..VoegErrorMeldingToe($ZR,"bouwsteen onbekend") Continue
+		Set:'$P($G(^PRBS("BS",MPRNr,BSKey)),"\",2) BSKey=$O(^PRBS("IP",KPRNr,MPRNr,""),-1)
+		If Aantal'=$P($G(^PRBS("BS",MPRNr,BSKey)),"\",2)  Do ..VoegErrorMeldingToe($ZR,"aantal verschillend")
+		If OrgVerp'=$P($G(^PRBS("BS",MPRNr,BSKey)),"\",12)  Do ..VoegErrorMeldingToe($ZR,"Orgaluxverpakking verschillend")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ControlePRLINKIKMOne">
+<FormalSpec>KPRNr:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	; Controle ^PRLINK("IKM") tov ^PRLINK("D")
+	Set MPRNr=1
+	While MPRNr {
+		Set MPRNr=$O(^PRLINK("IKM",KPRNr,MPRNr))
+		Continue:'MPRNr
+		If '$D(^PRLINK("D",MPRNr,KPRNr))  Do ..VoegErrorMeldingToe($ZR,"moederproduct onbekend")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegErrorMeldingToe">
+<FormalSpec>ZR,Melding</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set ..Status = $$$ERROR($$$GeneralError)
+	do ..InterneMeldingen.Insert(ZR_" - "_Melding)
+	do ..VoegMeldingToe(ZR_" - "_Melding)
+	quit
+]]></Implementation>
+</Method>
+
+<Method name="GeefInterneMelding">
+<FormalSpec>Nr:%Integer</FormalSpec>
+<Implementation><![CDATA[	quit ..InterneMeldingen.GetAt(Nr)
+]]></Implementation>
+</Method>
+</Class>
+</Export>