Index: APPS/Halux/PPS/TAORProductie/ZijkantTester/impl/Metingen.cls.xml
===================================================================
diff -u -r51707 -r54526
--- APPS/Halux/PPS/TAORProductie/ZijkantTester/impl/Metingen.cls.xml	(.../Metingen.cls.xml)	(revision 51707)
+++ APPS/Halux/PPS/TAORProductie/ZijkantTester/impl/Metingen.cls.xml	(.../Metingen.cls.xml)	(revision 54526)
@@ -17,9 +17,15 @@
 </Property>
 
 <Property name="ProductID">
+<Description>
+In  AX : IdentNr::ConfigID::</Description>
 <Type>%String</Type>
 </Property>
 
+<Property name="PRNr">
+<Type>%String</Type>
+</Property>
+
 <Property name="KlantID">
 <Type>%String</Type>
 </Property>
@@ -56,38 +62,160 @@
 <Type>%TimeStamp</Type>
 </Property>
 
-<Property name="DiepteMeting">
+<Property name="Werkpost">
+<Type>%String</Type>
+</Property>
+
+<UDLText name="T">
+<Content><![CDATA[/* METING DATA */
+]]></Content>
+</UDLText>
+
+<Property name="MetingDiepte">
 <Type>%Decimal</Type>
 </Property>
 
-<Property name="HoogteMetingVoor">
+<Property name="FoutDiepte">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="MetingHoogteCode">
+<Type>%String</Type>
+</Property>
+
+<Property name="MetingHoogteVoor">
 <Type>%Decimal</Type>
 </Property>
 
-<Property name="HoogteMetingAchter">
+<Property name="MetingHoogteAchter">
 <Type>%Decimal</Type>
 </Property>
 
-<Property name="DikteMeting">
+<Property name="FoutHoogteVoor">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="FoutHoogteAchter">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="MetingDikte">
 <Type>%Decimal</Type>
 </Property>
 
-<Property name="FrontHaakOnder">
+<Property name="FoutDikte">
 <Type>%Boolean</Type>
 </Property>
 
-<Property name="FrontHaakBoven">
+<Property name="MetingFrontHaakOnderIn">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="MetingFrontHaakOnderuit">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="FoutFrontHaakOnderLP">
 <Type>%Boolean</Type>
 </Property>
 
-<Property name="GestoptOpStap">
-<Type>%Integer</Type>
+<Property name="FoutFrontHaakOnderHP">
+<Type>%Boolean</Type>
 </Property>
 
-<Property name="Werkpost">
-<Type>%String</Type>
+<Property name="MetingFrontHaakBovenIn">
+<Type>%Decimal</Type>
 </Property>
 
+<Property name="MetingFrontHaakBovenUit">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="FoutFrontHaakBovenLP">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="FoutFrontHaakBovenHP">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="FoutFraxinusGatFout">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="FoutFrontHakenNietTerug">
+<Type>%Boolean</Type>
+</Property>
+
+<UDLText name="T">
+<Content><![CDATA[/* INSTEL en TOLERANTIE DATA */
+]]></Content>
+</UDLText>
+
+<Property name="InstelPlankDikte">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHaak1In">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHaak1Uit">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHaak1NIn">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHaak1NUit">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHaak2In">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHaak2Uit">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelLengtePos">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelLengteNeg">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHoogtePos">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHoogteNeg">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelDiktePos">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelDikteNeg">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHaakPos">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHaakNeg">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="InstelHaakHP">
+<Type>%Decimal</Type>
+</Property>
+
 <Index name="Barcode">
 <Properties>BarcodeID</Properties>
 </Index>
@@ -100,8 +228,6 @@
 <IndexLocation>^APPS.Halux.PPS.TA90E2.MetingenI</IndexLocation>
 <StreamLocation>^APPS.Halux.PPS.TA90E2.MetingenS</StreamLocation>
 <Data name="MetingenDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>%%CLASSNAME</Value>
 </Value>
@@ -168,6 +294,117 @@
 <Value name="22">
 <Value>Werkpost</Value>
 </Value>
