Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r72356 -r72373
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72373)
@@ -605,18 +605,18 @@
 </Method>
 
 <Method name="MaakgetStatusHistoryByQueryRequest">
-<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</FormalSpec>
+<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( "SNB")
-	//Do Request.shipmentInfo.carrierCodes.Insert( "VRD")
+	Do Request.shipmentInfo.carrierCodes.Insert( Carrier)
 	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>
Index: vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml
===================================================================
diff -u -r72356 -r72373
--- vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72373)
@@ -37,7 +37,7 @@
 </Method>
 
 <Method name="MaakgetStatusHistoryByQueryRequest">
-<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</FormalSpec>
+<FormalSpec>Carrier:%String,DateFrom:%TimeStamp,DateTo:%TimeStamp</FormalSpec>
 <ReturnType>WS.Transsmart.tns.getStatusHistoryByQuery</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakgetStatusHistoryByQueryRequest",Carrier,DateFrom,DateTo)
 ]]></Implementation>
Index: APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r72356 -r72373
--- APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 72356)
+++ APPS/TRANSP/Transsmart/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 72373)
@@ -119,8 +119,7 @@
 <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 =""
+	#dim Response as %String ="" ; 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)
@@ -131,7 +130,6 @@
 		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: APPS/TRANSP/Transsmart/impl/ResponseControleur.cls.xml
===================================================================
diff -u -r68595 -r72373
--- APPS/TRANSP/Transsmart/impl/ResponseControleur.cls.xml	(.../ResponseControleur.cls.xml)	(revision 68595)
+++ APPS/TRANSP/Transsmart/impl/ResponseControleur.cls.xml	(.../ResponseControleur.cls.xml)	(revision 72373)
@@ -26,9 +26,13 @@
 			 	}			
 			}
 		}
-	} else {
+	} elseif (Response.%ClassName(1) = "WS.Transsmart.tns.getStatusHistoryByQueryResponse") {
 		If $$$Not(##class(TECH.StringUtils).Equals(Response.statusResponseInfo.status, "OK")){		
 			Set BevatFout = $$$True
+		}
+	} else  {
+		If $$$Not(##class(TECH.StringUtils).Equals(Response.statusResponseInfo.status, "OK")){		
+			Set BevatFout = $$$True
 		} else {
 			#dim ResponseStatus = ##class(APPS.TRANSP.Transsmart.enu.ShipmentStatusCode.AutoComplete).%New()
 			Set BevatFout = ##class(TECH.StringUtils).Equals(Response.shipmentStatus.shipmentStatusCode, ResponseStatus.Refu,ResponseStatus.Err )
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r72356 -r72373
--- APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 72356)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 72373)
@@ -13,16 +13,27 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ConfigMgr">
+<Type>TECH.Config.ConfigMgr</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="HistoryByQuery">
+<Type>APPS.TRANSP.Transsmart.impl.CommunicatieService.HistoryByQuery</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI,UitgesteldeZendingLijst:APPS.TRANSP.VRD.UitgesteldeZendingLijst=""</FormalSpec>
+<FormalSpec>ProjectSettingsAPI:DOM.common.impl.ProjectSettingsAPI,UitgesteldeZendingLijst:APPS.TRANSP.VRD.UitgesteldeZendingLijst="",HistoryByQuery:APPS.TRANSP.Transsmart.impl.CommunicatieService.HistoryByQuery="",ConfigMgr:TECH.Config.ConfigMgr=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ProjectSettingsAPI = $$$Inject(ProjectSettingsAPI, ##class(DOM.common.impl.ProjectSettingsAPI).%New())
 	Set ..UitgesteldeZendingLijst = $$$Inject(UitgesteldeZendingLijst,##class(APPS.TRANSP.VRD.UitgesteldeZendingLijst).%New())
-	
+	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).%New())
+	Set ..HistoryByQuery = $$$Inject(HistoryByQuery, ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.HistoryByQuery).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -77,10 +88,12 @@
 ]]></Implementation>
 </Method>
 
