Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r59680 -r74677
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 59680)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 74677)
@@ -3,16 +3,36 @@
 <Class name="APPS.TRANSP.Transsmart.impl.RequestDataBouwer">
 <Super>APPS.TRANSP.Transsmart.RequestDataBouwer,TECH.Mockable</Super>
 
+<Property name="DateTimeAPI">
+<Type>TECH.DateTime.DateTimeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProjectSettingsAPI">
+<Type>DOM.common.ProjectSettingsAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>DateTimeAPI:TECH.DateTime.DateTimeAPI="",ProjectSettingsAPI:DOM.common.ProjectSettingsAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..DateTimeAPI = $$$Inject(DateTimeAPI,##class(TECH.Context).Instance().GeefDateTimeAPI())
+	Set ..ProjectSettingsAPI = $$$Inject(ProjectSettingsAPI,##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="MaakdoBookingRequest">
 <FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
 <ReturnType>WS.Transsmart.tns.doBooking</ReturnType>
 <Implementation><![CDATA[
-	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
 	Set Request = ##class(WS.Transsmart.tns.doBooking).%New()
 
-	Set Request.bookingInfo = ..GeefBookingInfoDoBooking(LeveringInfo,Rit)	
-	Do:($$$Not($Length(Request.bookingInfo.carrier))) ##class(Tools.Wlip).%New(207).String("Geene  transporteur !")
-		
+	Set Request.bookingInfo = ..GeefBookingInfoDoBooking(LeveringInfo,Rit)			
 	Set Request.shipmentInfo = ..GeefShipmentInfo(LeveringInfo,Rit)
 		
 	Quit Request
@@ -34,16 +54,50 @@
 
 <Method name="MaakgetDocsRequest">
 <FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doDelete</ReturnType>
+<ReturnType>WS.Transsmart.tns.getDocs</ReturnType>
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Transsmart.tns.getDocs).%New()
 	Set Request.shipmentInfo = ..GeefShipmentInfoGetDocs(Reference)
+	Set Request.actionInfo = ..GeefActionInfoGetDocs()
 	
 	Quit Request
 ]]></Implementation>
 </Method>
 
+<Method name="MaakdoManifestRequest">
+<FormalSpec>Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date,TransportNr:%String=""</FormalSpec>
+<ReturnType>WS.Transsmart.tns.doManifest</ReturnType>
+<Implementation><![CDATA[
+	Set Request = ##class(WS.Transsmart.tns.doManifest).%New()
+	Set Request.manifestInfo.action = "doManifest"
+	Set Request.manifestInfo.carrier = Carrier
+	Set Request.manifestInfo.costcenter = CostCenter
+	Set Request.manifestInfo.version = "2.0"
+	Set Request.manifestInfo.pickupDateFrom = ##class(TECH.Format.impl.FormatAPI).%New().FormatHorolog(PickupDateFrom,"JJJJ-MM-DD")
+	Set Request.manifestInfo.pickupDateTo = ##class(TECH.Format.impl.FormatAPI).%New().FormatHorolog(PickupDateTo,"JJJJ-MM-DD")
+	if $$$HasLength(TransportNr) {
+		Set Request.manifestInfo.referenceType = "DELIVERYID"
+		Set Request.manifestInfo.reference = TransportNr
+	}
+	
+	
+	Quit Request
+]]></Implementation>
+</Method>
+
+<Method name="GeefActionInfoGetDocs">
+<Private>1</Private>
+<ReturnType>WS.Transsmart.tns.GetDocsActionInfo</ReturnType>
+<Implementation><![CDATA[
+	Set ActionInfo = ##class(WS.Transsmart.tns.GetDocsActionInfo).%New()
+	Set ActionInfo.action = "getLabel"
+	Set ActionInfo.version = "2.0"
+	Quit ActionInfo
+]]></Implementation>
+</Method>
+
 <Method name="GeefActionInfoDoDelete">
+<Private>1</Private>
 <ReturnType>WS.Transsmart.tns.DoDeleteActionInfo</ReturnType>
 <Implementation><![CDATA[
 	Set ActionInfo = ##class(WS.Transsmart.tns.DoDeleteActionInfo).%New()
@@ -55,6 +109,7 @@
 
 <Method name="GeefShipmentInfoDoDelete">
 <FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
+<Private>1</Private>
 <ReturnType>WS.Transsmart.tns.DoDeleteShipmentInfo</ReturnType>
 <Implementation><![CDATA[
 	Set ShipmentInfo = ##class(WS.Transsmart.tns.DoDeleteShipmentInfo).%New()
@@ -81,13 +136,13 @@
 	Set BookingInfo = ##class(WS.Transsmart.tns.DoBookingBookingInfo).%New()
 	Set BookingInfo.origin = "WEB"
 	Set BookingInfo.mailType = "0"
-	Set BookingInfo.language = "EN"
+	#dim Taal as %String = LeveringInfo.LeverAdres.Taal
+	Set BookingInfo.language = $Select(Taal="N":"NL",Taal="F":"FR",Taal="D":"DE",1:"NL")
 	Set BookingInfo.action= "doBooking"
 	Set BookingInfo.version = "2.0"
 	
-	Set BookingInfo.costcenter = ..BepaalCostCenter(LeveringInfo) ; --> ander afzenderadres? zie ook bepalen afzender adres
-	
-	Set BookingInfo.carrier = ..BepaalBookingInfoCarrier(Rit)
+	Set BookingInfo.costcenter = ..BepaalCostCenter(LeveringInfo) ; --> ander afzenderadres
+	Set BookingInfo.carrier = ..BepaalBookingInfoCarrier(Rit,LeveringInfo)
 	Quit BookingInfo
 ]]></Implementation>
 </Method>
@@ -97,37 +152,238 @@
 <Private>1</Private>
 <ReturnType>WS.Transsmart.tns.DoBookingShipmentInfo</ReturnType>
 <Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
 	Set ShipmentInfo = ##class(WS.Transsmart.tns.DoBookingShipmentInfo).%New()
 	
 	Set ShipmentInfo.reference = LeveringInfo.Referentie
 		
-	Set ShipmentInfo.serviceLevelTime = ..BepaalShipmentInfoServiceLevelTime(Rit)	
+	Set ShipmentInfo.serviceLevelTime = ..BepaalShipmentInfoServiceLevelTime(Rit,LeveringInfo)	
+	Set ShipmentInfo.serviceLevelOther = ..BepaalShipmentInfoServiceLevelOther(Rit,LeveringInfo)	
 	Set ShipmentInfo.inbound = 0
 	Set ShipmentInfo.loadmeter = 0
+	Set ShipmentInfo.pickupDate = ..BepaalPickupDate(LeveringInfo,Rit)
 	Set ShipmentInfo.noOfPackages = LeveringInfo.AantalVerpakkingEenhedenTotaal
+	Set ShipmentInfo.instruction = ..GeefInstruction(LeveringInfo,Rit)
+	Set ShipmentInfo.incoterms = ..GeefIncoterms(Rit,LeveringInfo)
+	if (Rit.GeefTransporteur() = Transporteur.VRD) {
+		Set ShipmentInfo.requestedDeliveryDate = ##class(TECH.Format.impl.FormatAPI).%New().FormatHorolog(LeveringInfo.AfleverDatum,"JJJJ-MM-DD")
+	}
 	
-	#dim GewichtPerEenheid as %Numeric = ##class(TECH.Math).Round(LeveringInfo.Gewicht / LeveringInfo.AantalVerpakkingEenhedenTotaal,2)
+	try {
+		#dim GewichtPerEenheid as %Numeric = ##class(TECH.Math).Round(LeveringInfo.Gewicht / LeveringInfo.AantalVerpakkingEenhedenTotaal,2)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Set GewichtPerEenheid = 0
+	}
 	set it = ##class(TECH.ListIterator).%New(LeveringInfo.VerpakkingEenheden)
 	#dim Linecounter as %Integer = 0
+	#dim Carrier as %String = ..BepaalBookingInfoCarrier(Rit,LeveringInfo)
 	While (it.HasNext()){
 		Set Linecounter = Linecounter+ 1
 		#dim VerpakkingEenheid as APPS.TRANSP.dto.VerpakkingEenheid = it.Next()
-		
-		Do ShipmentInfo.shipmentLines.Insert(..GeefShipmentLine(Linecounter,VerpakkingEenheid,GewichtPerEenheid))
+		#dim Line as WS.Transsmart.tns.DoBookingShipmentLine = ..GeefShipmentLine(Linecounter,VerpakkingEenheid,GewichtPerEenheid,Carrier)
+		if ((Rit.GeefTransporteur() = Transporteur.Dachser) & (LeveringInfo.LeverAdres.LandCode = "IT")) {
+			Set Line.description = "FURNITURE WOODEN DRAWERS"
+		}		
+		Do ShipmentInfo.shipmentLines.Insert(Line)
 	}
 	
 	Do ShipmentInfo.addresses.Insert(..GeefAfzenderAdres(LeveringInfo))
-	Do ShipmentInfo.addresses.Insert(..GeefBestemmelingAdres(LeveringInfo))
+	Do ShipmentInfo.addresses.Insert(..GeefBestemmelingAdres(LeveringInfo,Rit))	
+	Do ShipmentInfo.additionalReferences.Insert(..GeefVrachtwagenAdditionalReference(Rit))
+	Do ShipmentInfo.additionalReferences.Insert(..GeefKlantAdditionalReference(LeveringInfo))
+	Do ShipmentInfo.additionalReferences.Insert(..GeefZendingAdditionalReference(LeveringInfo))
+	if ((Rit.GeefTransporteur() = Transporteur.Dachser) & (LeveringInfo.LeverAdres.LandCode = "IT")) {
+		Do ShipmentInfo.additionalReferences.Insert(..GeefProjectAdditionalReference(LeveringInfo))
+	}
+	
 	Quit ShipmentInfo
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalShipmentInfoServiceLevelOther">
+<FormalSpec>Rit:DOM.TRANSP.Rit,LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	#dim ServiceLevelOther as %String = ""
+	If (Rit.GeefTransporteur()=Transporteur.Dachser){
+		If ((LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.OPO)) ! 
+		(LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.OPODuitsland))) {
+			Set ServiceLevelOther = "TAILLIFT"
+		}
+	}
+	if (Rit.GeefTransporteur()= Transporteur.HamannHDE ) {
+		Set ServiceLevelOther = "PREADVICE"
+	}
+	if ((Rit.GeefTransporteur() = Transporteur.Dachser) & (LeveringInfo.LeverAdres.LandCode = "IT")){
+		Set ServiceLevelOther = "IMO"
+	}
+	/*if (Rit.GeefTransporteur() = Transporteur.Schenker){
+		if $$$HasLength(LeveringInfo.EmailAddressTrackTrace){
+			Set ServiceLevelOther = "PREADVMAIL"
+		}
+	}*/
+
+	Quit ServiceLevelOther
+]]></Implementation>
+</Method>
+
+<Method name="GeefIncoterms">
+<FormalSpec>Rit:DOM.TRANSP.Rit,LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	#dim Incoterms as %String = ""
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	If (Rit.GeefTransporteur() = Transporteur.Dachser) {
+		If (LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.HaefeleNoorwegen) ) {
+			Set Incoterms = "083"
+		} else {
+			Set Incoterms = "CPT"
+		}
+	}	
+	If (Rit.GeefTransporteur() = Transporteur.Weiss) ! (Rit.GeefTransporteur() = Transporteur.Streck) {
+		If (LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.HaefeleZwitserland) ) {
+			Set Incoterms = "083"
+		}
+	}
+	If (Rit.GeefTransporteur() = Transporteur.Schenker) {
+		#dim GeleverdAanKlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(LeveringInfo.GeleverdAanKlantNummer)
+		Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+		if ##class(TECH.StringUtils).Equals(GeleverdAanKlantID,Klant.BlumPolen,Klant.BlumTsjechie){		
+			Set Incoterms = "EXW"
+		}
+
+	} 
+			
+	Set:(Rit.GeefTransporteur() = Transporteur.DHL) Incoterms="CPT"
+	Quit Incoterms
+]]></Implementation>
+</Method>
+
+<Method name="BepaalPickupDate">
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	#dim Datum as %Date = +(..DateTimeAPI.CurrentHorolog())
+	#dim GeleverdAanKlantNummer As %Integer = LeveringInfo.GeleverdAanKlantNummer
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	
+	If (Rit.GeefTransporteur() = Transporteur.DHL) { 	; als de afleverdatum groter dan volgende werkdag is, zet dan de pickupdatum op de volgende werkdag
+		If (LeveringInfo.AfleverDatum > ##class(TECH.DateTime).BerekenWerkdag(Datum,1) ) {	
+			Set Datum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
+		}
+	}
+	
+	If (Rit.GeefTransporteur() = Transporteur.VRD) { 	; Zet de pickup datum op de dag voor de gewenste leverdatum, en minstens op vandaag (dus niet in het verleden)
+		Set Datum = ##class(TECH.DateTime).BerekenWerkdag(LeveringInfo.AfleverDatum,-1)
+		If Datum < +(..DateTimeAPI.CurrentHorolog()) {
+			Set Datum = +(..DateTimeAPI.CurrentHorolog())
+		}
+	}
+	
+	If (Rit.GeefTransporteur() = Transporteur.Dachser){
+		if (GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.OPO)) { ; Zet de pickup datum op vandaag plus 2 werkdagen
+			Set Datum = ##class(TECH.DateTime).BerekenWerkdag(Datum, 2)
+		} else { // alle Haefeles behalve CH, en OPO Duitsland
+			Set Datum = ##class(TECH.DateTime).BerekenWerkdag(Datum, 1)
+		}
+	}
+
+	If ((Rit.GeefTransporteur() = Transporteur.Schenker) && 
+			((GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.BlumPolen)) ||
+			 (GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.BlumTsjechie))) )
+			{ ; Zet de pickup datum op vandaag plus 2 werkdagen
+		Set Datum = ##class(TECH.DateTime).BerekenWerkdag(Datum, 1)
+	}
+	
+	Quit ##class(TECH.Format.impl.FormatAPI).%New().FormatHorolog(Datum,"JJJJ-MM-DD")
+]]></Implementation>
+</Method>
+
+<Method name="GeefVrachtwagenAdditionalReference">
+<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.Transsmart.tns.additionalReference</ReturnType>
+<Implementation><![CDATA[
+	Set AdditionalReference = ##class(WS.Transsmart.tns.additionalReference).%New()
+	Set AdditionalReference.type = "DELIVERYID"
+	Set AdditionalReference.value = Rit.GeefID()
+	Quit AdditionalReference
+]]></Implementation>
+</Method>
+
+<Method name="GeefZendingAdditionalReference">
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.Transsmart.tns.additionalReference</ReturnType>
+<Implementation><![CDATA[
+	Set AdditionalReference = ##class(WS.Transsmart.tns.additionalReference).%New()
+	Set AdditionalReference.type = "OTHER"
+	Set AdditionalReference.value = LeveringInfo.Referentie
+	Quit AdditionalReference
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantAdditionalReference">
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.Transsmart.tns.additionalReference</ReturnType>
+<Implementation><![CDATA[
+	Set AdditionalReference = ##class(WS.Transsmart.tns.additionalReference).%New()
+	Set AdditionalReference.type = "CUSTOMER"
+	Set AdditionalReference.value = LeveringInfo.GeleverdAanKlantNummer
+	Quit AdditionalReference
+]]></Implementation>
+</Method>
+
+<Method name="GeefProjectAdditionalReference">
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.Transsmart.tns.additionalReference</ReturnType>
+<Implementation><![CDATA[
+	Set AdditionalReference = ##class(WS.Transsmart.tns.additionalReference).%New()
+	Set AdditionalReference.type = "PROJECT"
+	Set AdditionalReference.value = "FURNITURE WOODEN DRAWERS"
+	Quit AdditionalReference
+]]></Implementation>
+</Method>
+
+<Method name="GeefInstruction">
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+
+	#dim LeveringAdres As APPS.TRANSP.dto.LeveringAdres = LeveringInfo.LeverAdres
+	#dim Instruction as %String = ""
+	If (LeveringAdres.Opmerkingen.Count() > 0) {
+		set Instruction = LeveringAdres.Opmerkingen.GetAt(1)
+	}
+	If (LeveringAdres.Opmerkingen.Count() > 1) {
+		set Instruction = Instruction _ $Select($Length(Instruction):" ",1:"")_ LeveringAdres.Opmerkingen.GetAt(2)
+	}
+	If (Rit.GeefTransporteur() = Transporteur.Schenker) && (LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.BlumPolen)) {
+		Set Instruction = "Dostawa autem z winda"
+	}
+	Quit ..BeperkLengteTot(Instruction,128)
+]]></Implementation>
+</Method>
+
 <Method name="GeefAfzenderAdres">
 <FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
 <Private>1</Private>
 <ReturnType>WS.Transsmart.tns.DoBookingAddress</ReturnType>
 <Implementation><![CDATA[
-	; afzender adres hier gebruiken of override via costcenter????
+	;dit is het adres waar opgehaald moet worden
+	;hier NIET een ander adres ingeven als op het etiket de afzender moet 'gespoofd' worden. gebruik 'Costcenter' hiervoor.
 	Set Afzender = ##class(WS.Transsmart.tns.DoBookingAddress).%New()
 	Set Afzender.type = "SEND"
 	Set Afzender.name = "Van Hoecke"
@@ -141,91 +397,272 @@
 </Method>
 
 <Method name="GeefBestemmelingAdres">
-<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
 <Private>1</Private>
 <ReturnType>WS.Transsmart.tns.DoBookingAddress</ReturnType>
 <Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
 	Set Bestemmeling = ##class(WS.Transsmart.tns.DoBookingAddress).%New()
 	
 	Set Bestemmeling.type = "RECV"
 	
-	Set Bestemmeling.name = LeveringInfo.LeverAdres.Naam 
-	Set Bestemmeling.street1 = LeveringInfo.LeverAdres.Straat
-	Set Bestemmeling.city = LeveringInfo.LeverAdres.Woonplaats
-	; Set Bestemmeling.houseNo = LeveringInfo.LeverAdres. ???
-	Set Bestemmeling.zipCode = LeveringInfo.LeverAdres.Postcode
-	Set Bestemmeling.countryCode = LeveringInfo.LeverAdres.LandCode
+	Set Bestemmeling.name = ..BeperkLengteTot(LeveringInfo.LeverAdres.Naam,64)
+	Set Bestemmeling.street1 = ..BeperkLengteTot(..FormatteerStraat(LeveringInfo.LeverAdres.Straat), 64)
+	Set Bestemmeling.city = ..BeperkLengteTot(LeveringInfo.LeverAdres.Woonplaats,64)
+	Set Bestemmeling.zipCode = ..BeperkLengteTot(..FormatteerPostcode(LeveringInfo.LeverAdres.LandCode , LeveringInfo.LeverAdres.Postcode),16)
+	Set Bestemmeling.countryCode = ..BeperkLengteTot(LeveringInfo.LeverAdres.LandCode,3)
+	Set Bestemmeling.telNo = ..BepaalBestemmelingTelefoon(LeveringInfo,Rit)
+	Set Bestemmeling.state = ..BeperkLengteTot(LeveringInfo.LeverAdres.Provincie,16)
+	Set Bestemmeling.contact = Bestemmeling.name
+	Set Bestemmeling.email = LeveringInfo.EmailAddressTrackTrace
+	
 	Quit Bestemmeling
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalBestemmelingTelefoon">
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo,Rit:DOM.TRANSP.Rit</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	#dim Telefoon As %String = ..BeperkLengteTot(LeveringInfo.LeverAdres.Telefoon,32)
+	If (Rit.GeefTransporteur() = Transporteur.VRD) && (Telefoon = "+3237601900") {
+		Set Telefoon = ""
+	}
+	Quit Telefoon
+]]></Implementation>
+</Method>
+
+<Method name="FormatteerStraat">
+<FormalSpec>Straat:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Replace(Straat, "#" , " ")
+]]></Implementation>
+</Method>
+
+<Method name="FormatteerPostcode">
+<FormalSpec>LandCode:%String,Postcode:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Geformatteerdepostcode as %String = Postcode
+	if (LandCode = "NL") {
+		Set Geformatteerdepostcode = ##class(TECH.StringUtils).Replace(Geformatteerdepostcode,"-"," ")
+	}
+	Quit Geformatteerdepostcode
+]]></Implementation>
+</Method>
+
 <Method name="GeefShipmentLine">