+<Value name="23">
+<Value>PRNr</Value>
+</Value>
+<Value name="24">
+<Value>MetingDiepte</Value>
+</Value>
+<Value name="25">
+<Value>FoutDiepteField</Value>
+</Value>
+<Value name="26">
+<Value>MetingHoogteCode</Value>
+</Value>
+<Value name="27">
+<Value>MetingHoogteVoor</Value>
+</Value>
+<Value name="28">
+<Value>MetingHoogteAchter</Value>
+</Value>
+<Value name="29">
+<Value>FoutHoogteVoor</Value>
+</Value>
+<Value name="30">
+<Value>FoutHoogteAchter</Value>
+</Value>
+<Value name="31">
+<Value>MetingDikte</Value>
+</Value>
+<Value name="32">
+<Value>FoutDikte</Value>
+</Value>
+<Value name="33">
+<Value>MetingFrontHaakOnderIn</Value>
+</Value>
+<Value name="34">
+<Value>MetingFrontHaakOnderuit</Value>
+</Value>
+<Value name="35">
+<Value>FoutFrontHaakOnderLP</Value>
+</Value>
+<Value name="36">
+<Value>FoutFrontHaakOnderHP</Value>
+</Value>
+<Value name="37">
+<Value>MetingFrontHaakBovenIn</Value>
+</Value>
+<Value name="38">
+<Value>MetingFrontHaakBovenUit</Value>
+</Value>
+<Value name="39">
+<Value>FoutFrontHaakBovenLP</Value>
+</Value>
+<Value name="40">
+<Value>FoutFrontHaakBovenHP</Value>
+</Value>
+<Value name="41">
+<Value>FoutFraxinusGatFout</Value>
+</Value>
+<Value name="42">
+<Value>FoutFrontHakenNietTerug</Value>
+</Value>
+<Value name="43">
+<Value>InstelPlankDikte</Value>
+</Value>
+<Value name="44">
+<Value>InstelHaak1In</Value>
+</Value>
+<Value name="45">
+<Value>InstelHaak1Uit</Value>
+</Value>
+<Value name="46">
+<Value>InstelHaak1NIn</Value>
+</Value>
+<Value name="47">
+<Value>InstelHaak1NUit</Value>
+</Value>
+<Value name="48">
+<Value>InstelHaak2In</Value>
+</Value>
+<Value name="49">
+<Value>InstelHaak2Uit</Value>
+</Value>
+<Value name="50">
+<Value>InstelLengtePos</Value>
+</Value>
+<Value name="51">
+<Value>InstelLengteNeg</Value>
+</Value>
+<Value name="52">
+<Value>InstelHoogtePos</Value>
+</Value>
+<Value name="53">
+<Value>InstelHoogteNeg</Value>
+</Value>
+<Value name="54">
+<Value>InstelDiktePos</Value>
+</Value>
+<Value name="55">
+<Value>InstelDikteNeg</Value>
+</Value>
+<Value name="56">
+<Value>InstelHaakPos</Value>
+</Value>
+<Value name="57">
+<Value>InstelHaakNeg</Value>
+</Value>
+<Value name="58">
+<Value>InstelHaakHP</Value>
+</Value>
+<Value name="59">
+<Value>FoutDiepte</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: APPS/Halux/PPS/TAORProductie/ZijkantTester/impl/MetingOpslaan.cls.xml
===================================================================
diff -u -r51707 -r54526
--- APPS/Halux/PPS/TAORProductie/ZijkantTester/impl/MetingOpslaan.cls.xml	(.../MetingOpslaan.cls.xml)	(revision 51707)
+++ APPS/Halux/PPS/TAORProductie/ZijkantTester/impl/MetingOpslaan.cls.xml	(.../MetingOpslaan.cls.xml)	(revision 54526)
@@ -35,12 +35,43 @@
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
 	set md=##class(APPS.Halux.PPS.TAORProductie.ZijkantTester.dto.MetingData).%New()
-	Set md.BarcodeID="ZMV35L96023"
+	Set md.BarcodeID="ZNV30R60314"
+
 	Set md.Diepte=444
