Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler/Test.cls.xml
===================================================================
diff -u -r34176 -r34179
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 34176)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 34179)
@@ -3,15 +3,17 @@
 <Class name="vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefBepaler.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Bepaal Tarief bij 0 Kg">
+<Method name="Test: Bepaal Tarief bij 0 Kg geeft een exceptie">
 <Implementation><![CDATA[
 	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
 	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Er is een ongeldig gewicht ingevoerd.")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
-
-	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",0)
+	
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,0)
 ]]></Implementation>
 </Method>
 
@@ -20,47 +22,81 @@
 	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
 	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
 	
-	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",90)
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,90)
 	Do $$$AssertEquals(Tarief, 35.25)
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Bepaal Tarief bij 99.99 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,99.99)
+	Do $$$AssertEquals(Tarief, 35.25)
+]]></Implementation>
+</Method>
+
 <Method name="Test: Bepaal Tarief bij 100 Kg">
 <Implementation><![CDATA[
 	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
 	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
 	
-	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",100)
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,100)
 	Do $$$AssertEquals(Tarief, 35.25)
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Bepaal Tarief bij 100.01 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,100.01)
+	Do $$$AssertEquals(Tarief, 43.32)
+]]></Implementation>
+</Method>
+
 <Method name="Test: Bepaal Tarief bij 190 Kg">
 <Implementation><![CDATA[
 	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
 	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
 	
-	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",190)
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,190)
 	Do $$$AssertEquals(Tarief, 43.32)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Bepaal Tarief bij 990 Kg">
+<Method name="Test: Bepaal Tarief bij 999.9 Kg">
 <Implementation><![CDATA[
 	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
 	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
 	
-	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",990)
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,999.9)
 	Do $$$AssertEquals(Tarief, 101.83)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Bepaal Tarief bij 1010 Kg">
+<Method name="Test: Bepaal Tarief bij 1000.1 Kg">
 <Implementation><![CDATA[
 	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
 	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
 	
-	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",1010)
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,1000.1)
 	Do $$$AssertEquals(Tarief, 124.29)
 ]]></Implementation>
 </Method>
@@ -70,22 +106,102 @@
 	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
 	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
 	
-	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",2500)
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,2500)
 	Do $$$AssertEquals(Tarief, 197.20)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Bepaal Tarief bij 3000 Kg">