-<FormalSpec>Lijnnummmer:%Integer,VerpakkingEenheid:APPS.TRANSP.dto.VerpakkingEenheid,Gewicht:%Numeric</FormalSpec>
+<FormalSpec>Lijnnummmer:%Integer,VerpakkingEenheid:APPS.TRANSP.dto.VerpakkingEenheid,Gewicht:%Numeric,Carrier:%String=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>WS.Transsmart.tns.DoBookingShipmentLine</ReturnType>
 <Implementation><![CDATA[
 	Set ShipmentLine = ##class(WS.Transsmart.tns.DoBookingShipmentLine).%New()
 	Set ShipmentLine.lineNo = Lijnnummmer
-	Set ShipmentLine.packageType = ..BepaalPackageType(VerpakkingEenheid.Type)
+	Set ShipmentLine.packageType = ..BepaalPackageType(VerpakkingEenheid.Type,Carrier)
 	Set ShipmentLine.quantity = VerpakkingEenheid.Aantal
-	Set ShipmentLine.measurements = ##class(WS.Transsmart.tns.DoBookingMeasurements).%New()
-	Set ShipmentLine.measurements.length = 0
-	Set ShipmentLine.measurements.width = 0
-	Set ShipmentLine.measurements.height = 0
-	Set ShipmentLine.measurements.sizeUom = "CM"
-	Set ShipmentLine.measurements.weightUom = "KG"
-	Set ShipmentLine.measurements.weight = Gewicht
+	Set ShipmentLine.measurements = ..GeefMeasurements(ShipmentLine.packageType,Gewicht,Carrier)
+	
+	
 	Quit ShipmentLine
 ]]></Implementation>
 </Method>
 
