Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/Stringify/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/Stringify/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/Stringify/Test.cls.xml	(revision 72776)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter.Stringify.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Lege MaatwerkdetailsRequest geeft null">
+<Implementation><![CDATA[
+	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	#dim JsonStream As %Stream.GlobalBinary = EncowayJsonConverter.Stringify("")
+	#dim JsonString As %CacheString = JsonStream.Read()
+	
+	Do $$$AssertEquals(JsonString, "null")
+]]></Implementation>
+</Method>
+
+<Method name="Test: MaatwerkdetailsRequest wordt omgezet naar een JSON string">
+<Implementation><![CDATA[
+	#dim MaatwerkDetailsRequest As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsRequest = ..GeefMaatwerkDetailsRequest("123-abc")
+	
+	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	#dim JsonStream As %Stream.GlobalBinary = EncowayJsonConverter.Stringify(MaatwerkDetailsRequest)
+	#dim JsonString As %CacheString = JsonStream.Read()
+	
+	Do $$$AssertEquals(JsonString, " { ""klassenaam"":""WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsRequest"", ""CID"":""123-abc"", ""salesContext"": { ""klassenaam"":""WSimpl.PM.Maatwerk.MaatwerkService.Encoway.Dto.SalesContext""}}" )
+]]></Implementation>
+</Method>
+
+<Method name="GeefMaatwerkDetailsRequest">
+<FormalSpec>CID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsRequest</ReturnType>
+<Implementation><![CDATA[
+	Set GeefMaatwerkDetailsRequest = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsRequest).%New()
+	Set GeefMaatwerkDetailsRequest.CID = ##class(TECH.StringUtils).ToLower(CID)
+	Set GeefMaatwerkDetailsRequest.salesContext = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.Dto.SalesContext).%New()
+	
+	Quit GeefMaatwerkDetailsRequest
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml
===================================================================
diff -u -r72745 -r72776
--- WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72745)
+++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72776)
@@ -3,6 +3,11 @@
 <Class name="WSimpl.PM.Maatwerk.MaatwerkService.Encoway">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="EncowayJsonConverter">
+<Type>WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Logger">
 <Type>vhLib.Logger</Type>
 <Private>1</Private>
@@ -14,6 +19,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
 	Set ..Logger = ##class(vhLib.Logger).%New("BOMBOL Encoway")
 	
 	Quit $$$OK
@@ -24,29 +30,23 @@
 <FormalSpec>CID:TECH.String</FormalSpec>
 <ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
 <Implementation><![CDATA[
-	
 	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = ""
 	#dim BomBol As %Stream.GlobalBinary
 	
 	Try {
-		#dim GeefMaatwerkDetailsRequest As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsRequest = ..GeefMaatwerkDetailsRequest(CID)
-		#dim GeefMaatwerkDetailsJson As %String = ..ObjectToJson(GeefMaatwerkDetailsRequest)
-		#dim JsonStream = ##class(%Stream.GlobalBinary).%New()
+		#dim GeefMaatwerkDetailsRequestJsonStream = ..EncowayJsonConverter.Stringify(..GeefMaatwerkDetailsRequest(CID))	
+		Do ..Logger.Info("BOMBOL Encoway request JsonStream", GeefMaatwerkDetailsRequestJsonStream)
 		
-		Do JsonStream.Write(GeefMaatwerkDetailsJson)
-		
-		Do ..Logger.Info("BOMBOL Encoway request JsonStream", JsonStream)
-		
 		#dim HttpRequest As %Net.HttpRequest = ..GeefEncowayHttpRequest()	
-		Do HttpRequest.EntityBody.CopyFrom(JsonStream)
+		Do HttpRequest.EntityBody.CopyFrom(GeefMaatwerkDetailsRequestJsonStream)
 		
 		#dim StatusCode As %Status = HttpRequest.Get(..GeefEndpointOphalenVhConfig(CID),0)
 		Do ..ValidateResponse(StatusCode, HttpRequest)
 		
 		Set BomBol = HttpRequest.HttpResponse.Data
 		Do ..Logger.Info("BOMBOL Encoway response JsonStream", BomBol)
 		
-		Set VhConfig = ..ParseJsonStreamNaarVhConfig(BomBol)
+		Set VhConfig = ..EncowayJsonConverter.Parse(BomBol)
 		
 		Do ..Logger.Info("BOMBOL Encoway VHConfig", $$ObjToText^vhLib(VhConfig))
 	} Catch {
@@ -84,25 +84,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ObjectToJson">
-<FormalSpec>GeefProductRestRequest:WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsRequest</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim OutputJsonString As %String	
-	#dim ParseStatus As %Status = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(GeefProductRestRequest,,,.OutputJsonString)
-	
-	Quit OutputJsonString
-]]></Implementation>
-</Method>
-
 <Method name="GeefEncowayHttpRequest">
 <Private>1</Private>
 <ReturnType>%Net.HttpRequest</ReturnType>
 <Implementation><![CDATA[
 	Set HttpRequest = ##class(%Net.HttpRequest).%New()
  	Set HttpRequest.Server = ..GeefEncowayServerNaam()
  	Set HttpRequest.ContentType = "application/json"
- 	Set HttpRequest.Port = 1880
+ 	Set HttpRequest.Port = ..GeefEncowayPoort()
 	Set HttpRequest.Https = 0
 	Set HttpRequest.Timeout = 120
     	
@@ -125,6 +114,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefEncowayPoort">
+<Private>1</Private>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit 1880
+]]></Implementation>
+</Method>
+
 <Method name="ValidateResponse">
 <FormalSpec>Status:%Status,HttpRequest:%Net.HttpRequest</FormalSpec>
 <Private>1</Private>
@@ -143,35 +139,6 @@
 	}
 ]]></Implementation>
 </Method>