-<Method name="QueryHistory">
+<Method name="TestTwo">
 <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")
+	Do ..HistoryByQuery.QueryStatusHistory("SNB","2023-08-20 00:00:00","2023-08-31 23:59:59")
+	;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
@@ -93,29 +106,49 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestLoop">
+<Method name="QueryCarrierHistory">
 <Implementation><![CDATA[
-	#dim Carriers as %String = "SNB,DAC"
+
+	Set Carriers = ##class(TECH.Config.ConfigMgr).%New().GeefString("TranssmartHistoryCarriers")
 	#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
+	try {	
+		while CarrierIterator.HasNext() {
+			#dim Carrier as %String = CarrierIterator.Next()
+			#dim CarrierLastTimeStamp as %TimeStamp = ..GeefCarrierLastTimeStamp(Carrier)
+			Do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,"Opvragen Transportstatus historiek voor "_ Carrier _ " sinds " _ CarrierLastTimeStamp)
+			while (##class(TECH.DateTime).TimeStampVerschil("hh",CarrierLastTimeStamp,CurrentTimeStamp) > 2 ){ 
+				#dim CarrierTimeStampTo as %TimeStamp = ##class(TECH.DateTime).TimeStampBereken(CarrierLastTimeStamp,2,"hh")
+				;Do ##class(vhLib.Logger).%New().Info(..%ClassName(1)_"::"_$$$CurrentMethod,"Opvragen Transportstatus historiek voor "_ Carrier _ " van " _ CarrierLastTimeStamp _ " tot " _ CarrierTimeStampTo)
+				Set ..HistoryByQuery = ##class(APPS.TRANSP.Transsmart.impl.CommunicatieService.HistoryByQuery).%New()
+				Do ..HistoryByQuery.QueryStatusHistory(Carrier, CarrierLastTimeStamp, CarrierTimeStampTo)
 
-			Set CarrierLastTimeStamp = CarrierTimeStampTo
+				Set CarrierLastTimeStamp = CarrierTimeStampTo
+				Do ..ZetCarrierLastTimeStamp(Carrier,CarrierLastTimeStamp)
+				hang 1
 
+			}
 		}
-		w !,CarrierLastTimeStamp
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()		
+		Do ##class(vhLib.Logger).%New().ErrorMail(..%ClassName(1)_"::"_$$$CurrentMethod,"Opvragen Transportstatus historiek  mislukt."_$C(13,10)_$C(13,10)_Exception.ToString())
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="GeefCarrierLastTimeStamp">
+<FormalSpec>Carrier:%String</FormalSpec>
+<ReturnType>%TimeStamp</ReturnType>
+<Implementation><![CDATA[		Quit ..ConfigMgr.GeefString("TranssmartHistoryLastTimeStamp_"_Carrier,##class(TECH.DateTime).TimeStampBereken(##class(TECH.DateTime).CurrentTimeStamp(),-4,"hh"))
+]]></Implementation>
+</Method>
+
+<Method name="ZetCarrierLastTimeStamp">
+<FormalSpec>Carrier:%String,LastTimeStamp:%TimeStamp</FormalSpec>
+<Implementation><![CDATA[		Do ..ConfigMgr.ZetString("TranssmartHistoryLastTimeStamp_"_Carrier,LastTimeStamp)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/TRANSP/Transsmart/impl/FeedbackVerzamelaar.cls.xml
===================================================================
diff -u -r72356 -r72373
--- APPS/TRANSP/Transsmart/impl/FeedbackVerzamelaar.cls.xml	(.../FeedbackVerzamelaar.cls.xml)	(revision 72356)
+++ APPS/TRANSP/Transsmart/impl/FeedbackVerzamelaar.cls.xml	(.../FeedbackVerzamelaar.cls.xml)	(revision 72373)
@@ -27,7 +27,6 @@
 	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)
@@ -38,8 +37,7 @@
 				#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
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService/HistoryByQuery.cls.xml
===================================================================
diff -u -r72356 -r72373
--- APPS/TRANSP/Transsmart/impl/CommunicatieService/HistoryByQuery.cls.xml	(.../HistoryByQuery.cls.xml)	(revision 72356)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService/HistoryByQuery.cls.xml	(.../HistoryByQuery.cls.xml)	(revision 72373)
@@ -36,8 +36,9 @@
 <ReturnType>APPS.TRANSP.Transsmart.data.VerzendData</ReturnType>
 <Implementation><![CDATA[
 	Try {
-		#dim Response As WS.Transsmart.tns.getStatusHistoryByQueryResponse = ..VerzendBericht(Request)
+		#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())
@@ -46,13 +47,12 @@
 		Set Error.ErrorCode = "VH99"
 		Set Error.Omschrijving = Exception.GeefOmschrijving()
 		Set Error.Niveau = ##class(TECH.Exceptions.enu.Niveau).Error()		
+		Do ..ThrowError(Error)
 	}
-	/*
 	If ..ResponseControleur.ResponseBevatFout(Response) {
 		Set Error = ..ResponseControleur.GeefFoutInResponse(Response)
 		Do ..ThrowError(Error)
 	}
-	*/	
 	Quit ""
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml
===================================================================
diff -u -r72356 -r72373
--- APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
+++ APPS/TRANSP/Transsmart/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72373)
@@ -30,7 +30,7 @@
 
 <Method name="MaakgetStatusHistoryByQueryRequest">
 <Abstract>1</Abstract>
-<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</FormalSpec>
+<FormalSpec>Carrier:%String,DateFrom:%TimeStamp,DateTo:%TimeStamp</FormalSpec>
 <ReturnType>WS.Transsmart.tns.getStatusHistoryByQuery</ReturnType>
 </Method>
 
Index: WS/Transsmart/impl/TboxServicePort.cls.xml
===================================================================
diff -u -r72356 -r72373
--- WS/Transsmart/impl/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 72356)
+++ WS/Transsmart/impl/TboxServicePort.cls.xml	(.../TboxServicePort.cls.xml)	(revision 72373)
@@ -207,7 +207,15 @@
 <SoapBindingStyle>document</SoapBindingStyle>
 <SoapBodyUse>literal</SoapBodyUse>
 <ReturnTypeParams>XMLNAME="getStatusHistoryByQueryResponse"</ReturnTypeParams>
-<Implementation><![CDATA[ Quit ..WebMethod("getStatusHistoryByQuery").Invoke($this,"",.getStatusHistoryByQuery)
+<Implementation><![CDATA[
+	#dim response = ""
+	try {
+		set response = ..WebMethod("getStatusHistoryByQuery").Invoke($this,"",.getStatusHistoryByQuery)
+	} catch {
+		Do ..RaiseException($$$CurrentMethod)
+	}
+
+	Quit response
 ]]></Implementation>
 </Method>
 
Index: vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r72356 -r72373
--- vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
+++ vhTest/Mock/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72373)
@@ -58,7 +58,7 @@
 </Method>
 
 <Method name="MaakgetStatusHistoryByQueryRequest">
-<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</FormalSpec>
+<FormalSpec>Carrier:%String,DateFrom:%TimeStamp,DateTo:%TimeStamp</FormalSpec>
 <ReturnType>WS.Transsmart.tns.getStatusHistoryByQuery</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakgetStatusHistoryByQueryRequest",Carrier,DateFrom,DateTo)
 ]]></Implementation>
Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r72356 -r72373
--- vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72356)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 72373)
@@ -50,7 +50,7 @@
 </Method>
 
 <Method name="MaakgetStatusHistoryByQueryRequest">
-<FormalSpec>Carrier:%String,DateFrom:%String,DateTo:%String</FormalSpec>
+<FormalSpec>Carrier:%String,DateFrom:%TimeStamp,DateTo:%TimeStamp</FormalSpec>
 <ReturnType>WS.Transsmart.tns.getStatusHistoryByQuery</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>