+<Method name="GeefMeasurements">
+<FormalSpec>PackageType:%String,Gewicht:%Numeric,Carrier:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.Transsmart.tns.DoBookingMeasurements</ReturnType>
+<Implementation><![CDATA[
+	Set Measurements = ##class(WS.Transsmart.tns.DoBookingMeasurements).%New()
+	
+	Set Measurements.length = 0
+	Set Measurements.width = 0
+	Set Measurements.height = 0
+	Set Measurements.sizeUom = "CM"
+	Set Measurements.weightUom = "KG"
+	Set Measurements.weight = Gewicht
+	If (##class(TECH.StringUtils).Equals(Carrier,"ESC", "SNB")) {
+		Set Measurements.height = 120
+		If (##class(TECH.StringUtils).Equals(PackageType,"EUROPALLET","Wwpallet","Pallet")){
+			Set Measurements.length = 80
+			Set Measurements.width = 120	
+		}
+		If (##class(TECH.StringUtils).Equals(PackageType,"Pallet80x60")){
+			Set Measurements.length = 80
+			Set Measurements.width = 60	
+		}
+		
+	} 	
+	Quit Measurements
+]]></Implementation>
+</Method>
+
 <Method name="BepaalCostCenter">
 <FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	;TODO ???
-	Quit ""
+	#dim GeleverdAanKlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(LeveringInfo.GeleverdAanKlantNummer)
+	#dim CostCenter as %String = ""
+	Set Klant = ##class(DOM.VKP.enu.Klant.AutoComplete).%New()
+	if ##class(TECH.StringUtils).Equals(GeleverdAanKlantID,Klant.HaefeleNederland,Klant.DuPont,Klant.OPO,Klant.OPODuitsland,Klant.BlumPolen,Klant.BlumTsjechie){
+		Set CostCenter = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(GeleverdAanKlantID)
+	}
+	if (GeleverdAanKlantID = Klant.HaefeleBelgie) && (..ProjectSettingsAPI.IsActiefHaefeleBENaarEindklant()) {
+		Set CostCenter = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(GeleverdAanKlantID)
+	}
+	if (GeleverdAanKlantID = Klant.VanRaemdonck) && (..ProjectSettingsAPI.IsActiefVanRaemdonckNaarEindklant()) {
+		Set CostCenter = ##class(AXimpl.AdminToAxUtils).ConvertCustomerID(GeleverdAanKlantID)
+	}	
+	Quit CostCenter
 ]]></Implementation>
 </Method>
 
 <Method name="BepaalPackageType">