-
-<Method name="ParseJsonStreamNaarVhConfig">
-<FormalSpec>JsonStream:%Stream</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
-<Implementation><![CDATA[
-	
-	#dim VhConfigParsedFromJson As APPS.PM.Maatwerk.dto.VhConfig = ..ParseJsonStreamNaarObject(JsonStream, ##class(APPS.PM.Maatwerk.dto.VhConfig).%ClassName(1))
-	
-	Quit VhConfigParsedFromJson
-]]></Implementation>
-</Method>
-
-<Method name="ParseJsonStreamNaarObject">
-<FormalSpec>JsonStream:%Stream,RootObjectClassname:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>TECH.RegisteredObject</ReturnType>
-<Implementation><![CDATA[
-	#dim Object As TECH.RegisteredObject = ""
-	
-	Do JsonStream.Rewind()
-		
-	If $$$Not($IsObject(Object)) {
-		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("De method ParseJsonStreamNaarObject() heeft geen object opgeleverd voor klasse '"_RootObjectClassname_"' (JsonStream.length = '"_JsonStream.Size_"').")
-	}
-	
-	Quit Object
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/Parse/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/Parse/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/Parse/Test.cls.xml	(revision 72776)
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter.Parse.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Assign: Lege json-stream geeft leeg object">
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+LegeJsonStream  /* Test lege halffabrikaten en kosten 
+  {	}
+*/
+]]></Implementation>
+</Method>
+
+<Method name="Test: Lege json-stream geeft een leeg object">
+<Implementation><![CDATA[
+	#dim JsonStream As %Stream = ..GeefStream("LegeJsonStream")
+		
+	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream)
+	
+	If ($$$AssertTrue($IsObject(VhConfig))) {
+		Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig")
+		Do $$$AssertEquals(VhConfig.CID, "")
+		Do $$$AssertEquals(VhConfig.Model,"")
+		If $$$AssertTrue($IsObject(VhConfig.Context)) {
+			Do $$$AssertEquals(VhConfig.Context.Count(), 0)
+		}
+		If $$$AssertTrue($IsObject(VhConfig.Lijn)) {
+			Do $$$AssertEquals(VhConfig.Lijn.Count(), 0)
+		}
+		Do $$$AssertEquals(VhConfig.MaatwerkDetails,"")
+		Do $$$AssertEquals(VhConfig.BerekendeKenmerken,"")
+		Do $$$AssertEquals(VhConfig.isValid,"")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Assign: Ongeldige json-stream geeft error">
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+OngeldigeJsonStream  /* Test lege halffabrikaten en kosten 
+  {  
+	"UTOnbekendeProperty": null
+  }
+*/
+]]></Implementation>
+</Method>
+
+<Method name="Test: Ongeldige json-stream geeft error">
+<Implementation><![CDATA[
+	#dim JsonStream As %Stream = ..GeefStream("OngeldigeJsonStream")
+	
+	#dim CacheFoutInSysteemTaal As %String = $$ParseStatus^vhLib($$$ERROR(5002,"<PROPERTY DOES NOT EXIST>"))   ; EN="ERROR #5002: Cache error: <PROPERTY DOES NOT EXIST>" 
+																											   ; NL= "FOUT #5002: Caché fout : <PROPERTY DOES NOT EXIST>" 
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Parsen van het JSON bericht is gefaald", CacheFoutInSysteemTaal, "*UTOnbekendeProperty")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
+	
+	Set Parser = ##class(WSimpl.PM.Maatwerk.MaatwerkService.DotNet.MaatwerkDetailsFromJsonParser).%New()
+	Do Parser.GeefMaatwerkDetailsFromJson(JsonStream)
+]]></Implementation>
+</Method>
+
+<Method name="Assign: Kenmerken die null zijn in json-stream geven geen error">
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+NullableKenmerkenJsonStream  /* Test lege halffabrikaten en kosten 
+  {
+    "isValid": null,
+    "MaatwerkDetails": null,
+    "Kenmerken": null,
+    "Model": null,
+    "BerekendeKenmerken": null,
+    "CID": null
+  }
+*/
+]]></Implementation>
+</Method>
+
+<Method name="Test: Kenmerken die null zijn in json-stream geven geen error">
+<Implementation><![CDATA[
+	#dim JsonStream As %Stream = ..GeefStream("NullableKenmerkenJsonStream")
+	
+	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream)
+	
+	If ($$$AssertTrue($IsObject(VhConfig))) {
+		Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig")
+		Do $$$AssertEquals(VhConfig.CID, "")
+		Do $$$AssertEquals(VhConfig.Model,"")
+		If $$$AssertTrue($IsObject(VhConfig.Context)) {
+			Do $$$AssertEquals(VhConfig.Context.Count(), 0)
+		}
+		If $$$AssertTrue($IsObject(VhConfig.Lijn)) {
+			Do $$$AssertEquals(VhConfig.Lijn.Count(), 0)
+		}
+		Do $$$AssertEquals(VhConfig.MaatwerkDetails,"")
+		Do $$$AssertEquals(VhConfig.BerekendeKenmerken,"")
+		Do $$$AssertEquals(VhConfig.isValid,"")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Assign: Lege kenmerken geven geen error">
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+LegeKenmerkenJsonStream  /* Test lege halffabrikaten en kosten 
+  {
+    "isValid": null,
+    "MaatwerkDetails": {
+    	Halffabrikaten: {},
+        "Kosten": [],
+        "VerwijderdeHalffabItems": []
+    },
+    "Kenmerken": {},
+    "Model": null,
+    "BerekendeKenmerken": {},
+    "CID": null
+  }
+*/
+]]></Implementation>
+</Method>
+
+<Method name="Test: Lege kenmerken geven geen error">
+<Implementation><![CDATA[
+	#dim JsonStream As %Stream = ..GeefStream("LegeKenmerkenJsonStream")
+	
+	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream)
+	
+	If ($$$AssertTrue($IsObject(VhConfig))) {
+		Do $$$AssertEquals(VhConfig.%ClassName($$$True),"APPS.PM.Maatwerk.dto.VhConfig")
+		Do $$$AssertEquals(VhConfig.CID, "")
+		Do $$$AssertEquals(VhConfig.Model,"")
+		If $$$AssertTrue($IsObject(VhConfig.Context)) {
+			Do $$$AssertEquals(VhConfig.Context.Count(), 0)
+		}
+		If $$$AssertTrue($IsObject(VhConfig.Lijn)) {
+			Do $$$AssertEquals(VhConfig.Lijn.Count(), 0)
+		}
+		If $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) {
+			Do $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails))
+			Do $$$AssertEquals(VhConfig.MaatwerkDetails.Kosten.Count(), 0)
+			Do $$$AssertEquals(VhConfig.MaatwerkDetails.VerwijderdeHalffabItems.Count(), 0)
+		}
+		Do $$$AssertTrue($IsObject(VhConfig.BerekendeKenmerken))
+		Do $$$AssertEquals(VhConfig.isValid,"")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Assign: Ingevulde halffabrikaten">
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+IngevuldeHalffabrikatenJsonStream  /* Test lege halffabrikaten en kosten 
+  {
+    "isValid": true,
+    "MaatwerkDetails": {
+        "Halffabrikaten": {
+            "Verpakking.V1DoosMetDeksel": {
+                "Aantal": 1.139346,
+                "ProductId": "9.537.438.3",
+                "Korttekst": "VFF.TB143EB ZZCARTON   BR",
+                "Kenmerken": {
+                    "Samenstelling": "EB",
+                    "Kartonbreedte": "1430,00"
+                },
+                "Type": "Bewerkt",
+                "TeBekomenAantal": 1,
+                "AfmetingTeBekomen": 1244.6,
+                "AfmetingMetBewerkingVerlies": 1244.6,
+                "AfmetingAangerekendPerStuk": 1306.83,
+                "OpnemenInEindproduct": true,
+                "BuilderBepaaltOpnemenInEindproduct": false,
+                "NettoAfmetingHalffabrikaat": 1147,
+                "BrutoAfmetingHalffabrikaat": 1150,
+                "OmschrijvingVoorDocs": "V1 ladedoos",
+                "OmschrijvingVoorPicking": "Verpakking",
+                "BewerkingDimensies": {
+                    "Lengte": 1244.6
+                }
+            },
+            "FrontBevestiging": {
+                "Aantal": 2,
+                "ProductId": "0.705.488.1",
+                "Korttekst": "ZF7M70E2   FROB  V500  ZN",
+                "Kenmerken": {
+                    "Frontbevestiging": "E",
+                    "LadeHoogte": "M"
+                },
+                "Type": "Standaard",
+                "OpnemenInEindproduct": true,
+                "BuilderBepaaltOpnemenInEindproduct": false
+            }
+        },
+        "Kosten": [],
+        "VerwijderdeHalffabItems": []
+    },
+    "Kenmerken": null,
+    "Model": "M_LBX",
+    "BerekendeKenmerken": {},
+    "CID": "123abc"
+  }
+*/
+]]></Implementation>
+</Method>
+
+<Method name="Test: Ingevulde halffabrikaten">
+<Implementation><![CDATA[
+	#dim JsonStream As %Stream = ..GeefStream("IngevuldeHalffabrikatenJsonStream")
+	
+	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream)
+	
+	If ($$$AssertTrue($IsObject(VhConfig))) {
+		Do $$$AssertEquals(VhConfig.CID, "123abc")
+		Do $$$AssertEquals(VhConfig.Model,"M_LBX")
+		If $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) {
+			Do $$$AssertEquals(VhConfig.MaatwerkDetails.Halffabrikaten.Count(), 2)
+			
+			#dim Halffabrikaten As %Collection.ArrayOfObj = VhConfig.MaatwerkDetails.Halffabrikaten
+			#dim HalffabrikatenKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(Halffabrikaten)
+			
+			#dim FrontBevestigingKeyValuePair As TECH.KeyValuePair = HalffabrikatenKeyValueList.GetAt(1)
+			Do ..AssertHalffabrikaat(FrontBevestigingKeyValuePair, "FrontBevestiging", "Standaard", 2, "0.705.488.1", "ZF7M70E2   FROB  V500  ZN", $$$True, $$$False)
+			
+			#dim FrontBevestigingKenmerkenKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(FrontBevestigingKeyValuePair.Value.Kenmerken)
+			Do $$$AssertEquals(FrontBevestigingKenmerkenKeyValuePair.Count(), 2)
+			Do ..AssertKeyValuePair(FrontBevestigingKenmerkenKeyValuePair.GetAt(1), "Frontbevestiging", "E")
+			Do ..AssertKeyValuePair(FrontBevestigingKenmerkenKeyValuePair.GetAt(2), "LadeHoogte", "M")
+			
+			#dim V1DoosMetDekselKeyValuePair As TECH.KeyValuePair = HalffabrikatenKeyValueList.GetAt(2)
+			Do ..AssertHalffabrikaat(V1DoosMetDekselKeyValuePair, "Verpakking.V1DoosMetDeksel", "Bewerkt",  1.139346, "9.537.438.3", "VFF.TB143EB ZZCARTON   BR", $$$True, $$$False, 1, 1244.6, 1150, 1147, 1244.6, 1306.83, "V1 ladedoos", "Verpakking")
+			
+			#dim V1DoosMetDekselKenmerkenKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(V1DoosMetDekselKeyValuePair.Value.Kenmerken)
+			Do $$$AssertEquals(V1DoosMetDekselKenmerkenKeyValuePair.Count(), 2)
+			Do ..AssertKeyValuePair(V1DoosMetDekselKenmerkenKeyValuePair.GetAt(1), "Kartonbreedte", "1430,00")
+			Do ..AssertKeyValuePair(V1DoosMetDekselKenmerkenKeyValuePair.GetAt(2), "Samenstelling", "EB")
+			
+			#dim V1DoosMetDekselBewerkingDimensiesKeyValuePair As TECH.KeyValue.List = ..GeefKeyValueListUitArray(V1DoosMetDekselKeyValuePair.Value.BewerkingDimensies)
+			Do $$$AssertEquals(V1DoosMetDekselBewerkingDimensiesKeyValuePair.Count(), 1)
+			Do ..AssertKeyValuePair(V1DoosMetDekselBewerkingDimensiesKeyValuePair.GetAt(1), "Lengte", 1244.6)
+		}
+		Do $$$AssertEquals(VhConfig.isValid, $$$True)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Assign: Ingevulde kosten">
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+IngevuldeKostenJsonStream  /* Test lege halffabrikaten en kosten 
+  {
+    "isValid": true,
+    "MaatwerkDetails": {
+        "Halffabrikaten": {},
+        "Kosten": [
+            {
+                "Groep": "KostHoofdlijn",
+                "Items": [
+                    {
+                        "Naam": "CB_KostItem_LinefeedingPlaatMateriaal",
+                        "Aantal": "8.0",
+                        "ProductId": "7.013.706.0",
+                        "Korttekst": "LINEFEED"
+                    },
+                    {
+                        "Naam": "CB_KostItem_LinefeedingRugwandHouder",
+                        "Aantal": "1.0",
+                        "ProductId": "7.013.707.0",
+                        "Korttekst": "LINEFEED"
+                    }
+                ]
+            },      
+            {
+                "Groep": "CB_KostGroep_Procentueel",
+                "Items": [
+                    {
+                        "Percentage": 2.65,
+                        "Scope": "ALL",
+                        "Naam": "CB_KostItem_RechtzettingKostprijsBJ2018"
+                    }
+                ]
+            }
+        ],
+        "VerwijderdeHalffabItems": []
+    },
+    "Kenmerken": {},
+    "Model": "M_LBX",
+    "BerekendeKenmerken": {},
+    "CID": "123abc"
+}
+*/
+]]></Implementation>
+</Method>
+
+<Method name="Test: Ingevulde kosten">
+<Implementation><![CDATA[
+	#dim JsonStream As %Stream = ..GeefStream("IngevuldeKostenJsonStream")
+	
+	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream)
+	
+	If ($$$AssertTrue($IsObject(VhConfig))) {
+		Do $$$AssertEquals(VhConfig.CID, "123abc")
+		Do $$$AssertEquals(VhConfig.Model,"M_LBX")
+		If $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails)) {
+			Do $$$AssertEquals(VhConfig.MaatwerkDetails.Kosten.Count(), 2)
+			
+			#dim Kosten As %Collection.ListOfObj = VhConfig.MaatwerkDetails.Kosten
+			#dim KostGroepHoofdlijn As APPS.PM.Maatwerk.dto.VhConfig.Kost = Kosten.GetAt(1)
+			#dim KostGroepProcentueel As APPS.PM.Maatwerk.dto.VhConfig.Kost = Kosten.GetAt(2)
+			
+			Do $$$AssertEquals(KostGroepHoofdlijn.Groep, "KostHoofdlijn")
+			#dim KostHoofdlijnItems As %Collection.ListOfObj = KostGroepHoofdlijn.Items
+			
+			Do $$$AssertEquals(KostHoofdlijnItems.Count(), 2)
+			Do ..AssertKostItem(KostHoofdlijnItems.GetAt(1), "CB_KostItem_LinefeedingPlaatMateriaal", "8.0", "7.013.706.0", "LINEFEED")
+			Do ..AssertKostItem(KostHoofdlijnItems.GetAt(2), "CB_KostItem_LinefeedingRugwandHouder", "1.0", "7.013.707.0", "LINEFEED")
+			
+			Do $$$AssertEquals(KostGroepProcentueel.Groep, "CB_KostGroep_Procentueel")
+			#dim KostProcentueelItems As %Collection.ListOfObj = KostGroepProcentueel.Items
+			
+			Do $$$AssertEquals(KostProcentueelItems.Count(), 1)
+			Do ..AssertKostItem(KostProcentueelItems.GetAt(1), "CB_KostItem_RechtzettingKostprijsBJ2018", "", "", "", "2.65", "ALL")
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Assign: Ingevulde kenmerken">
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+IngevuldeKenmerkenJsonStream  /* Test lege halffabrikaten en kosten 
+  {
+    "isValid": true,
+    "MaatwerkDetails": {
+        "Halffabrikaten": {},
+        "Kosten": [],
+        "VerwijderdeHalffabItems": []
+    },
+    "Kenmerken": {
+        "ZijwandType": "Pure",
+        "NietMeeleveren.AfdekkapBinnen": false,
+        "NietMeeleveren.AfdekkapBuiten": true,
+        "InterneBreedte": 785
+    },
+    "Model": "M_LBX",
+    "BerekendeKenmerken": {},
+    "CID": "123abc"
+}
+*/
+]]></Implementation>
+</Method>
+
+<Method name="Test: Ingevulde kenmerken">
+<Implementation><![CDATA[
+	#dim JsonStream As %Stream = ..GeefStream("IngevuldeKenmerkenJsonStream")
+	
+	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream)
+	
+	If ($$$AssertTrue($IsObject(VhConfig))) {
+		Do $$$AssertEquals(VhConfig.CID, "123abc")
+		Do $$$AssertEquals(VhConfig.Model,"M_LBX")
+		If $$$AssertTrue($IsObject(VhConfig.Kenmerken)) {
+			Do $$$AssertEquals(VhConfig.Kenmerken.Count(), 4)
+			#dim Kenmerken As %Collection.ArrayOfDT = VhConfig.Kenmerken
+			
+			#dim KenmerkenKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(Kenmerken)
+			Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(1), "InterneBreedte", 785)
+			Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(2), "NietMeeleveren.AfdekkapBinnen", "false")
+			Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(3), "NietMeeleveren.AfdekkapBuiten", "true")
+			Do ..AssertKeyValuePair(KenmerkenKeyValueList.GetAt(4), "ZijwandType", "Pure")
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Assign: Ingevulde berekende kenmerken">
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+IngevuldeBerekendeKenmerkenJsonStream  /* Test lege halffabrikaten en kosten 
+  {
+    "isValid": true,
+    "MaatwerkDetails": {
+        "Halffabrikaten": {},
+        "Kosten": [],
+        "VerwijderdeHalffabItems": []
+    },
+    "Kenmerken": {},
+    "Model": "M_LBX",
+    "BerekendeKenmerken": {
+        "AfbeeldingCode": "M_Legra.jpg",
+        "ItemId": "9.657.336.8",
+        "Korttekst": "LB4M/E%1 300x785 SWDG",
+        "Langtekst": {
+            "nl-BE": "LEGRABOX lade M\r\nD:300xB:785; bodem:Donkergrijs; \r\nladezijkant:Zijdewit; bevat: gemont. lade; \r\ncorpusprofiel 40kg; BLUMOTION; \r\nfrontbevest. EXPANDO; \r\nverpakt: karton",
+            "fr-FR": "LEGRABOX tiroir M\r\nP:300xL:785; fond:Gris foncé; \r\ncôté de tiroir:Blanc soie; \r\ncontient: tiroir monté; \r\ncoulisses corps de meuble 40kg; BLUMOTION; \r\nattache façade EXPANDO; \r\nemballé: carton",
+            "de-DE": "LEGRABOX Schubkasten M\r\nT:300xB:785; Boden:Dunkelgrau; \r\nZarge:Seidenweiss; \r\nbeinhaltet: fertigschubkasten; \r\nKorpusschienen 40kg; BLUMOTION; \r\nfrontbefest EXPANDO; \r\nverpackt: karton",
+            "en-US": "LEGRABOX drawer M\r\nD:300xW:785; base:Dark grey; \r\ndrawer side:Silk white; \r\ncontains: premounted drawer; \r\ncabinet profiles 40kg; BLUMOTION; \r\nfixation expando; \r\npacked: box"
+        }
+    },
+    "CID": "123abc"
+}
+*/
+]]></Implementation>
+</Method>
+
+<Method name="Test: Ingevulde berekende kenmerken">
+<Implementation><![CDATA[
+	#dim JsonStream As %Stream = ..GeefStream("IngevuldeBerekendeKenmerkenJsonStream")
+	
+	Set EncowayJsonConverter = ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New()
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = EncowayJsonConverter.Parse(JsonStream)
+	
+	If ($$$AssertTrue($IsObject(VhConfig))) {
+		Do $$$AssertEquals(VhConfig.CID, "123abc")
+		Do $$$AssertEquals(VhConfig.Model,"M_LBX")
+		If $$$AssertTrue($IsObject(VhConfig.BerekendeKenmerken)) {
+			Do $$$AssertEquals(VhConfig.BerekendeKenmerken.AfbeeldingCode, "M_Legra.jpg")
+			Do $$$AssertEquals(VhConfig.BerekendeKenmerken.ItemId, "9.657.336.8")
+			Do $$$AssertEquals(VhConfig.BerekendeKenmerken.Korttekst, "LB4M/E%1 300x785 SWDG")
+			Do $$$AssertEquals(VhConfig.BerekendeKenmerken.AfbeeldingCode, "M_Legra.jpg")
+			Do $$$AssertEquals(VhConfig.BerekendeKenmerken.Langtekst.Count(), 4)
+			
+			#dim LangtekstKeyValueList As TECH.KeyValue.List = ..GeefKeyValueListUitArray(VhConfig.BerekendeKenmerken.Langtekst)
+			Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(1), "de-DE", "LEGRABOX Schubkasten M\r\nT:300xB:785; Boden:Dunkelgrau; \r\nZarge:Seidenweiss; \r\nbeinhaltet: fertigschubkasten; \r\nKorpusschienen 40kg; BLUMOTION; \r\nfrontbefest EXPANDO; \r\nverpackt: karton")
+			Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(2), "en-US", "LEGRABOX drawer M\r\nD:300xW:785; base:Dark grey; \r\ndrawer side:Silk white; \r\ncontains: premounted drawer; \r\ncabinet profiles 40kg; BLUMOTION; \r\nfixation expando; \r\npacked: box")
+			Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(3), "fr-FR", "LEGRABOX tiroir M\r\nP:300xL:785; fond:Gris foncé; \r\ncôté de tiroir:Blanc soie; \r\ncontient: tiroir monté; \r\ncoulisses corps de meuble 40kg; BLUMOTION; \r\nattache façade EXPANDO; \r\nemballé: carton")
+			Do ..AssertKeyValuePair(LangtekstKeyValueList.GetAt(4), "nl-BE", "LEGRABOX lade M\r\nD:300xB:785; bodem:Donkergrijs; \r\nladezijkant:Zijdewit; bevat: gemont. lade; \r\ncorpusprofiel 40kg; BLUMOTION; \r\nfrontbevest. EXPANDO; \r\nverpakt: karton")
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefKeyValueListUitArray">
+<FormalSpec>Array:%Collection.ArrayOfObj</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.KeyValue.List</ReturnType>
+<Implementation><![CDATA[
+	#dim KeyValueList As TECH.KeyValue.List = ##class(TECH.KeyValue.List).%New()
+	#dim ListIterator = ##class(TECH.ListIterator).%New(Array)
+	
+	While ListIterator.HasNext()
+	{
+		#dim Halffabrikaat As APPS.PM.Maatwerk.dto.VhConfig.Halffabrikaat = ListIterator.Next()
+		#dim Rol As %String = ListIterator.Key()
+		Do KeyValueList.InsertKeyValue(Rol, Halffabrikaat)
+	}
+	
+	Quit KeyValueList
+]]></Implementation>
+</Method>
+
+<Method name="AssertHalffabrikaat">
+<FormalSpec>HalffabrikaatKeyValuePair:TECH.KeyValuePair,Rolnaam:%String,Type:%String,Aantal:%Decimal,ProductId:%String,Korttekst:%String,OpnemenInEindproduct:%Boolean,BuilderBepaaltOpnemenInEindproduct:%Boolean,TeBekomenAantal:%Decimal="",AfmetingTeBekomen:%Decimal="",BrutoAfmetingHalffabrikaat:%Decimal="",NettoAfmetingHalffabrikaat:%Decimal="",AfmetingMetBewerkingVerlies:%Decimal="",AfmetingAangerekendPerStuk:%Decimal="",OmschrijvingVoorDocs:%String="",OmschrijvingVoorPicking:%String="",RolnaamParent:%String="",Familie:%String="",Variant:%String="",ProductieRoute:%String=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do $$$AssertEquals(HalffabrikaatKeyValuePair.Key, Rolnaam)
+	
+	#dim HalffabrikaatDto As APPS.PM.Maatwerk.dto.VhConfig.Halffabrikaat = HalffabrikaatKeyValuePair.Value
+	Do $$$AssertEquals(HalffabrikaatDto.Type, Type)
+	Do $$$AssertEquals(HalffabrikaatDto.Aantal, Aantal)
+	Do $$$AssertEquals(HalffabrikaatDto.TeBekomenAantal, TeBekomenAantal)
+	Do $$$AssertEquals(HalffabrikaatDto.AfmetingTeBekomen, AfmetingTeBekomen)
+	Do $$$AssertEquals(HalffabrikaatDto.BrutoAfmetingHalffabrikaat, BrutoAfmetingHalffabrikaat)
+	Do $$$AssertEquals(HalffabrikaatDto.AfmetingMetBewerkingVerlies, AfmetingMetBewerkingVerlies)
+	Do $$$AssertEquals(HalffabrikaatDto.AfmetingAangerekendPerStuk, AfmetingAangerekendPerStuk)
+	Do $$$AssertEquals(HalffabrikaatDto.ProductId, ProductId)
+	Do $$$AssertEquals(HalffabrikaatDto.Familie, Familie)
+	Do $$$AssertEquals(HalffabrikaatDto.Variant, Variant)
+	Do $$$AssertEquals(HalffabrikaatDto.Korttekst, Korttekst)
+	Do $$$AssertEquals(HalffabrikaatDto.ProductieRoute, ProductieRoute)
+	Do $$$AssertEquals(HalffabrikaatDto.OmschrijvingVoorDocs, OmschrijvingVoorDocs)
+	Do $$$AssertEquals(HalffabrikaatDto.OmschrijvingVoorPicking, OmschrijvingVoorPicking)
+	Do $$$AssertEquals(HalffabrikaatDto.OpnemenInEindproduct, OpnemenInEindproduct)
+	Do $$$AssertEquals(HalffabrikaatDto.BuilderBepaaltOpnemenInEindproduct, BuilderBepaaltOpnemenInEindproduct)
+	Do $$$AssertEquals(HalffabrikaatDto.NettoAfmetingHalffabrikaat, NettoAfmetingHalffabrikaat)
+	Do $$$AssertEquals(HalffabrikaatDto.RolnaamParent, RolnaamParent)
+]]></Implementation>
+</Method>
+
+<Method name="AssertKostItem">
+<FormalSpec>KostItem:APPS.PM.Maatwerk.dto.VhConfig.KostItem,Naam:%String,Aantal:%Decimal,ProductId:%String,Korttekst:%String,Percentage:%Decimal="",Scope:%String=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do $$$AssertEquals(KostItem.Naam, Naam)
+	Do $$$AssertEquals(KostItem.Aantal, Aantal)
+	Do $$$AssertEquals(KostItem.ProductId, ProductId)
+	Do $$$AssertEquals(KostItem.Korttekst, Korttekst)
+	Do $$$AssertEquals(KostItem.Percentage, Percentage)
+	Do $$$AssertEquals(KostItem.Scope, Scope)
+]]></Implementation>
+</Method>
+
+<Method name="AssertKeyValuePair">
+<FormalSpec>KeyValuePair:TECH.KeyValuePair,Key:%String,Value:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do $$$AssertEquals(KeyValuePair.Key, Key)
+	Do $$$AssertEquals(KeyValuePair.Value, Value)
+]]></Implementation>
+</Method>
+
+<Method name="GeefStream">
+<Description>
+ ***************************************************************************************** 
+ **  Gedeelte voor de functionaliteit van het ophalen (+ testmethod)                    ** 
+ ***************************************************************************************** </Description>
+<FormalSpec>RoutineLabel:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Stream</ReturnType>
+<Implementation><![CDATA[
+	Set MyStream = ##class(%Stream.GlobalBinary).%New()
+	
+	#dim i As %Integer = 1
+	#dim TekstLijn As %String = $$$Trim($Text(@RoutineLabel + i))
+	While ($$$Not($$$Trim(TekstLijn) = "*/")) {
+		Do MyStream.WriteLine(TekstLijn)
+		Set TekstLijn = $Text(@RoutineLabel + $Increment(i))
+	}
+	Quit MyStream
+]]></Implementation>
+</Method>
+
+<Method name="GeefTekst">
+<Description>
+Test-call om rechtstreeks in terminal te kunnen outputten (debugging) 
+Oproepen via :
+   Write ##class(vhUnitTest.WSimpl.PM.Maatwerk.MaatwerkService.DotNet.MaatwerkDetailsFromJsonParser.GeefMaatwerkDetails.Test).GeefTekst("RoutineLabelDemo02")</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>RoutineLabel:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..%New("").GeefStream(RoutineLabel).Read(32000)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter.cls.xml
===================================================================
diff -u
--- WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter.cls.xml	(revision 0)
+++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter.cls.xml	(revision 72776)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="Stringify">
+<FormalSpec>MaatwerkDetailsRequest:WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsRequest</FormalSpec>
+<ReturnType>%Stream.GlobalBinary</ReturnType>
+<Implementation><![CDATA[
+	#dim JsonStream = ##class(%Stream.GlobalBinary).%New()
+	
+	#dim GeefMaatwerkDetailsJson As %String = ..ObjectToJson(MaatwerkDetailsRequest)
+	
+	Do JsonStream.Write(GeefMaatwerkDetailsJson)
+	Quit JsonStream
+]]></Implementation>
+</Method>
+
+<Method name="Parse">
+<FormalSpec>JsonStream:%Stream</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
+<Implementation><![CDATA[
+	#dim VhConfigParsedFromJson As APPS.PM.Maatwerk.dto.VhConfig = ..ParseJsonStreamNaarObject(JsonStream, ##class(APPS.PM.Maatwerk.dto.VhConfig).%ClassName(1))
+	
+	Quit VhConfigParsedFromJson
+]]></Implementation>
+</Method>
+
+<Method name="ObjectToJson">
+<FormalSpec>MaatwerkDetailsRequest:WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsRequest</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim OutputJsonString As %String
+	#dim ParseStatus As %Status = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(MaatwerkDetailsRequest,,,.OutputJsonString)
+	
+	Quit OutputJsonString
+]]></Implementation>
+</Method>
+
+<Method name="ParseJsonStreamNaarObject">
+<FormalSpec>JsonStream:%Stream,RootObjectClassname:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.RegisteredObject</ReturnType>
+<Implementation><![CDATA[
+	#dim Object As TECH.RegisteredObject = ""
+	
+	Do JsonStream.Rewind()
+	Do ##class(TECH.JSON.Parser).ParseJSON(JsonStream, RootObjectClassname, .Object)
+	
+	If $$$Not($IsObject(Object)) {
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("De method ParseJsonStreamNaarObject() heeft geen object opgeleverd voor klasse '"_RootObjectClassname_"' (JsonStream.length = '"_JsonStream.Size_"').")
+	}
+	
+	Quit Object
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/PM/Maatwerk/dto/VhConfig/MaatwerkDetails.cls.xml
===================================================================
diff -u -r72740 -r72776
--- APPS/PM/Maatwerk/dto/VhConfig/MaatwerkDetails.cls.xml	(.../MaatwerkDetails.cls.xml)	(revision 72740)
+++ APPS/PM/Maatwerk/dto/VhConfig/MaatwerkDetails.cls.xml	(.../MaatwerkDetails.cls.xml)	(revision 72776)
@@ -9,7 +9,7 @@
 </Property>
 
 <Property name="Kosten">
-<Type>APPS.PM.Maatwerk.dto.VhConfig.KostItem</Type>
+<Type>APPS.PM.Maatwerk.dto.VhConfig.Kost</Type>
 <Collection>list</Collection>
 </Property>