Index: WS/Transsmart/TboxServicePort.cls.xml
===================================================================
diff -u -r68311 -r72356
--- WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 68311)
+++ WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 72356)
@@ -49,6 +49,13 @@
 <ReturnTypeParams>XMLNAME="doManifestResponse"</ReturnTypeParams>
 </Method>
 
+<Method name="getStatusHistoryByQuery">
+<Abstract>1</Abstract>
+<FormalSpec>getStatusHistoryByQuery:WS.Transsmart.tns.getStatusHistoryByQuery</FormalSpec>
+<ReturnType>WS.Transsmart.tns.getStatusHistoryByQueryResponse</ReturnType>
+<ReturnTypeParams>XMLNAME="getStatusHistoryByQueryResponse"</ReturnTypeParams>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[
 /*
@@ -71,12 +78,13 @@
 {
  Quit ..WebMethod("getStatusHistory").Invoke($this,"",.getStatusHistory)
 }
+*/
+]]></Content>
+</UDLText>
 
-Method getStatusHistoryByQuery(getStatusHistoryByQuery As WS.Transmart.tns.getStatusHistoryByQuery) As WS.Transmart.tns.getStatusHistoryByQueryResponse(XMLNAME="getStatusHistoryByQueryResponse") [ Final, ProcedureBlock = 1, SoapBindingStyle = document, SoapBodyUse = literal, WebMethod ]
-{
- Quit ..WebMethod("getStatusHistoryByQuery").Invoke($this,"",.getStatusHistoryByQuery)
-}
-
+<UDLText name="T">
+<Content><![CDATA[
+/*
 Method prepareShipment(prepareShipment As WS.Transmart.tns.prepareShipment) As WS.Transmart.tns.prepareShipmentResponse(XMLNAME="prepareShipmentResponse") [ Final, ProcedureBlock = 1, SoapBindingStyle = document, SoapBodyUse = literal, WebMethod ]
 {
  Quit ..WebMethod("prepareShipment").Invoke($this,"",.prepareShipment)
Index: WS/Transsmart/impl/TboxServicePort.cls.xml
===================================================================
diff -u -r68311 -r72356
--- WS/Transsmart/impl/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 68311)
+++ WS/Transsmart/impl/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 72356)
@@ -198,6 +198,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="getStatusHistoryByQuery">
+<Final>1</Final>
+<FormalSpec>getStatusHistoryByQuery:WS.Transsmart.tns.getStatusHistoryByQuery</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>WS.Transsmart.tns.getStatusHistoryByQueryResponse</ReturnType>
+<WebMethod>1</WebMethod>
+<SoapBindingStyle>document</SoapBindingStyle>
+<SoapBodyUse>literal</SoapBodyUse>
+<ReturnTypeParams>XMLNAME="getStatusHistoryByQueryResponse"</ReturnTypeParams>
+<Implementation><![CDATA[ Quit ..WebMethod("getStatusHistoryByQuery").Invoke($this,"",.getStatusHistoryByQuery)
+]]></Implementation>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[
 /*
@@ -221,11 +234,6 @@
  Quit ..WebMethod("getStatusHistory").Invoke($this,"",.getStatusHistory)
 }
 
-Method getStatusHistoryByQuery(getStatusHistoryByQuery As WS.Transmart.tns.getStatusHistoryByQuery) As WS.Transmart.tns.getStatusHistoryByQueryResponse(XMLNAME="getStatusHistoryByQueryResponse") [ Final, ProcedureBlock = 1, SoapBindingStyle = document, SoapBodyUse = literal, WebMethod ]
-{
- Quit ..WebMethod("getStatusHistoryByQuery").Invoke($this,"",.getStatusHistoryByQuery)
-}
-
 Method prepareShipment(prepareShipment As WS.Transmart.tns.prepareShipment) As WS.Transmart.tns.prepareShipmentResponse(XMLNAME="prepareShipmentResponse") [ Final, ProcedureBlock = 1, SoapBindingStyle = document, SoapBodyUse = literal, WebMethod ]
 {
  Quit ..WebMethod("prepareShipment").Invoke($this,"",.prepareShipment)
Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r72255 -r72356
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72255)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
@@ -152,7 +152,7 @@
 	
 	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
@@ -567,18 +567,31 @@
 </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()
 	#dim ServiceLevelTime as %String = ""
-	Set:(Rit.GeefTransporteur() = Transporteur.VRD) ServiceLevelTime = "STANDARD"
-	Set:(Rit.GeefTransporteur() = Transporteur.DHL) ServiceLevelTime = "EUROPLUS"
-	Set:(Rit.GeefTransporteur() = Transporteur.HamannHDE) ServiceLevelTime = "NOSTACK"
-	Set:(Rit.GeefTransporteur() = Transporteur.Dachser) ServiceLevelTime = "TARGOFLEX"
-	Set:(Rit.GeefTransporteur() = Transporteur.Weiss) ServiceLevelTime ="STANDARD"
-	Set:(Rit.GeefTransporteur() = Transporteur.Schenker) ServiceLevelTime ="PREMIUM"
+	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.Schenker) {
+		Set ServiceLevelTime ="PREMIUM"
+	} else {
+		Set ServiceLevelTime = ""
+	}
 	Quit ServiceLevelTime
 ]]></Implementation>
 </Method>
@@ -590,6 +603,23 @@
 <Implementation><![CDATA[	Quit $Extract(Waarde,1,Lengte)
 ]]></Implementation>
 </Method>
+
+<Method name="MaakgetStatusHistoryByQueryRequest">
+<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</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( "SNB")
+	//Do Request.shipmentInfo.carrierCodes.Insert( "VRD")
+	Set Request.shipmentInfo.dateTimeFrom = DateFrom
+	Set Request.shipmentInfo.dateTimeTo = DateTo
+	Set Request.shipmentInfo.incremental = "false"
+	//Set Request.shipmentInfo.
+	Set Request.actionInfo.action = "getStatusHistoryByQuery"
+	Set Request.actionInfo.version = "2.0"
+	Quit Request
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml
===================================================================
diff -u -r68311 -r72356
--- APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 68311)
+++ APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
@@ -28,6 +28,12 @@
 <ReturnType>WS.Transsmart.tns.doManifest</ReturnType>
 </Method>
 
+<Method name="MaakgetStatusHistoryByQueryRequest">
+<Abstract>1</Abstract>
+<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</FormalSpec>
+<ReturnType>WS.Transsmart.tns.getStatusHistoryByQuery</ReturnType>
+</Method>
+
 <UDLText name="T">
 <Content><![CDATA[
 /*Method MaakReleaseRequests(LijstVerzendData As APPS.TRANSP.GLS.dto.VerzendDataLijst) As %ListOfObjects(ELEMENTTYPE="APPS.TRANSP.GLS.GLSv1.Bericht.dto.AbstractRequest") [ Abstract ]
Index: BL/Legacy/EWORDS6.cls.xml
===================================================================
diff -u -r72053 -r72356
--- BL/Legacy/EWORDS6.cls.xml	(.../EWORDS6.cls.xml)	(revision 72053)
+++ BL/Legacy/EWORDS6.cls.xml	(.../EWORDS6.cls.xml)	(revision 72356)
@@ -20,16 +20,17 @@
 	
  	#dim PickDatum As %Date =..GetPickDatum(ORDNr,$G(OLNr))
  	#dim VandaagOfMorgen As %Integer =$$$AndereDag
- 	if ##class(TECH.DateTime).IsVandaag(PickDatum) { 
- 		set VandaagOfMorgen=$select( ##class(TECH.DateTime).HorologToTime($Horolog) < ..GeefKantelPuntDoorsturenPicking(ORDNr):$$$Vandaag, 1:$$$Morgen)
+ 	if ##class(TECH.Context).Instance().GeefDateTimeAPI().IsVandaag(PickDatum){
+ 		set VandaagOfMorgen=$select( ##class(TECH.DateTime).HorologToTime(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog()) < ..GeefKantelPuntDoorsturenPicking(ORDNr):$$$Vandaag, 1:$$$Morgen)
  	} elseif ..IsVolgendeArbeidsdag(PickDatum) { set VandaagOfMorgen = $$$Morgen }
  	
  	
- 	If (VandaagOfMorgen=$$$Morgen) && $$VerzendwDD1^EWORDS6(ORDNr)  ; Indien verzendwijze is DD1 maar moet normaal pas morgen vertrekken dan toch vandaag laten vertrekken - PV 02 05 2023
+ 	If (VandaagOfMorgen=$$$Morgen) && ..VerzendwDD1(ORDNr)  ; Indien verzendwijze is DD1 maar moet normaal pas morgen vertrekken dan toch vandaag laten vertrekken - PV 02 05 2023
  	{
 	 	Set VandaagOfMorgen=$$$Vandaag
-	}
- 	If (VandaagOfMorgen=$$$Morgen) && ($P($H,",",2)/3600<18) && '$G(OLNr) ; Pas na 18 uur mogen de opdrachten voor de volgende werkdag actief worden - PV 02 05 2023
+	} 
+	;w !,##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog()
+ 	If (VandaagOfMorgen=$$$Morgen) && ($P(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog(),",",2)/3600<18) && '$G(OLNr) ; Pas na 18 uur mogen de opdrachten voor de volgende werkdag actief worden - PV 02 05 2023
  	{
  		Set VandaagOfMorgen=$$$AndereDag
  	}
@@ -38,6 +39,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerzendwDD1">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ORDNr:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$VerzendwDD1^EWORDS6(ORDNr)
+]]></Implementation>
+</Method>
+
 <Method name="GetPickDatum">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ORDNr:%String,OLNr:%String</FormalSpec>
@@ -58,7 +67,8 @@
 <Implementation><![CDATA[
 	New D,Q,U
 	Set D="\",Q="K",U=";"
-	quit +$$CALCDATE^vhLib.DataTypes($H,"A",1)=+Datum
+	;quit +$$CALCDATE^vhLib.DataTypes($H,"A",1)=+Datum
+	quit +$$CALCDATE^vhLib.DataTypes(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog(),"A",1)=+Datum
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/BL/Legacy/EWORDS6Mock.cls.xml
===================================================================
diff -u -r29059 -r72356
--- vhUnitTest/BL/Legacy/EWORDS6Mock.cls.xml	(.../EWORDS6Mock.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/Legacy/EWORDS6Mock.cls.xml	(.../EWORDS6Mock.cls.xml)	(revision 72356)
@@ -9,7 +9,9 @@
 <ReturnType>%Time</ReturnType>
 <Implementation><![CDATA[
 	#define 1uur	3600
-	#dim KantelPuntDoorsturenPicking As %Time = ##class(TECH.DateTime).CurrentTime()
+	;#dim KantelPuntDoorsturenPicking As %Time = ##class(TECH.DateTime).CurrentTime()
+	#dim KantelPuntDoorsturenPicking As %Time = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentTime()
+	; #dim KantelPuntDoorsturenPicking As %Time = 18*3600
 	
 	if ORDNr = 100000 set KantelPuntDoorsturenPicking = KantelPuntDoorsturenPicking + $$$1uur
 	if ORDNr = 100001 set KantelPuntDoorsturenPicking = KantelPuntDoorsturenPicking - $$$1uur
@@ -18,6 +20,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VerzendwDD1">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ORDNr:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$False
+]]></Implementation>
+</Method>
+
 <Method name="IsVolgendeArbeidsdag">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Datum:%Date</FormalSpec>
Index: APPS/TRANSP/Transsmart/data/VerzendData.cls.xml
===================================================================
diff -u -r60003 -r72356
--- APPS/TRANSP/Transsmart/data/VerzendData.cls.xml	(.../VerzendData.cls.xml)	(revision 60003)
+++ APPS/TRANSP/Transsmart/data/VerzendData.cls.xml	(.../VerzendData.cls.xml)	(revision 72356)
@@ -80,6 +80,18 @@
 <Parameter name="MAXLEN" value="255"/>
 </Property>
 
+<Property name="TranssmartLastStatus">
+<Type>%String</Type>
+</Property>
+
+<Property name="TranssmartLastStatusTimestamp">
+<Type>%TimeStamp</Type>
+</Property>
+
+<Property name="TranssmartLastModification">
+<Type>%TimeStamp</Type>
+</Property>
+
 <Method name="GeefID">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..%Id()
@@ -108,7 +120,6 @@
 <Type>%Library.CacheStorage</Type>
 <DefaultData>VerzendDataDefaultData</DefaultData>
 <Data name="VerzendDataDefaultData">
-<Structure>listnode</Structure>
 <Subscript>"VerzendData"</Subscript>
 <Value name="1">
 <Value>ID</Value>
@@ -149,6 +160,15 @@
 <Value name="13">
 <Value>TrackAndTraceUrl</Value>
 </Value>
+<Value name="14">
+<Value>TranssmartLastStatus</Value>
+</Value>
+<Value name="15">
+<Value>TranssmartLastStatusTimestamp</Value>
+</Value>
+<Value name="16">
+<Value>TranssmartLastModification</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: APPS/TRANSP/Transsmart/impl/FeedbackVerzamelaar.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/Transsmart/impl/FeedbackVerzamelaar.cls.xml	(revision 0)
+++ APPS/TRANSP/Transsmart/impl/FeedbackVerzamelaar.cls.xml	(revision 72356)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.Transsmart.impl.FeedbackVerzamelaar">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="VerzenddataRepository">
+<Type>APPS.TRANSP.Transsmart.data.VerzendDataRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>VerzenddataRepository:APPS.TRANSP.Transsmart.data.VerzendDataRepository=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..VerzenddataRepository = $$$Inject(VerzenddataRepository,##class(APPS.TRANSP.Transsmart.data.VerzendDataRepository).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHistoryByQueryResponse">
+<FormalSpec>Response:WS.Transsmart.tns.getStatusHistoryByQueryResponse</FormalSpec>
+<Implementation><![CDATA[
+	Set InfoIterator=##class(TECH.ListIterator).%New(Response.shipmentInfos)
+	While(InfoIterator.HasNext()){
+		#dim ShipmentInfo as WS.Transsmart.tns.GetStatusHistoryResponseShipmentInfo = InfoIterator.Next()
+		Do ##class(Tools.Wlip).%New(207).String(ShipmentInfo.carrier _ " " _ ShipmentInfo.reference)
+		If ..VerzenddataRepository.BestaatViaReference(ShipmentInfo.reference) {
+			#dim Verzenddata as APPS.TRANSP.Transsmart.data.VerzendData = ..VerzenddataRepository.GeefViaReference(ShipmentInfo.reference)
+			Set StatusIterator = ##class(TECH.ListIterator).%New(ShipmentInfo.shipmentStatuses)
+			While (StatusIterator.HasNext()){
+				#dim ShipmentStatus as WS.Transsmart.tns.GetStatusHistoryResponseShipmentStatus = StatusIterator.Next()
+				;<eventDate>20230821</eventDate>
+                ;<eventTime>114311</eventTime
+				#dim EventDate as %Date = $ZDATEH(ShipmentStatus.eventDate,8)
+				#dim EventTime as %Time = $ZTIMEH($Extract(ShipmentStatus.eventTime,1,2)_":"_$Extract(ShipmentStatus.eventTime,3,4)_":" _ $Extract(ShipmentStatus.eventTime,5,6),1)
+				#dim EventTimestamp = ##class(TECH.DateTime).DateTimeToTimeStamp(EventDate,EventTime)
+				Do ##class(vhLib.Logger).%New().Info("Updating Transportstatus","Zending met ref '"_ ShipmentInfo.reference _"' kreeg status '"_ShipmentStatus.shipmentStatusCode_ "' op " _EventTimestamp)
+
+				If ($$$Not(Verzenddata.TranssmartLastStatus = ShipmentStatus.shipmentStatusCode)){
+					If ((Verzenddata.TranssmartLastStatusTimestamp = "") || (##class(TECH.DateTime).TimeStampVerschil("ss", Verzenddata.TranssmartLastStatusTimestamp,EventTimestamp) > 0 )){
+						Set Verzenddata.TranssmartLastStatusTimestamp = EventTimestamp
+						Set Verzenddata.TranssmartLastStatus = ShipmentStatus.shipmentStatusCode
+						Set Verzenddata.TranssmartLastModification = ##class(TECH.DateTime).CurrentTimeStamp()
+						Do ..VerzenddataRepository.Bewaar(Verzenddata)
+						Do ##class(vhLib.Logger).%New().Info("Updating Transportstatus","Zending met ref '"_ ShipmentInfo.reference _"' kreeg status '"_ShipmentStatus.shipmentStatusCode_ "' op " _EventTimestamp)
+					}
+				}
+			}
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="FormatDate">
+<FormalSpec>DateString:%String,TimeString:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Result as String = ""
+	Set Result = $E(DateString,1,4) _ "-" _ $E(DateString,5,6)_ "-" _ $E(DateString,7,8)
+	Set Result = Result _ " " _ $E(TimeString,1,2) _ ":" _ $E(TimeString,3,4) _ ":" _ $E(TimeString,5,6)
+	Quit Result
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r71268 -r72356
--- APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 71268)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 72356)
@@ -76,6 +76,46 @@
 	Do ManifesteerTransporteur.Manifesteer(Transporteur,CostCenter,PickupDatumVan,PickupDatumTot)
 ]]></Implementation>
 </Method>
+
+<Method name="QueryHistory">
+<Implementation><![CDATA[
+	Set HistoryByQuery = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.HistoryByQuery).%New()
+	Do HistoryByQuery.QueryStatusHistory("SNB","2023-08-01 00:00:00","2023-08-31 23:59:59")
+	/*
+	haal de carriers op uit config item
+	per carrier
+		haal de laatste verwerkte timestamp op voor carrier
+		zolang laatste timestamp + te controleren duur < nu
+			QueryStatusHistory(carrier, laatste timestamp ,laatste timestamp + te controleren duur)
+			Update CarrierLaatstetimestamp 
+	
+	*/
+]]></Implementation>
+</Method>
+
+<Method name="TestLoop">
+<Implementation><![CDATA[
+	#dim Carriers as %String = "SNB,DAC"
+	#dim CurrentTimeStamp as %TimeStamp = ##class(TECH.DateTime).CurrentTimeStamp()
+	
+	
+	Set CarrierIterator = ##class(TECH.PiecesIterator).%New(Carriers,",")
+	while CarrierIterator.HasNext() {
+		#dim Carrier as %String = CarrierIterator.Next()
+		#dim CarrierLastTimeStamp as %TimeStamp = "2023-12-07 12:00:00"
+		w !,Carrier_ " " _CarrierLastTimeStamp
+		while (##class(TECH.DateTime).TimeStampVerschil("hh",CarrierLastTimeStamp,CurrentTimeStamp) > 0 ){
+			w !,##class(TECH.DateTime).TimeStampVerschil("hh",CarrierLastTimeStamp,CurrentTimeStamp)
+			#dim CarrierTimeStampTo as %TimeStamp = ##class(TECH.DateTime).TimeStampBereken(CarrierLastTimeStamp,2,"hh")
+			w "   van " _ CarrierLastTimeStamp _" tot " _ CarrierTimeStampTo
+
+			Set CarrierLastTimeStamp = CarrierTimeStampTo
+
+		}
+		w !,CarrierLastTimeStamp
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r71274 -r72356
--- APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 71274)
+++ APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 72356)
@@ -117,17 +117,21 @@
 <Private>1</Private>
 <ReturnType>WS.Transsmart.tns.getStatusResponse</ReturnType>
 <Implementation><![CDATA[
+	
 	do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,Request.%ClassName(1))
+	Do ##class(Tools.Wlip).%New(207).XMLAdapter(Request)
 	#dim Response as WS.Transsmart.tns.getStatusResponse =""
 	Try {
 		Set:(Request.%IsA(##class(WS.Transsmart.tns.doBooking).%ClassName(1))) Response = ..TranssmartWSClient.doBooking(Request)
 		Set:(Request.%IsA(##class(WS.Transsmart.tns.doDelete).%ClassName(1))) Response = ..TranssmartWSClient.doDelete(Request)
 		Set:(Request.%IsA(##class(WS.Transsmart.tns.doManifest).%ClassName(1))) Response = ..TranssmartWSClient.doManifest(Request)
+		Set:(Request.%IsA(##class(WS.Transsmart.tns.getStatusHistoryByQuery).%ClassName(1))) Response = ..TranssmartWSClient.getStatusHistoryByQuery(Request)
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(vhLib.Logger).LogEnMailExceptie(Exception)
 		Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
 	}	
+	Do ##class(Tools.Wlip).%New(207).XMLAdapter(Response)
 	Quit Response
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml
===================================================================
diff -u -r68311 -r72356
--- vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 68311)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
@@ -35,6 +35,13 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakgetDocsRequest",Reference)
 ]]></Implementation>
 </Method>
+
+<Method name="MaakgetStatusHistoryByQueryRequest">
+<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</FormalSpec>
+<ReturnType>WS.Transsmart.tns.getStatusHistoryByQuery</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakgetStatusHistoryByQueryRequest",Carrier,DateFrom,DateTo)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/APPS/TRANSP/Transsmart/data/VerzendDataRepository.cls.xml
===================================================================
diff -u -r66964 -r72356
--- vhTest/Fake/APPS/TRANSP/Transsmart/data/VerzendDataRepository.cls.xml	(.../VerzendDataRepository.cls.xml)	(revision 66964)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/data/VerzendDataRepository.cls.xml	(.../VerzendDataRepository.cls.xml)	(revision 72356)
@@ -14,6 +14,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatViaReference">
+<FormalSpec>Reference:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="Bewaar">
 <FormalSpec>Data:TECH.Persistent</FormalSpec>
 <Implementation><![CDATA[
Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r71139 -r72356
--- vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 71139)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
@@ -48,6 +48,13 @@
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="MaakgetStatusHistoryByQueryRequest">
+<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</FormalSpec>
+<ReturnType>WS.Transsmart.tns.getStatusHistoryByQuery</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/TRANSP/Transsmart/data/VerzendDataRepository.cls.xml
===================================================================
diff -u -r67701 -r72356
--- APPS/TRANSP/Transsmart/data/VerzendDataRepository.cls.xml	(.../VerzendDataRepository.cls.xml)	(revision 67701)
+++ APPS/TRANSP/Transsmart/data/VerzendDataRepository.cls.xml	(.../VerzendDataRepository.cls.xml)	(revision 72356)
@@ -15,6 +15,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatViaReference">
+<FormalSpec>Reference:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..BestaatViaFilter("Reference = ? and LaatsteRequestType = 'Registratie' and status = 'Finished'", $LB(Reference))
+]]></Implementation>
+</Method>
+
+<Method name="BestaatViaFilter">
+<FormalSpec>Filter:%String,Params:%List</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..DataClassName)
+	#dim SqlStatement As TECH.String = "SELECT ID1 FROM " _SqlTableName _" WHERE " _Filter
+
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement,Params))
+
+	Quit ResultSet.Next()
+]]></Implementation>
+</Method>
+
 <Method name="GeefViaFilter">
 <FormalSpec>Filter:%String,Params:%List</FormalSpec>
 <Private>1</Private>
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService/HistoryByQuery.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/Transsmart/impl/CommunicatieService/HistoryByQuery.cls.xml	(revision 0)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService/HistoryByQuery.cls.xml	(revision 72356)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.Transsmart.impl.CommunicatieService.HistoryByQuery">
+<Super>APPS.TRANSP.Transsmart.impl.BerichtVerzenderTemplate</Super>
+
+<Property name="FeedbackVerzamelaar">
+<Type>APPS.TRANSP.Transsmart.impl.FeedbackVerzamelaar</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr="",ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI="",TranssmartWSClient:WS.Transsmart.TboxServicePort="",RequestBouwer:APPS.TRANSP.Transsmart.RequestDataBouwer="",ResponseControleur:APPS.TRANSP.Transsmart.impl.ResponseControleur="",VerzendDataRepository:APPS.TRANSP.Transsmart.data.VerzendDataRepository="",FeedbackVerzamelaar:APPS.TRANSP.Transsmart.impl.FeedbackVerzamelaar=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do ##super(ConfigMgr,ProjectSettingsAPI,TranssmartWSClient,RequestBouwer,ResponseControleur,VerzendDataRepository)
+	Set ..FeedbackVerzamelaar = $$$Inject(FeedbackVerzamelaar,##class(APPS.TRANSP.Transsmart.impl.FeedbackVerzamelaar).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="QueryStatusHistory">
+<FormalSpec>Carrier:%String,DateFrom:%Date,DateTo:%Date</FormalSpec>
+<Implementation><![CDATA[
+	Quit:$$$Not(..IsActief())	
+	#dim Request as WS.Transsmart.tns.getStatusHistoryByQuery = ..RequestBouwer.MaakgetStatusHistoryByQueryRequest(Carrier, DateFrom,DateTo)
+	Do ..VerwerkRequest(Request)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkRequest">
+<FormalSpec>Request:WS.Transsmart.tns.RequestBase</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
+<Implementation><![CDATA[
+	Try {
+		#dim Response As WS.Transsmart.tns.getStatusHistoryByQueryResponse = ..VerzendBericht(Request)
+		Do ..VerwerkResponse(Response)
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ##class(vhLib.Logger).%New("Transsmart").ErrorMail("VerwerkRequest","Verzenden bericht mislukt."_$C(13,10)_$C(13,10)_Exception.ToString())
+
+		Set Error =##class(APPS.TRANSP.Transsmart.Error).%New()
+		Set Error.ErrorCode = "VH99"
+		Set Error.Omschrijving = Exception.GeefOmschrijving()
+		Set Error.Niveau = ##class(TECH.Exceptions.enu.Niveau).Error()		
+	}
+	/*
+	If ..ResponseControleur.ResponseBevatFout(Response) {
+		Set Error = ..ResponseControleur.GeefFoutInResponse(Response)
+		Do ..ThrowError(Error)
+	}
+	*/	
+	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkResponse">
+<FormalSpec>Response:WS.Transsmart.tns.getStatusHistoryByQueryResponse</FormalSpec>
+<Implementation><![CDATA[	Do ..FeedbackVerzamelaar.VerwerkHistoryByQueryResponse(Response)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r69616 -r72356
--- vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 69616)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
@@ -56,6 +56,13 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakgetDocsRequest",Reference)
 ]]></Implementation>
 </Method>
+
+<Method name="MaakgetStatusHistoryByQueryRequest">
+<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</FormalSpec>
+<ReturnType>WS.Transsmart.tns.getStatusHistoryByQuery</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakgetStatusHistoryByQueryRequest",Carrier,DateFrom,DateTo)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/TRANSP/Transsmart/data/VerzendDataRepository.cls.xml
===================================================================
diff -u -r66964 -r72356
--- vhTest/Mock/APPS/TRANSP/Transsmart/data/VerzendDataRepository.cls.xml	(.../VerzendDataRepository.cls.xml)	(revision 66964)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/data/VerzendDataRepository.cls.xml	(.../VerzendDataRepository.cls.xml)	(revision 72356)
@@ -22,6 +22,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatViaReference">
+<FormalSpec>Reference:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BestaatViaReference",Reference)
+]]></Implementation>
+</Method>
+
 <Method name="Bewaar">
 <FormalSpec>Data:TECH.Persistent</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("Bewaar",Data)
Index: WS/Transsmart/tns/GetStatusHistoryByQueryShipmentInfo.cls.xml
===================================================================
diff -u -r59489 -r72356
--- WS/Transsmart/tns/GetStatusHistoryByQueryShipmentInfo.cls.xml	(.../GetStatusHistoryByQueryShipmentInfo.cls.xml)	(revision 59489)
+++ WS/Transsmart/tns/GetStatusHistoryByQueryShipmentInfo.cls.xml	(.../GetStatusHistoryByQueryShipmentInfo.cls.xml)	(revision 72356)
@@ -54,8 +54,9 @@
 <Type>%String</Type>
 <Collection>list</Collection>
 <Parameter name="MAXLEN"/>
+<Parameter name="XMLITEMNAME" value="carrierCode"/>
 <Parameter name="XMLNAME" value="carrierCodes"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+<Parameter name="XMLPROJECTION" value="WRAPPED"/>
 </Property>
 
 <Property name="costCenters">
Index: vhTest/Mock/WS/Transsmart/TboxServicePort.cls.xml
===================================================================
diff -u -r68311 -r72356
--- vhTest/Mock/WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 68311)
+++ vhTest/Mock/WS/Transsmart/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 72356)
@@ -54,6 +54,13 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("getLabel",getLabel)
 ]]></Implementation>
 </Method>