-<FormalSpec>VerpakkingEenheidType:DOM.TRANSP.enu.VerpakkingEenheidType</FormalSpec>
+<FormalSpec>VerpakkingEenheidType:DOM.TRANSP.enu.VerpakkingEenheidType,Carrier:%String=""</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	; mappings volgens voorstudie transsmart.
 	set Type = ##class(DOM.TRANSP.enu.VerpakkingEenheidType.AutoComplete).%New()
-	Quit:VerpakkingEenheidType=Type.Colli "BOX"
-	Quit:VerpakkingEenheidType=Type.EuroPallet "Wwpallet"
-	Quit:VerpakkingEenheidType=Type.HalveEuroPallet "Pallet80x60"
-	Quit:VerpakkingEenheidType=Type.BuitenmaatsPallet "Pallet"
-	Quit:VerpakkingEenheidType=Type.Langgoed "Bundel"
-	; Quit:VerpakkingEenheidType=Type.     -->> Wegwerppallet????
+	#dim PackageType as %String = ""
+	if VerpakkingEenheidType= Type.EuroPallet {
+		if (Carrier = "VRD") && ..ProjectSettingsAPI.VRDEuropallettenDoorgeven() {
+			Set PackageType="EUROPALLET"
+		} else {
+			Set PackageType="Wwpallet"
+		}
+	}
+	Set:VerpakkingEenheidType=Type.WegwerpPallet PackageType="Wwpallet"
+	Set:VerpakkingEenheidType=Type.HalveEuroPallet PackageType="Pallet80x60"
+	Set:VerpakkingEenheidType=Type.BuitenmaatsPallet PackageType="Pallet"
+
+	Set:VerpakkingEenheidType=Type.Colli PackageType="BOX"
+	Set:VerpakkingEenheidType=Type.Langgoed PackageType="Bundel"
+	; Set:VerpakkingEenheidType=Type.     -->> Wegwerppallet????
+	if Carrier = "DAC" {
+		Set PackageType = ##class(TECH.StringUtils).ToUpper(PackageType)
+	}
+	Quit PackageType
 ]]></Implementation>
 </Method>
 
