Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r60091 -r60141
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60091)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 60141)
@@ -43,6 +43,7 @@
 </Method>
 
 <Method name="GeefActionInfoGetDocs">
+<Private>1</Private>
 <ReturnType>WS.Transsmart.tns.GetDocsActionInfo</ReturnType>
 <Implementation><![CDATA[
 	Set ActionInfo = ##class(WS.Transsmart.tns.GetDocsActionInfo).%New()
@@ -53,6 +54,7 @@
 </Method>
 
 <Method name="GeefActionInfoDoDelete">
+<Private>1</Private>
 <ReturnType>WS.Transsmart.tns.DoDeleteActionInfo</ReturnType>
 <Implementation><![CDATA[
 	Set ActionInfo = ##class(WS.Transsmart.tns.DoDeleteActionInfo).%New()
@@ -64,6 +66,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()
@@ -114,6 +117,7 @@
 	Set ShipmentInfo.serviceLevelTime = ..BepaalShipmentInfoServiceLevelTime(Rit)	
 	Set ShipmentInfo.inbound = 0
 	Set ShipmentInfo.loadmeter = 0
+	Set ShipmentInfo.pickupDate = ..BepaalPickupDate(LeveringInfo)
 	Set ShipmentInfo.noOfPackages = LeveringInfo.AantalVerpakkingEenhedenTotaal
 	Set ShipmentInfo.instruction = ..GeefInstruction(LeveringInfo)
 	#dim GewichtPerEenheid as %Numeric = ##class(TECH.Math).Round(LeveringInfo.Gewicht / LeveringInfo.AantalVerpakkingEenhedenTotaal,2)
@@ -138,6 +142,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BepaalPickupDate">
+<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	; als de afleverdatum niet de volgende werkdag is, zet dan de pickupdatum op de volgende werkdag
+	#dim Datum as %Date
+	if $$$Not(##class(TECH.DateTime).BerekenWerkdag(+$H,1) = LeveringInfo.AfleverDatum) {
+		Set Datum = ##class(TECH.DateTime).BerekenWerkdag(+$H,1)
+	} else {
+		Set Datum = +$H
+	}
+	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>
@@ -286,6 +306,7 @@
 
 <Method name="BepaalPackageType">
 <FormalSpec>VerpakkingEenheidType:DOM.TRANSP.enu.VerpakkingEenheidType</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	; mappings volgens voorstudie transsmart.
@@ -301,6 +322,7 @@
 
 <Method name="BepaalBookingInfoCarrier">
 <FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
@@ -312,6 +334,7 @@
 
 <Method name="BepaalShipmentInfoServiceLevelTime">
 <FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()