Index: APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml
===================================================================
diff -u -r32046 -r32056
--- APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 32046)
+++ APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 32056)
@@ -127,10 +127,38 @@
 		Do IngegevenKenmerken.GekoppeldeIngegevenKenmerken.Insert(..GeefGekoppeldeIKMat(Product))
 	}
 
+	Try {
+		Do IngegevenKenmerken.Valideer()
+	} 
+	Catch {
+		#dim Exception As APPS.PM.Maatwerk.impl.KenmerkenValidator.IsVolledigException = ##class(TECH.ExceptionHandler).Catch("APPS.PM.Maatwerk.impl.KenmerkenValidator.IsVolledigException")
+		Do ..RethrowAlsObjectConverterException(Exception,IngegevenKenmerken,Product)
+
+	}
 	Quit IngegevenKenmerken
 ]]></Implementation>
 </Method>
 
+<Method name="RethrowAlsObjectConverterException">
+<FormalSpec>Exception:APPS.PM.Maatwerk.impl.KenmerkenValidator.IsVolledigException,IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Product:APPS.EDI.common.dto.v001.LadeTAX</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Exceptions = ##class(TECH.ExceptionList).%New()
+	Set Iterator = ##class(TECH.ListIterator).%New(Exception.GeefPropertyNamen())
+	While (Iterator.HasNext()) {
+		#dim PropertyNaam As %List = $P(Iterator.Next()," ",1)
+		Set Exception = ##class(TECH.ObjectUtils.ObjectConverterPropertyException).%New("input",$classname(IngegevenKenmerken),PropertyNaam,"",PropertyNaam,PropertyNaam)
+		Do Exceptions.Insert(Exception)
+	}
+	
+	If Exceptions.Count() {
+		set Exception = ##class(TECH.ObjectUtils.ObjectConverterException).%New("IngegevenKenmerken zijn niet volledig ingevuld '"_$classname(Product)_"' to "_$classname(IngegevenKenmerken) )
+		do Exception.VoegToeInnerExcepties(Exceptions)
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="GeefGekoppeldeIKMat">
 <FormalSpec>Lade:APPS.EDI.common.dto.v001.Lade</FormalSpec>
 <Private>1</Private>
Index: EXT/Optima/CalculPrix/ServiceWeb.cls.xml
===================================================================
diff -u -r31954 -r32056
--- EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 31954)
+++ EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 32056)
@@ -34,18 +34,41 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	Set RequestVerwerker = ##class(EXT.Optima.CalculPrix.impl.RequestVerwerker).%New()
-	Set Service = ##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningService.FakeForDEV).%New()
+	Set Service = ##class(APPS.EDI.PrijsBerekening.impl.PrijsBerekeningService).%New()
 	Set ResponseVerwerker = ##class(EXT.Optima.CalculPrix.impl.ResponseVerwerker).%New()
+	
+	Try {
+		#dim EDIAanvraag As APPS.EDI.PrijsBerekening.dto.Aanvraag = RequestVerwerker.Verwerk(Request)
+		#dim EDIResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = Service.GeefPrijs(EDIAanvraag)
+		#dim Response As EXT.Optima.CalculPrix.dto.Response = ResponseVerwerker.Verwerk(EDIResultaat)
+	}
+	Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.ObjectUtils.ObjectConverterException","EXT.Optima.CalculPrix.impl.EdiException")
+		
+		If Exception.%Extends("TECH.ObjectUtils.ObjectConverterException") {
+			#dim BinaireFoutWaarde As %BigInt = ..GeefBinaireFoutWaarde(Exception)
+			If BinaireFoutWaarde > 0 {
+				Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New(BinaireFoutWaarde_";Ongeldige Kenmerkwaarden")
+			}
+		}
 
-	#dim EDIAanvraag As APPS.EDI.PrijsBerekening.dto.Aanvraag = RequestVerwerker.Verwerk(Request)
-	#dim EDIResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = Service.GeefPrijs(EDIAanvraag)
-	#dim Response As EXT.Optima.CalculPrix.dto.Response = ResponseVerwerker.Verwerk(EDIResultaat)
+		Set Response = ResponseVerwerker.VerwerkExceptie(Exception)
+	}
 
-	;d WLIP^vhDBG(97,"Test "_$$ObjToText^vhLib(Response))
 	Quit Response
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBinaireFoutWaarde">
+<FormalSpec>ObjectConverterException:TECH.ObjectUtils.ObjectConverterException</FormalSpec>
+<Private>1</Private>
+<ReturnType>%BigInt</ReturnType>
+<Implementation><![CDATA[
+	Set BinaireFoutWaardeBepaler = ##class(EXT.Optima.CalculPrix.impl.BinaireFoutWaardeBepaler).%New()
+	Quit BinaireFoutWaardeBepaler.BepaalBinaireFoutWaarde(ObjectConverterException)
+]]></Implementation>
+</Method>
+
 <Method name="MaakRequestDto">
 <FormalSpec>Aantal:%Numeric="",OfferteID:%Numeric="",LijnID:%Numeric="",pdlLadeEigenschappen:%String=""</FormalSpec>
 <Private>1</Private>