+<Method name="ValideerVerpakkingTypeGeldigVoorCarrier">
+<FormalSpec>VerpakkingEenheidType:DOM.TRANSP.enu.VerpakkingEenheidType,Carrier:%String=""</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set Type = ##class(DOM.TRANSP.enu.VerpakkingEenheidType.AutoComplete).%New()
+	if (Carrier = "DAC") && ((VerpakkingEenheidType = Type.Colli) || (VerpakkingEenheidType = Type.Langgoed)){
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Verpakkingtype "_ VerpakkingEenheidType_ " niet toegelaten voor carrier " _ Carrier)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="BepaalBookingInfoCarrier">
-<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<FormalSpec>Rit:DOM.TRANSP.Rit,LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
-	Quit:(Rit.GeefTransporteur() = Transporteur.VRD) "VRD"
-	Quit:(Rit.GeefTransporteur() = Transporteur.DHL) "DHP"
-	Quit ""
+	#dim Carrier as %String = ""
+	Set:(Rit.GeefTransporteur() = Transporteur.VRD) Carrier = "VRD"
+	Set:(Rit.GeefTransporteur() = Transporteur.DHL) Carrier = "DHP"
+	Set:(Rit.GeefTransporteur() = Transporteur.HamannHDE) Carrier = "ERB"
+	Set:(Rit.GeefTransporteur() = Transporteur.Dachser) Carrier = "DAC"
+	Set:(Rit.GeefTransporteur() = Transporteur.Weiss) Carrier = "GWE"
+	Set:(Rit.GeefTransporteur() = Transporteur.Streck) Carrier = "STK"
+	if (Rit.GeefTransporteur() = Transporteur.Schenker){
+		Set Carrier = "SNB"
+		if (..ProjectSettingsAPI.IsTranssmartESchenkerConnectieActief() & (LeveringInfo.LeverAdres.LandCode = "CZ" ) ) {	
+			Set Carrier = "ESC"
+		}
+	}
+	
+	Quit Carrier
 ]]></Implementation>
 </Method>
 
 <Method name="BepaalShipmentInfoServiceLevelTime">