-	Set md.HoogteAchter=333
-	Set md.HoogteVoor=222
-	Set md.FrontHaakOnder=1
-	Set md.GestoptOpStap=99
+	Set md.DiepteFout=0
+	Set md.HoogteCode="M"
+	Set md.HoogteVoor=333
+	Set md.HoogteAchter=334
+	Set md.HoogteVoorFout=0
+	Set md.HoogteAchterFout=0
+	Set md.Dikte=13.5
+	Set md.DikteFout=0
+	Set md.FrontHaakOnderIn=2.2
+	Set md.FrontHaakOnderuit=2.1
+	Set md.FrontHaakOnderLPFout=0
+	Set md.FrontHaakOnderHPFout=0
+	Set md.FrontHaakBovenIn=0
+	Set md.FrontHaakBovenUit=0
+	Set md.FrontHaakBovenLPfout=0
+	Set md.FrontHaakBovenHPfout=0
+	Set md.FraxinusGatFout=0
+	Set md.FrontHakenNietTerug=1
+	Set md.InstelPlankDikte=13
+	Set md.InstelHaak1In=0.3
+	Set md.InstelHaak1Uit=0.3
+	Set md.InstelHaak1NIn=0.2
+	Set md.InstelHaak1NUit=0.2
+	Set md.InstelHaak2In=0.4
+	Set md.InstelHaak2Uit=0.4
+	Set md.InstelLengtePos=0.5
+	Set md.InstelLengteNeg=0.5
+	Set md.InstelHoogtePos=0.5
+	Set md.InstelHoogteNeg=0.5
+	Set md.InstelDiktePos=0.3
+	Set md.InstelDikteNeg=0.3
+	Set md.InstelHaakPos=0.3
+	Set md.InstelHaakNeg=0.3
+	Set md.InstelHaakHP=0.5
 	d ##Class(APPS.Halux.PPS.TAORProductie.ZijkantTester.impl.MetingOpslaan).%New("TZT1").OpslaanMeting(md)
 ]]></Implementation>
 </Method>
@@ -50,11 +81,16 @@
 <Implementation><![CDATA[
 	Set ..MetingData=MetingData
 	Set ..InstellenData=##Class(APPS.Halux.PPS.TAORProductie.ZijkantTester.impl.OphalenData).%New(..Werkpost).OphalenData(..MetingData.BarcodeID)
+	If $IsObject(..InstellenData)
+	{
+		d DumpObject^%apiOBJ(..InstellenData)
 	Set ..Meting=##class(APPS.Halux.PPS.TAORProductie.ZijkantTester.impl.Metingen).%New()
 	
 	Do ..CopierenBasisData()
 	Do ..CopierenMetingData()
+	Do ..CopierenInstelData()
 	Do ..Meting.Save()
+	}
 ]]></Implementation>
 </Method>
 
@@ -63,29 +99,61 @@
 	Set ..Meting.BarcodeID=..InstellenData.BarcodeID
 	Set ..Meting.BatchID=..InstellenData.BatchID
 	Set ..Meting.KlantID=..InstellenData.KlantID
-	Set ..Meting.ProductID=..InstellenData.ProductID
+	Set ..Meting.PRNr=..InstellenData.ProductID
 	Set ..Meting.DossierCode=..InstellenData.DossierCode
 	Set ..Meting.Diepte=..InstellenData.Diepte
 	Set ..Meting.Hoogte=..InstellenData.Hoogte
-	Set ..Meting.LinksRechts=..InstellenData.LinksRechts
-	Set ..Meting.LaserLogo=..InstellenData.LaserLogo
+	Set ..Meting.LinksRechts=..InstellenData.Rol
+	Set ..Meting.LaserLogo=..InstellenData.HeeftLaserLogo
 	Set ..Meting.Opmerking=..InstellenData.Opmerking