+
+<Method name="getStatusHistoryByQuery">
+<FormalSpec>getStatusHistoryByQuery:WS.Transsmart.tns.getStatusHistoryByQuery</FormalSpec>
+<ReturnType>WS.Transsmart.tns.getStatusHistoryByQueryResponse</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("getStatusHistoryByQuery",getStatusHistoryByQuery)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/BL/Legacy/EWORDS6.cls.xml
===================================================================
diff -u -r50027 -r72356
--- vhUnitTest/BL/Legacy/EWORDS6.cls.xml	(.../EWORDS6.cls.xml)	(revision 50027)
+++ vhUnitTest/BL/Legacy/EWORDS6.cls.xml	(.../EWORDS6.cls.xml)	(revision 72356)
@@ -8,11 +8,23 @@
 	#define AndereDag	0
 	#define Vandaag		1
 	#define Morgen      2
+
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	#dim DateTimeApiFake as TECH.DateTime.DateTimeApi =  ##class(TECH.Context).Instance().GeefDateTimeAPI()
+
+	#dim Kantelpunt18h as %String = DateTimeApiFake.CurrentHorolog()
+	set $P(Kantelpunt18h,",",+2) = 18*3600
+
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer(Kantelpunt18h) // zet 
 	
 	do ##class(vhUnitTest.BL.Legacy.EWORDS6Mock).ZetPickDatum(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