-<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<FormalSpec>Rit:DOM.TRANSP.Rit,LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
+	set PalletType = ##class(DOM.TRANSP.enu.VerpakkingEenheidType.AutoComplete).%New()
+	#dim ServiceLevelTime as %String = ""
+	if (Rit.GeefTransporteur() = Transporteur.VRD){
+		set ServiceLevelTime = "STANDARD"
+	} elseif (Rit.GeefTransporteur() = Transporteur.DHL){
+		Set ServiceLevelTime = "EUROPLUS"
+	} elseif (Rit.GeefTransporteur() = Transporteur.HamannHDE){
+		Set ServiceLevelTime = "NOSTACK"
+	} elseif (Rit.GeefTransporteur() = Transporteur.Dachser){
+		If (LeveringInfo.LeverAdres.LandCode = "IT") {
+			Set ServiceLevelTime = "TARGOSPEED"
+		} else {
+			Set ServiceLevelTime = "TARGOFLEX"
+		}
+	} elseif (Rit.GeefTransporteur() = Transporteur.Weiss) {
+		Set ServiceLevelTime ="STANDARD"
+	} elseif (Rit.GeefTransporteur() = Transporteur.Streck){
+		Set ServiceLevelTime ="TF1"
+	} elseif (Rit.GeefTransporteur() = Transporteur.Schenker) {
+		#dim TotaalPalletPlaatsen as %Decimal = 0
+		#dim TotaalGewicht as %Decimal = LeveringInfo.Gewicht
+		set it = ##class(TECH.ListIterator).%New(LeveringInfo.VerpakkingEenheden)
+		While (it.HasNext()){
+			#dim VEenheid as APPS.TRANSP.dto.VerpakkingEenheid = it.Next()
+			Set TotaalPalletPlaatsen = TotaalPalletPlaatsen + ( $Select((VEenheid.Type = PalletType.HalveEuroPallet):0.5,$$$True:1) * VEenheid.Aantal)
+		}
+		if ..ProjectSettingsAPI.IsTranssmartESchenkerConnectieActief(){
+			if ( (TotaalPalletPlaatsen > 5) || (LeveringInfo.Gewicht >= 2500) ) {
+				Set ServiceLevelTime = "PARTLOAD"
+			} else {
+				Set ServiceLevelTime ="PREMIUM"
+			}
+		} else {			
+			If ( ( TotaalPalletPlaatsen >= 27 ) || ( LeveringInfo.Gewicht >= 19400 ) ) {
+				Set ServiceLevelTime ="FTL"
+			} elseif ( (TotaalPalletPlaatsen > 5) || (LeveringInfo.Gewicht >= 2500) ) { ; (2 loading meters max, 1 EUROPallet = 0.4lm, halve = 0.2lm
+				Set ServiceLevelTime ="LTL"
+			} else {
+				Set ServiceLevelTime ="PREMIUM"
+			}
+		}
+	} else {
+		Set ServiceLevelTime = ""
+	}
+	Quit ServiceLevelTime
+]]></Implementation>
+</Method>
 