+	Set ..Meting.TijdstipTest =$$$CurrentTimeStamp
 ]]></Implementation>
 </Method>
 
 <Method name="CopierenMetingData">
 <Implementation><![CDATA[
-	Set ..Meting.TijdstipTest =$$$CurrentTimeStamp
-	Set ..Meting.Werkpost=..Werkpost
-	Set ..Meting.DiepteMeting=..MetingData.Diepte
-	Set ..Meting.HoogteMetingVoor=..MetingData.HoogteVoor
-	Set ..Meting.HoogteMetingAchter=..MetingData.HoogteAchter
-	Set ..Meting.DikteMeting=..MetingData.Dikte
-	Set ..Meting.FrontHaakOnder=..MetingData.FrontHaakOnder
-	Set ..Meting.FrontHaakBoven=..MetingData.FrontHaakBoven
-	Set ..Meting.GestoptOpStap=..MetingData.GestoptOpStap
+	Set ..Meting.MetingDiepte = ..MetingData.Diepte
+	Set ..Meting.FoutDiepte = ..MetingData.DiepteFout
+	Set ..Meting.MetingHoogteCode = ..MetingData.HoogteCode
+	Set ..Meting.MetingHoogteVoor = ..MetingData.HoogteVoor
+	Set ..Meting.MetingHoogteAchter = ..MetingData.HoogteAchter
+	Set ..Meting.FoutHoogteVoor = ..MetingData.HoogteVoorFout
+	Set ..Meting.FoutHoogteAchter = ..MetingData.HoogteAchterFout
+	Set ..Meting.MetingDikte = ..MetingData.Dikte
+	Set ..Meting.FoutDikte = ..MetingData.DikteFout
+	Set ..Meting.MetingFrontHaakOnderIn = ..MetingData.FrontHaakOnderIn
+	Set ..Meting.MetingFrontHaakOnderuit = ..MetingData.FrontHaakOnderuit
+	Set ..Meting.FoutFrontHaakOnderLP = ..MetingData.FrontHaakOnderLPFout
+	Set ..Meting.FoutFrontHaakOnderHP = ..MetingData.FrontHaakOnderHPFout
+	Set ..Meting.MetingFrontHaakBovenIn = ..MetingData.FrontHaakBovenIn
+	Set ..Meting.MetingFrontHaakBovenUit = ..MetingData.FrontHaakBovenUit
+	Set ..Meting.FoutFrontHaakBovenLP = ..MetingData.FrontHaakBovenLPfout
+	Set ..Meting.FoutFrontHaakBovenHP = ..MetingData.FrontHaakBovenHPfout
+	Set ..Meting.FoutFraxinusGatFout = ..MetingData.FraxinusGatFout
+	Set ..Meting.FoutFrontHakenNietTerug = ..MetingData.FrontHakenNietTerug
 ]]></Implementation>
 </Method>