Index: vhUnitTest/EXT/Optima/CalculPrix/ServiceWeb/CalculerTiroir/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/EXT/Optima/CalculPrix/ServiceWeb/CalculerTiroir/Test.cls.xml	(revision 0)
+++ vhUnitTest/EXT/Optima/CalculPrix/ServiceWeb/CalculerTiroir/Test.cls.xml	(revision 32056)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.EXT.Optima.CalculPrix.ServiceWeb.CalculerTiroir.Test">
+<Super>vhUnitTest.TestCase,DOM.PM.Maatwerk.TAX.impl.Base</Super>
+
+<Property name="WebService">
+<Type>EXT.Optima.CalculPrix.ServiceWeb</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	Set ..WebService = ##class(EXT.Optima.CalculPrix.ServiceWeb).%New()
+]]></Implementation>
+</Method>
+
+<Method name="TestCorrecteAanvraag">
+<Implementation><![CDATA[
+	#dim Request As EXT.Optima.CalculPrix.dto.Request = ..MaakRequestVolledigeTAX()
+
+	#dim Response As EXT.Optima.CalculPrix.dto.Response = ..WebService.CalculerTiroir(Request)
+
+	#dim VerwachteResponse As EXT.Optima.CalculPrix.dto.Response = ##class(EXT.Optima.CalculPrix.dto.Response).%New()
+	Set VerwachteResponse.KostPrijs = 70.17
+	Set VerwachteResponse.RefVanHoecke = "-VH_Fixed"
+	Set VerwachteResponse.ErrorCode = 0
+	
+	Do ..AssertResponse(Response,VerwachteResponse)
+]]></Implementation>
+</Method>
+
+<Method name="aTestFouteAanvraagOnvolledigeKenmerken">
+<Implementation><![CDATA[
+	#dim Request As EXT.Optima.CalculPrix.dto.Request = ..MaakRequestTAX(1,520)
+
+	#dim Response As EXT.Optima.CalculPrix.dto.Response = ..WebService.CalculerTiroir(Request)
+
+	Do ..AssertResponseError(Response,"-1010")
+]]></Implementation>
+</Method>
+
+<Method name="AssertResponseError">
+<FormalSpec>Response:EXT.Optima.CalculPrix.dto.Response,ErrorCode:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim VerwachteResponse As EXT.Optima.CalculPrix.dto.Response = ##class(EXT.Optima.CalculPrix.dto.Response).%New()
+	Set VerwachteResponse.KostPrijs = ""
+	Set VerwachteResponse.ErrorCode = ErrorCode
+	Do ..AssertResponse(Response,VerwachteResponse)
+]]></Implementation>
+</Method>
+
+<Method name="AssertResponse">
+<FormalSpec>Response:EXT.Optima.CalculPrix.dto.Response,VerwachteResponse:EXT.Optima.CalculPrix.dto.Response</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Do $$$AssertObject(Response,VerwachteResponse,"Response-object")
+]]></Implementation>
+</Method>
+
+<Method name="MaakRequestVolledigeTAX">
+<FormalSpec>Aantal:%Numeric=1</FormalSpec>
+<Private>1</Private>
+<ReturnType>EXT.Optima.CalculPrix.dto.Request</ReturnType>
+<Implementation><![CDATA[
+	#dim Request As EXT.Optima.CalculPrix.dto.Request = ..MaakRequestTAX(1,520)
+	#dim Lade As EXT.Optima.CalculPrix.dto.Request.TiroirTAORBOX = Request.Lade
+
+	Set Lade.LadeKleur = ##class(DOM.PM.enu.TAORLadeKleur).NatuurNotenhout()
+	Set Lade.LadeBinnenKleur = ##class(DOM.PM.enu.TAORLadeKleur).NatuurNotenhout()
+	Set Lade.BodemKleur=##class(DOM.PM.enu.TAORBodemKleur).NatuurNotenhout()
+	Set Lade.CorpusBreedte = 600
+	Set Lade.IsBinnenbreedte = $$$True
+	Set Lade.CorpusWandDikte = ""
+	Set Lade.Draagkracht = ##class(DOM.PM.enu.TAORDraagkracht).Draagkracht40()
+	Set Lade.FrontBevestiging = ##class(DOM.PM.enu.TAORFrontBevestiging).Drevel()
+	Set Lade.FrontEindkapKleur = ##class(DOM.PM.enu.TAORFrontEindkapKleur).AluminiumLook()
+	Set Lade.GeleiderTechnologie = ##class(DOM.PM.enu.TAORGeleiderTechnologie).BLUMOTION()
+	Set Lade.GlijderType = ##class(DOM.PM.enu.TAORGlijderType).Movento()
+	Set Lade.HeeftDiepteVerstelling = $$$False
+	Set Lade.HeeftOpvullijstLinks = $$$False
+	Set Lade.HeeftOpvullijstRechts = $$$False
+	Set Lade.HeeftZijstabilisering = $$$False
+	Set Lade.IsBinnenlade = $$$False
+	Set Lade.KoppelingType = ##class(DOM.PM.enu.TAORKoppelingType).Schroef()
+	Set Lade.LadeDiepte = ##class(DOM.PM.enu.TAORLadeDiepte).LadeDiepte500()
+	Set Lade.LadeHoogte = ##class(DOM.PM.enu.TAORLadeHoogte).C()
+	Set Lade.NietMeeleverenGeleider = 0
+	Set Lade.NietMeeleverenFrontbevestiging = 0
+	Set Lade.OpvullijstKleur = ""
+	Set Lade.VerpakkingType = ##class(DOM.PM.enu.TAORVerpakkingType).V1()
+	
+	Quit Request
+]]></Implementation>
+</Method>
+
+<Method name="MaakRequestTAX">
+<FormalSpec>Aantal:%Numeric=1,LadeDiepte:%Numeric=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>EXT.Optima.CalculPrix.dto.Request</ReturnType>
+<Implementation><![CDATA[
+	Set Request = ##class(EXT.Optima.CalculPrix.dto.Request).%New()
+	Set Request.Aantal = Aantal
+	Set Request.Lade = ##class(EXT.Optima.CalculPrix.dto.Request.TiroirTAORBOX).%New()
+	Set Request.Lade.LadeDiepte = LadeDiepte
+	Quit Request
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>