-	Quit:(Rit.GeefTransporteur() = Transporteur.VRD) "STANDARD"
-	Quit:(Rit.GeefTransporteur() = Transporteur.DHL) "EUROPLUS"
-	Quit ""
+<Method name="BeperkLengteTot">
+<FormalSpec>Waarde:%String,Lengte:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Extract(Waarde,1,Lengte)
 ]]></Implementation>
 </Method>
+
+<Method name="MaakgetStatusHistoryByQueryRequest">
+<FormalSpec>Carrier:%String,DateFrom:%TimeStamp,DateTo:%TimeStamp</FormalSpec>
+<ReturnType>WS.Transsmart.tns.getStatusHistoryByQuery</ReturnType>
+<Implementation><![CDATA[
+	#dim Request as WS.Transsmart.tns.getStatusHistoryByQuery = ##class(WS.Transsmart.tns.getStatusHistoryByQuery).%New()
+	Do Request.shipmentInfo.carrierCodes.Insert( Carrier)
+	Set Request.shipmentInfo.dateTimeFrom = DateFrom
+	Set Request.shipmentInfo.dateTimeTo = DateTo
+	Set Request.shipmentInfo.incremental = "false"
+
+	Set Request.actionInfo.action = "getStatusHistoryByQuery"
+	Set Request.actionInfo.version = "2.0"
+	
+	Quit Request
+]]></Implementation>
+</Method>
 </Class>