+<Method name="Test: Bepaal Tarief bij 3000 Kg geeft een exceptie.">
 <Implementation><![CDATA[
 	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
 	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
 
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Voor gewichten groter dan 2500 Kg zijn de tarieven op aanvraag.")
 	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("APPS.TRANSP.Offerte.exc.PrijsOpAanvraagExceptie",Substrings))
 	
-	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122","",3000)
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,3000)
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Bepaal Tarief van pakje zonder afmeting.">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Er is een ongeldig gewicht ingevoerd.")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0, 0, 0)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,0)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 0.5m x 0.5m x 0.5m">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0.5, 0.5, 0.5)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,0)
+	Do $$$AssertEquals(Tarief, 35.25)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 1m x 1m x 1m">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(1, 1, 1)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,0)
+	Do $$$AssertEquals(Tarief, 58.88)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 10m x 10m x 10m geeft een exceptie.">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Voor gewichten groter dan 2500 Kg zijn de tarieven op aanvraag.")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("APPS.TRANSP.Offerte.exc.PrijsOpAanvraagExceptie",Substrings))
+
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(10, 10, 10)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,0)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 0.5m x 0.5m x 0.5m en gewicht 190 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0.5, 0.5, 0.5)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,190)
+	Do $$$AssertEquals(Tarief, 43.32)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Bepaal Tarief bij 1m x 1m x 1m en gewicht 100 Kg">
+<Implementation><![CDATA[
+	#dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
+	#dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository)
+	
+	#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(1, 1, 1)
+	
+	#dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",Afmeting,100)
+	Do $$$AssertEquals(Tarief, 58.88)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml
===================================================================
diff -u -r34176 -r34179
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml	(.../TariefBepaler.cls.xml)	(revision 34176)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml	(.../TariefBepaler.cls.xml)	(revision 34179)
@@ -4,7 +4,7 @@
 <Super>APPS.TRANSP.Offerte.impl.DHL.TariefBepaler</Super>
 
 <Method name="GeefTarief">
-<FormalSpec>LandCode:%String,PostCode:%String,Dimensies:%String,Gewicht:%Integer</FormalSpec>
+<FormalSpec>LandCode:%String,PostCode:%String,Dimensies:APPS.TRANSP.OfferteService.dto.Afmeting,Gewicht:%Decimal</FormalSpec>
 <ReturnType>TECH.Decimal</ReturnType>
 <Implementation><![CDATA[	Quit 40.5
 ]]></Implementation>
Index: APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml
===================================================================
diff -u -r34176 -r34179
--- APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml	(.../TariefBepaler.cls.xml)	(revision 34176)
+++ APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml	(.../TariefBepaler.cls.xml)	(revision 34179)
@@ -21,17 +21,37 @@
 </Method>
 
 <Method name="GeefTarief">
-<FormalSpec>LandCode:%String,PostCode:%String,Dimensies:%String,Gewicht:%Integer</FormalSpec>
+<FormalSpec>LandCode:%String,PostCode:%String,Dimensies:APPS.TRANSP.OfferteService.dto.Afmeting,Gewicht:%Decimal</FormalSpec>
 <ReturnType>TECH.Decimal</ReturnType>
 <Implementation><![CDATA[
-	Do:(Gewicht<=0) ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Er is een ongeldig gewicht ingevoerd."))
-	Do:(Gewicht>2500) ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.Offerte.exc.PrijsOpAanvraagExceptie).%New("Voor gewichten groter dan 2500 Kg zijn de tarieven op aanvraag."))
+	Set Gewicht = ..BepaalFactureerbaarGewicht(Dimensies, Gewicht)
+	Do ..ControleerGewicht(Gewicht)
 	
 	#dim Tarief As APPS.TRANSP.Offerte.impl.DHL.Tarief =  ..TariefRepository.GeefViaLandEnPostCode(LandCode, PostCode)
-	#dim ItemIndex As %Integer = Tarief.TariefPerGewichtInKG.Next(##class(TECH.Math).Round(Gewicht,0)-0.1)
+	#dim ItemIndex As %Integer = Tarief.TariefPerGewichtInKG.Next(Gewicht-0.01)
 	Quit Tarief.TariefPerGewichtInKG.GetAt(ItemIndex)
 ]]></Implementation>
 </Method>
+
+<Method name="ControleerGewicht">
+<FormalSpec>Gewicht:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	Do:(Gewicht<=0) ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Er is een ongeldig gewicht ingevoerd."))
+	Do:(Gewicht>2500) ##class(TECH.ExceptionHandler).Throw(##class(APPS.TRANSP.Offerte.exc.PrijsOpAanvraagExceptie).%New("Voor gewichten groter dan 2500 Kg zijn de tarieven op aanvraag."))
+]]></Implementation>
+</Method>
+
+<Method name="BepaalFactureerbaarGewicht">
+<FormalSpec>Dimensies:APPS.TRANSP.OfferteService.dto.Afmeting,Gewicht:%Integer</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	#dim VolumeGewicht As %Integer = Dimensies.Breedte * Dimensies.Hoogte * Dimensies.Lengte * 330
+	if VolumeGewicht > Gewicht {
+		Quit VolumeGewicht
+	}
+	Quit Gewicht
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml
===================================================================
diff -u -r34176 -r34179
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 34176)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 34179)
@@ -20,6 +20,7 @@
 	Do TransportTarief.TariefPerGewichtInKG.SetAt(101.83,1000)
 	Do TransportTarief.TariefPerGewichtInKG.SetAt(35.25,100)
 	Do TransportTarief.TariefPerGewichtInKG.SetAt(43.32,200)
+	Do TransportTarief.TariefPerGewichtInKG.SetAt(58.88,400)
 	Do TransportTarief.TariefPerGewichtInKG.SetAt(124.29,1250)
 	Do TransportTarief.TariefPerGewichtInKG.SetAt(197.20,2500)
 	Quit TransportTarief