+	// na 18h ene voor morgen -> vandaag
 	do $$$AssertEquals(##class(vhUnitTest.BL.Legacy.EWORDS6Mock).PickingVoorVandaagVolgendeArbeidsdagOfAndereDag(100000),$$$Vandaag,"Is voor vandaag .. 100000 heeft een vroeger kantel moment")
-	do $$$AssertEquals(##class(vhUnitTest.BL.Legacy.EWORDS6Mock).PickingVoorVandaagVolgendeArbeidsdagOfAndereDag(100001),$$$Morgen,"Is voor andere dag .. 100001 heeft een langer kantel moment")
+	// voor 18h ene voor morgen, en niet DD1 -> andere
+	do $$$AssertEquals(##class(vhUnitTest.BL.Legacy.EWORDS6Mock).PickingVoorVandaagVolgendeArbeidsdagOfAndereDag(100001),$$$AndereDag,"Is voor andere dag .. 100001 heeft een langer kantel moment")
 	
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
+	
 	do ##class(vhUnitTest.BL.Legacy.EWORDS6Mock).ZetPickDatum(..GeefVolgendeNietArbeidsdag())
 	do $$$AssertEquals(##class(vhUnitTest.BL.Legacy.EWORDS6Mock).PickingVoorVandaagVolgendeArbeidsdagOfAndereDag(100002),$$$AndereDag,"Is voor andere dag .. want morgen is zogezegd geen arbeidsdag")