+
+<Method name="CopierenInstelData">
+<Implementation><![CDATA[
+	Set ..Meting.InstelPlankDikte = ..MetingData.InstelPlankDikte
+	Set ..Meting.InstelHaak1In = ..MetingData.InstelHaak1In
+	Set ..Meting.InstelHaak1Uit = ..MetingData.InstelHaak1Uit
+	Set ..Meting.InstelHaak1NIn = ..MetingData.InstelHaak1NIn
+	Set ..Meting.InstelHaak1NUit = ..MetingData.InstelHaak1NUit
+	Set ..Meting.InstelHaak2In = ..MetingData.InstelHaak2In
+	Set ..Meting.InstelHaak2Uit = ..MetingData.InstelHaak2Uit
+	Set ..Meting.InstelLengtePos = ..MetingData.InstelLengtePos
+	Set ..Meting.InstelLengteNeg = ..MetingData.InstelLengteNeg
+	Set ..Meting.InstelHoogtePos = ..MetingData.InstelHoogtePos
+	Set ..Meting.InstelHoogteNeg = ..MetingData.InstelHoogteNeg
+	Set ..Meting.InstelDiktePos = ..MetingData.InstelDiktePos
+	Set ..Meting.InstelDikteNeg = ..MetingData.InstelDikteNeg
+	Set ..Meting.InstelHaakPos = ..MetingData.InstelHaakPos
+	Set ..Meting.InstelHaakNeg = ..MetingData.InstelHaakNeg
+	Set ..Meting.InstelHaakHP = ..MetingData.InstelHaakHP
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/Halux/PPS/TAORProductie/ZijkantTester/dto/MetingData.cls.xml
===================================================================
diff -u -r51707 -r54526
--- APPS/Halux/PPS/TAORProductie/ZijkantTester/dto/MetingData.cls.xml	(.../MetingData.cls.xml)	(revision 51707)
+++ APPS/Halux/PPS/TAORProductie/ZijkantTester/dto/MetingData.cls.xml	(.../MetingData.cls.xml)	(revision 54526)
@@ -5,35 +5,183 @@
 
 <Property name="BarcodeID">
 <Type>%String</Type>
+<Parameter name="XMLNAME" value="barcodeIDField"/>
 </Property>
 
 <Property name="Diepte">
 <Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="diepteField"/>
 </Property>
 
+<Property name="DiepteFout">
+<Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="diepteFieldFout"/>
+</Property>
+
+<Property name="HoogteCode">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="hoogteCodeField"/>
+</Property>
+
 <Property name="HoogteVoor">
 <Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="hoogteVoorField"/>
 </Property>
 
 <Property name="HoogteAchter">
 <Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="hoogteAchterField"/>
 </Property>
 
+<Property name="HoogteVoorFout">
+<Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="hoogteVoorFout"/>
+</Property>
+
+<Property name="HoogteAchterFout">
+<Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="hoogteAchterFout"/>
+</Property>
+
 <Property name="Dikte">
 <Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="dikteField"/>
 </Property>
 
-<Property name="FrontHaakOnder">
+<Property name="DikteFout">
 <Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="dikteFout"/>
 </Property>
 
-<Property name="FrontHaakBoven">
+<Property name="FrontHaakOnderIn">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="frontHaakOnderIn"/>
+</Property>
+
+<Property name="FrontHaakOnderuit">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="frontHaakOnderuit"/>
+</Property>
+
+<Property name="FrontHaakOnderLPFout">
 <Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="frontHaakOnderLPFout"/>
 </Property>
 
-<Property name="GestoptOpStap">
-<Type>%Integer</Type>
+<Property name="FrontHaakOnderHPFout">
+<Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="frontHaakOnderHPFout"/>
 </Property>
+
+<Property name="FrontHaakBovenIn">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="frontHaakBovenIn"/>
+</Property>
+
+<Property name="FrontHaakBovenUit">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="frontHaakBovenUit"/>
+</Property>
+
+<Property name="FrontHaakBovenLPfout">
+<Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="frontHaakBovenLPfout"/>
+</Property>
+
+<Property name="FrontHaakBovenHPfout">
+<Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="frontHaakBovenHPfout"/>
+</Property>
+
+<Property name="FraxinusGatFout">
+<Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="FraxinusGatFout"/>
+</Property>
+
+<Property name="FrontHakenNietTerug">
+<Type>%Boolean</Type>
+<Parameter name="XMLNAME" value="frontHakenNietTerug"/>
+</Property>
+
+<Property name="InstelPlankDikte">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="PlankDikte"/>
+</Property>
+
+<Property name="InstelHaak1In">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="Haak1Uit"/>
+</Property>
+
+<Property name="InstelHaak1Uit">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="Haak1Uit"/>
+</Property>
+
+<Property name="InstelHaak1NIn">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="Haak1_N_In"/>
+</Property>
+
+<Property name="InstelHaak1NUit">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="Haak1_N_Uit"/>
+</Property>
+
+<Property name="InstelHaak2In">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="Haak2In"/>
+</Property>
+
+<Property name="InstelHaak2Uit">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="Haak2Uit"/>
+</Property>
+
+<Property name="InstelLengtePos">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="TolLengtePos"/>
+</Property>
+
+<Property name="InstelLengteNeg">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="TolLengteNeg"/>
+</Property>
+
+<Property name="InstelHoogtePos">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="TolHoogtePos"/>
+</Property>
+
+<Property name="InstelHoogteNeg">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="TolHoogteNeg"/>
+</Property>
+
+<Property name="InstelDiktePos">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="TolDiktePos"/>
+</Property>
+
+<Property name="InstelDikteNeg">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="TolDikteNeg"/>
+</Property>
+
+<Property name="InstelHaakPos">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="TolHaakPos"/>
+</Property>
+
+<Property name="InstelHaakNeg">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="TolHaakNeg"/>
+</Property>
+
+<Property name="InstelHaakHP">
+<Type>%Decimal</Type>
+<Parameter name="XMLNAME" value="TolHaakHP"/>
+</Property>
 </Class>