Index: OBJTimpl/Herbevoorrading/BouwProductVoorraad.cls.xml
===================================================================
diff -u -r68790 -r68860
--- OBJTimpl/Herbevoorrading/BouwProductVoorraad.cls.xml	(.../BouwProductVoorraad.cls.xml)	(revision 68790)
+++ OBJTimpl/Herbevoorrading/BouwProductVoorraad.cls.xml	(.../BouwProductVoorraad.cls.xml)	(revision 68860)
@@ -106,8 +106,8 @@
 <Implementation><![CDATA[
 	#Dim it as TECH.Iterator
 	#Dim rs as %ResultSet
-	
-	Set it=##class(OBJTimpl.Herbevoorrading.OphalenOpenstaandeOrders).%New().GeefIterator()
+	Set Ophaler = ##class(OBJTimpl.Herbevoorrading.OphalenOpenstaandeOrders).%New()
+	Set it=Ophaler.GeefIterator()
 	While it.HasNext()
 	{
 		Set rs=it.Next()
@@ -204,7 +204,8 @@
 <Implementation><![CDATA[
 	#Dim it as TECH.Iterator
 	#Dim rs as %ResultSet
-	Set it=##class(OBJTimpl.Herbevoorrading.OphalenProductenKlein).%New().GeefIterator()
+	Set Ophaler = ##class(OBJTimpl.Herbevoorrading.OphalenProductenKlein).%New()
+	Set it=Ophaler.GeefIterator()
 	While it.HasNext()
 	{
 		Set rs=it.Next()
Index: OBJTimpl/PM/OBJTIdentLookupService.cls.xml
===================================================================
diff -u -r67493 -r68860
--- OBJTimpl/PM/OBJTIdentLookupService.cls.xml	(.../OBJTIdentLookupService.cls.xml)	(revision 67493)
+++ OBJTimpl/PM/OBJTIdentLookupService.cls.xml	(.../OBJTIdentLookupService.cls.xml)	(revision 68860)
@@ -69,6 +69,7 @@
 		Do ..Logger.Info("Verwijderen ok")
 
 		Do ..Logger.Info("Einde")
+		do ..SQLConnection.Disconnect()
 		
 	} catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
Index: OBJTimpl/WMSOrder/ImporteerPicking.cls.xml
===================================================================
diff -u -r68821 -r68860
--- OBJTimpl/WMSOrder/ImporteerPicking.cls.xml	(.../ImporteerPicking.cls.xml)	(revision 68821)
+++ OBJTimpl/WMSOrder/ImporteerPicking.cls.xml	(.../ImporteerPicking.cls.xml)	(revision 68860)
@@ -50,83 +50,6 @@
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Volgende code is niet meer bijgewerkt, wegens niet meer gebruikt.
-Method Verwerk(XMLreader As %XML.Reader)
-{
-	Do ..VerwerkBestand(XMLreader)
-}
-
-Method VerwerkBestand(XMLreader As %XML.Reader)
-{
-	#include %occStatus
-	Do XMLreader.Rewind()
-	Do XMLreader.Correlate("AfmeldenPicking","OBJTimpl.WMSOrder.dtoCorrelatePicking")
-
-	While XMLreader.Next(.pxPicking,.sc) {
-		#dim AantalPerOrderLijn as %CacheString
-		If $$$ISOK(sc) {	
-			Set ..pxPicking = pxPicking
-			Set AantalPerOrderLijn(..pxPicking.LijnNr) = $Get(AantalPerOrderLijn(..pxPicking.LijnNr),0) + 1 
-		}
-	}
-	
-	Do XMLreader.Rewind()
-	#dim CountPerOrderLijn as %CacheString
-	While XMLreader.Next(.pxPicking,.sc){
-		If $$$ISOK(sc){	
-			Set ..pxPicking=pxPicking
-			Set CountPerOrderLijn(..pxPicking.LijnNr) = $Get(AantalPerOrderLijn(..pxPicking.LijnNr),0) + 1 
-			#dim Full as %Boolean = (CountPerOrderLijn(..pxPicking.LijnNr) = AantalPerOrderLijn(..pxPicking.LijnNr))
-			Do ..VerwerkPicking(Full)
-		}
-	}
-	Do ..VerwerkEinde()
-}
-*/
-]]></Content>
-</UDLText>
-
-<Method name="VerwerkManueel">
-<Description>
-Do ##class(OBJTimpl.WMSOrder.ImporteerPicking).%New().VerwerkManueel()</Description>
-<Implementation><![CDATA[
-	// er van uitgaande dat er maar één consolidatie in de PickLijst zit
-	
-	#dim ConsolidatieNr as %String 
-	read ConsolidatieNr
-	if ($P(^ORDW("D",$E(ConsolidatieNr,5,10),"S","V"),"\")'="W") || ($P(^ORDW("D",$e(ConsolidatieNr,5,10)),"\",20)="B") {
-		w !,"status niet 'W' of op bon"
-		Quit
-	}
-	#dim PickLijnIterator as TECH.ResultSetIterator = ..PickLijnenOphaler.GeefIterator(ConsolidatieNr)
-	
-	#dim AantalPerOrderLijn as %CacheString
-	K AantalPerOrderLijn
-	While PickLijnIterator.HasNext()
-	{
-		Set ..rsPicking=PickLijnIterator.Next()
-		Set AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")) = $Get(AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")),0) + 1
-	}
-	
-	Set PickLijnIterator = ..PickLijnenOphaler.GeefIterator(ConsolidatieNr)
-	
-	#dim CountPerOrderLijn as %CacheString
-	k CountPerOrderLijn
-	While PickLijnIterator.HasNext()
-	{
-		Set ..rsPicking=PickLijnIterator.Next()
-		Set CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")) = $Get(CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")),0) + 1 
-		#dim Full as %Boolean = (CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")) = AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")))
-		Do ..VerwerkPicking(Full,CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR"))-1)
-	}
-	Do ..VerwerkEinde()
-	W " Status",$P(^ORDW("D",$e(ConsolidatieNr,5,10)),"\",20,21),!
-]]></Implementation>
-</Method>
-
 <Method name="VerwerkWebservice">
 <FormalSpec>PickLijst:OBJTimpl.WMSOrder.dtoAfmeldenPicking</FormalSpec>
 <Implementation><![CDATA[
@@ -167,7 +90,7 @@
 		#dim Full as %Boolean = (CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")) = AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")))
 		Do ..VerwerkPicking(Full,CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR"))-1)
 	}
-	Do ..VerwerkEinde(Geannuleerd)
+	Do ..VerwerkEinde()
 ]]></Implementation>
 </Method>
 
@@ -214,7 +137,6 @@
 </Method>
 
 <Method name="VerwerkEinde">
-<FormalSpec>Annulatie:%Boolean=0</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	Kill C
@@ -224,7 +146,7 @@
 	Set C("SOFTV")="V"
 	Set C("CONSNR")=..CONSNr
 	Set C("DATUM")=$H
-    Set C("STATUS")=$Select(Annulatie:"PNOK",1:"POK")
+    Set C("STATUS")="POK"
 
 	Do ##class(vhLib.OldSchool).InitVars()
  	Do ##class(vhLib.Logger).%New("OBJT_WMS").Info("Pick einde",$$ArrayToText^vhLib("C",.C)) 
Index: OBJTimpl/Herbevoorrading/OphalenOpenstaandeOrders.cls.xml
===================================================================
diff -u -r67861 -r68860
--- OBJTimpl/Herbevoorrading/OphalenOpenstaandeOrders.cls.xml	(.../OphalenOpenstaandeOrders.cls.xml)	(revision 67861)
+++ OBJTimpl/Herbevoorrading/OphalenOpenstaandeOrders.cls.xml	(.../OphalenOpenstaandeOrders.cls.xml)	(revision 68860)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="SqlConnection">
+<Type>%SQLGatewayConnection</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ConfigMgr:TECH.Config.ConfigMgr=""</FormalSpec>
 <Private>1</Private>
@@ -16,10 +21,26 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	Set ..SqlConnection = ..GeefSQLConnectie()
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	if $IsObject(..SqlConnection){
+		do ..SqlConnection.Disconnect()
+	}
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefSQLConnectie">
 <ReturnType>%SQLGatewayConnection</ReturnType>
 <Implementation><![CDATA[
@@ -33,7 +54,6 @@
 <Method name="GeefIterator">
 <Implementation><![CDATA[
     Set rs=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnection as %SQLGatewayConnection =..GeefSQLConnectie()
 	#dim Status as %String = ""
     #dim SqlStatement as %String 
     Set SqlStatement= "select it.name ITEMID,sum(itemqty.QTYORDERED) QTYORDERED,sum(itemqty.QTYPICKED) QTYPICKED "
@@ -49,10 +69,10 @@
     
     try
     {
-    	Do rs.Prepare(SqlStatement,,OBJTConnection)
+    	Do rs.Prepare(SqlStatement,,..SqlConnection)
 	    Do rs.Execute()    
     } catch {
-	    do OBJTConnection.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     
Index: OBJTimpl/Herbevoorrading/OphalenVoorraad.cls.xml
===================================================================
diff -u -r68790 -r68860
--- OBJTimpl/Herbevoorrading/OphalenVoorraad.cls.xml	(.../OphalenVoorraad.cls.xml)	(revision 68790)
+++ OBJTimpl/Herbevoorrading/OphalenVoorraad.cls.xml	(.../OphalenVoorraad.cls.xml)	(revision 68860)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="SqlConnection">
+<Type>%SQLGatewayConnection</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ConfigMgr:TECH.Config.ConfigMgr=""</FormalSpec>
 <Private>1</Private>
@@ -16,10 +21,26 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	Set ..SqlConnection = ..GeefSQLConnectie()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	if $IsObject(..SqlConnection){
+		do ..SqlConnection.Disconnect()
+	}
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefSQLConnectie">
 <ReturnType>%SQLGatewayConnection</ReturnType>
 <Implementation><![CDATA[
@@ -33,7 +54,6 @@
 <Method name="GeefIteratorPODVoorraad">
 <Implementation><![CDATA[
     Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnection as %SQLGatewayConnection =..GeefSQLConnectie()
 	#dim Status as %String = ""
     #dim SqlStatement as %String 
     Set SqlStatement= "SELECT "
@@ -50,10 +70,10 @@
     
     try
     {
-    	Do res.Prepare(SqlStatement,,OBJTConnection)
+    	Do res.Prepare(SqlStatement,,..SqlConnection)
 	    Do res.Execute()    
     } catch {
-	    do OBJTConnection.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     
@@ -64,7 +84,6 @@
 <Method name="GeefIteratorKARDEXVoorraad">
 <Implementation><![CDATA[
     Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnection as %SQLGatewayConnection =..GeefSQLConnectie()
 	#dim Status as %String = ""
     #dim SqlStatement as %String 
     Set SqlStatement= "SELECT "
@@ -83,10 +102,10 @@
   	
     try
     {
-    	Do res.Prepare(SqlStatement,,OBJTConnection)
+    	Do res.Prepare(SqlStatement,,..SqlConnection)
 	    Do res.Execute()    
     }catch {
-	    do OBJTConnection.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
 	Quit ##class(TECH.ResultSetIterator).%New(res)
Index: OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml
===================================================================
diff -u -r67712 -r68860
--- OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml	(.../ImporteerVoorraadNiveau.cls.xml)	(revision 67712)
+++ OBJTimpl/WMSOrder/ImporteerVoorraadNiveau.cls.xml	(.../ImporteerVoorraadNiveau.cls.xml)	(revision 68860)
@@ -66,12 +66,13 @@
 
 <Method name="BepaalGepickteMaarNietAfgemeldeAantallen">
 <Implementation><![CDATA[
-	Set it=##class(OBJTimpl.WMSOrder.OphalenGeraapteVoorraadNiveau).%New().GeefIterator()
+	Set Ophaler = ##class(OBJTimpl.WMSOrder.OphalenGeraapteVoorraadNiveau).%New()
+	Set it=Ophaler.GeefIterator()
 	Kill ^OBJTVoorraad("CORR",..Vandaag)
 	Kill ^OBJTVoorraad("SQL",..Vandaag)
 
 	Set Entiteit="VHBE"
-	Set Tellere=0
+	Set Teller=0
 	While it.HasNext() 
 	{ 
 		Set rs=it.Next()
Index: OBJTimpl/WMSOrder/OphalenGepicktePalletInhoud.cls.xml
===================================================================
diff -u -r67931 -r68860
--- OBJTimpl/WMSOrder/OphalenGepicktePalletInhoud.cls.xml	(.../OphalenGepicktePalletInhoud.cls.xml)	(revision 67931)
+++ OBJTimpl/WMSOrder/OphalenGepicktePalletInhoud.cls.xml	(.../OphalenGepicktePalletInhoud.cls.xml)	(revision 68860)
@@ -9,8 +9,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="SqlQueryConnection">
-<Type>AXimpl.SqlQueryConnection</Type>
+<Property name="SqlConnection">
+<Type>%SQLGatewayConnection</Type>
 <Private>1</Private>
 </Property>
 
@@ -27,13 +27,28 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	Set ..SqlConnection = ..GeefSQLConnectie()
 	
 	//d ##class(TECH.Config.ConfigMgr).Instance().SetString("OBJTimpl.DatasourceName","OBJT_ACP")
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	if $IsObject(..SqlConnection){
+		do ..SqlConnection.Disconnect()
+	}
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefIterator">
 <FormalSpec>ConsolidatieNr:%String,LPN:%String</FormalSpec>
 <ReturnType>TECH.ResultSetIterator</ReturnType>
@@ -51,7 +66,6 @@
 <ReturnType>%ResultSet</ReturnType>
 <Implementation><![CDATA[
     Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnect as %SQLGatewayConnection = ..GeefSQLConnectie()
 	#dim Status as %String = ""
 	#Dim SqlStatement as %String = ""
 	Set SqlStatement = "select orders.ID CONSNR,olines.name LIJNNR,olines.QTYTARGET,pa.QTY AANTAL,item.NAME IDENTNR,tocont.LPN DOELPALLET "
@@ -85,10 +99,10 @@
 	_ " order by DOELPALLET,IDENTNR "		
     try
     {
-    	Do rs.Prepare(SqlStatement,,OBJTConnect)
+    	Do rs.Prepare(SqlStatement,,..SqlConnection)
 	    Do rs.Execute(ConsolidatieNr,LPN)    
     } catch {
-	    do OBJTConnect.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     Quit rs
@@ -100,7 +114,6 @@
 <ReturnType>TECH.ResultSetIterator</ReturnType>
 <Implementation><![CDATA[
     Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnect as %SQLGatewayConnection = ..GeefSQLConnectie()
 	#dim Status as %String = ""
 	#Dim SqlStatement as %String = ""
 	
@@ -120,10 +133,10 @@
 	_ " 	where c.LPN= '"_LPN_"') "		
     try
     {
-    	Do rs.Prepare(SqlStatement,,OBJTConnect)
+    	Do rs.Prepare(SqlStatement,,..SqlConnection)
 	    Do rs.Execute()    
     } catch {
-	    do OBJTConnect.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     Quit ##class(TECH.ResultSetIterator).%New(rs)
@@ -135,7 +148,6 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
     Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnect as %SQLGatewayConnection = ..GeefSQLConnectie()
 	#dim Status as %String = ""
 	#Dim SqlStatement as %String = ""
 	#dim ConsolidatieNummer as %String = ""
@@ -148,10 +160,10 @@
 	_ " where c.LPN= '"_LPN_"' "		
     try
     {
-    	Do rs.Prepare(SqlStatement,,OBJTConnect)
+    	Do rs.Prepare(SqlStatement,,..SqlConnection)
 	    Do rs.Execute()    
     } catch {
-	    do OBJTConnect.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     Quit ##class(TECH.ResultSetIterator).%New(rs)
@@ -163,7 +175,6 @@
 <ReturnType>TECH.ResultSetIterator</ReturnType>
 <Implementation><![CDATA[
     Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnect as %SQLGatewayConnection = ..GeefSQLConnectie()
 	#dim Status as %String = ""
 	#Dim SqlStatement as %String = ""
 	#dim ConsolidatieNummer as %String = ""
@@ -175,10 +186,10 @@
 	_ " order by DTSSTART desc "
     try
     {
-    	Do rs.Prepare(SqlStatement,,OBJTConnect)
+    	Do rs.Prepare(SqlStatement,,..SqlConnection)
 	    Do rs.Execute(LPN)    
     } catch {
-	    do OBJTConnect.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     Quit ##class(TECH.ResultSetIterator).%New(rs)
Index: OBJTimpl/Herbevoorrading/OphalenProductenKlein.cls.xml
===================================================================
diff -u -r68790 -r68860
--- OBJTimpl/Herbevoorrading/OphalenProductenKlein.cls.xml	(.../OphalenProductenKlein.cls.xml)	(revision 68790)
+++ OBJTimpl/Herbevoorrading/OphalenProductenKlein.cls.xml	(.../OphalenProductenKlein.cls.xml)	(revision 68860)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="SqlConnection">
+<Type>%SQLGatewayConnection</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ConfigMgr:TECH.Config.ConfigMgr=""</FormalSpec>
 <Private>1</Private>
@@ -16,6 +21,8 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	Set ..SqlConnection = ..GeefSQLConnectie()
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -33,7 +40,6 @@
 <Method name="GeefIterator">
 <Implementation><![CDATA[
     Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnection as %SQLGatewayConnection =..GeefSQLConnectie()
 	#dim Status as %String = ""
     #dim SqlStatement as %String 
     Set SqlStatement= "  SELECT "
@@ -48,10 +54,10 @@
     
     try
     {
-    	Do res.Prepare(SqlStatement,,OBJTConnection)
+    	Do res.Prepare(SqlStatement,,..SqlConnection)
 	    Do res.Execute()    
     } catch {
-	    do OBJTConnection.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     
Index: OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml
===================================================================
diff -u -r68783 -r68860
--- OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(.../OphalenPickLijnenConsolidatie.cls.xml)	(revision 68783)
+++ OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(.../OphalenPickLijnenConsolidatie.cls.xml)	(revision 68860)
@@ -14,8 +14,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="SqlQueryConnection">
-<Type>AXimpl.SqlQueryConnection</Type>
+<Property name="SqlConnection">
+<Type>%SQLGatewayConnection</Type>
 <Private>1</Private>
 </Property>
 
@@ -55,13 +55,28 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
-	
+	Set ..SqlConnection = ..GeefSQLConnectie()
+
 	//d ##class(TECH.Config.ConfigMgr).Instance().SetString("OBJTimpl.DatasourceName","OBJT_ACP")
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	if $IsObject(..SqlConnection){
+		do ..SqlConnection.Disconnect()
+	}
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefIterator">
 <FormalSpec>ConsolidatieNr:%String</FormalSpec>
 <ReturnType>TECH.ResultSetIterator</ReturnType>
@@ -78,7 +93,7 @@
 <ReturnType>%ResultSet</ReturnType>
 <Implementation><![CDATA[
     Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
-    #dim OBJTConnect as %SQLGatewayConnection = ..GeefSQLConnectie()
+    
 	#dim Status as %String = ""
 	#Dim SqlStatement as %String = ""
    	
@@ -115,10 +130,10 @@
 		
     try
     {
-    	Do rs.Prepare(SqlStatement,,OBJTConnect)
+    	Do rs.Prepare(SqlStatement,,..SqlConnection)
 	    Do rs.Execute()    
     } catch {
-	    do OBJTConnect.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     Quit rs
@@ -132,7 +147,7 @@
 	#dim QueryAPI as TECH.Query.QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
 	#dim SqlStatement as %String = ""
 	Set SqlStatement = "select h.OBJTOutboundorderID as CONSNR, s.OBJTOutboundOrderlijnid as LIJNNR ,l.aantalgevraagd as QTYTARGET, 0 as AANTAL,s.Product->IdentNummer as IDENTNR, " 
-    _ " 'annulatie' as FROMLOC ,'annulatie' as BRONPALLET ,'annulatie' as  AFZETLOC ,'annulatie' as DOELPALLET , '' as USERID  ,"
+    _ " 'annulatie' as FROMLOC ,'annulatie' as BRONPALLET ,'annulatie' as  AFZETLOC ,'annulatie' as DOELPALLET , ' ' as USERID  ,"
 	_ " current_timestamp as PICKINGTIJDSTIP ,'annulatie' as TOLOC "
 	_ " from Flow_OrderWMS.lijn l "
 	_ " join flow_orderwms.sub s on s.lijn = l.id and s.verwerkingsoftware = 'V' "
Index: OBJTimpl/WMSOrder/OphalenGeraapteVoorraadNiveau.cls.xml
===================================================================
diff -u -r67493 -r68860
--- OBJTimpl/WMSOrder/OphalenGeraapteVoorraadNiveau.cls.xml	(.../OphalenGeraapteVoorraadNiveau.cls.xml)	(revision 67493)
+++ OBJTimpl/WMSOrder/OphalenGeraapteVoorraadNiveau.cls.xml	(.../OphalenGeraapteVoorraadNiveau.cls.xml)	(revision 68860)
@@ -14,8 +14,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="SqlQueryConnection">
-<Type>AXimpl.SqlQueryConnection</Type>
+<Property name="SqlConnection">
+<Type>%SQLGatewayConnection</Type>
 <Private>1</Private>
 </Property>
 
@@ -51,13 +51,27 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	Set ..SqlConnection = ..GeefSQLConnectie()
 	
 	//d ##class(TECH.Config.ConfigMgr).Instance().SetString("OBJTimpl.DatasourceName","OBJT_ACP")
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	if $IsObject(..SqlConnection){
+		do ..SqlConnection.Disconnect()
+	}	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefIterator">
 <Implementation><![CDATA[
 	#Dim ResultSet as %ResultSet = ..GeefResultSet()
@@ -71,7 +85,6 @@
 <ReturnType>%ResultSet</ReturnType>
 <Implementation><![CDATA[
     Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
-    Set OBJTConnect=..GeefSQLConnectie()
 	Set Status=""
     Set SqlStatement=" select "
 	_" outboundOrder.id CONSNr, "
@@ -106,10 +119,10 @@
 	_" group by outboundOrder.id, op.name,it.Name "
 	try
     {
-    	Do rs.Prepare(SqlStatement,,OBJTConnect)
+    	Do rs.Prepare(SqlStatement,,..SqlConnection)
 	    Do rs.Execute()    
     } catch {
-	    do OBJTConnect.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     Quit rs
Index: OBJTimpl/WMSOrder/OphalenVoorraadOpLocatie.cls.xml
===================================================================
diff -u -r68334 -r68860
--- OBJTimpl/WMSOrder/OphalenVoorraadOpLocatie.cls.xml	(.../OphalenVoorraadOpLocatie.cls.xml)	(revision 68334)
+++ OBJTimpl/WMSOrder/OphalenVoorraadOpLocatie.cls.xml	(.../OphalenVoorraadOpLocatie.cls.xml)	(revision 68860)
@@ -14,8 +14,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="SqlQueryConnection">
-<Type>AXimpl.SqlQueryConnection</Type>
+<Property name="SqlConnection">
+<Type>%SQLGatewayConnection</Type>
 <Private>1</Private>
 </Property>
 
@@ -54,14 +54,29 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())	
+	Set ..SqlConnection = ..GeefSQLConnectie()
 	
 	//d ##class(TECH.Config.ConfigMgr).Instance().SetString("OBJTimpl.DatasourceName","OBJT_ACP")
 	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	if $IsObject(..SqlConnection){
+		do ..SqlConnection.Disconnect()
+	}
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefIterator">
 <FormalSpec>PRNr:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -79,7 +94,6 @@
 <ReturnType>%ResultSet</ReturnType>
 <Implementation><![CDATA[
     Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
-    Set OBJTConnect=..GeefSQLConnectie()
 	Set Status=""
     Set SqlStatement="SELECT "
  	_"	   location.FULLNAME LOCATIONID"
@@ -111,80 +125,16 @@
 	_"	group by location.FULLNAME  , warehouse.NAME , isnull(warehouse.DESCRIPTION,warehouse.NAME),ITEM.NAME, case when csitq.NAME like '000000%' then 'sublpn' else csitq.NAME end,DEPARTMENT.NAME  "	
 	try
     {
-    	Do rs.Prepare(SqlStatement,,OBJTConnect)
+    	Do rs.Prepare(SqlStatement,,..SqlConnection)
 	    Do rs.Execute(OBJTItemId)    
     } catch {
-	    do OBJTConnect.Disconnect()
+	    do ..SqlConnection.Disconnect()
 	    do ##class(TECH.ExceptionHandler).Rethrow()
     }
     Quit rs
 ]]></Implementation>
 </Method>
 
-<Method name="GeefResultSetOLD">
-<FormalSpec>OBJTItemId:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%ResultSet</ReturnType>
-<Implementation><![CDATA[
-    Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
-    Set OBJTConnect=..GeefSQLConnectie()
-	Set Status=""
-    Set SqlStatement="SELECT "
-	_"	it.NAME ITEMID"
-	_"  ,it.DESCRIPTION"
-    _"  ,[DTSCREATED]"
-    _"  ,[DTSMODIFICATION]"
-    _"  ,[LOCATIONOID]"
-    _"  ,[QTYALLOCATED]"
-    _"  ,[QTYONHAND]"
-    _"  ,[QTYRESERVED]"
-    _"  ,checkdigit as LOCATIONID"
-	_"  ,wh.Name WAREHOUSE"
-	_"  ,a.Name WAREHOUSELOCATION"
-    _" FROM OBJT_INVENTORYRECORD ir"
-    _" join objt_item it on  it.OID=itemoid"
-    _" join OBJT_WAREHOUSE wh on ir.WAREHOUSEOID=wh.OID "
-    _" left outer join objt_warehouselocation a on a.OID=locationoid"
-    _" where tracelevel=0 "
-    _"   and it.name=? "
-    _"   and a.Name<>'MARSHALL'"
-    try
-    {
-    	Do rs.Prepare(SqlStatement,,OBJTConnect)
-	    Do rs.Execute(OBJTItemId)    
-    } catch {
-	    do OBJTConnect.Disconnect()
-	    do ##class(TECH.ExceptionHandler).Rethrow()
-    }
-    Quit rs
-]]></Implementation>
-</Method>
-
-<UDLText name="T">
-<Content><![CDATA[
-/*    Set SqlStatement="SELECT "
-	_"	it.NAME ITEMID"
-	_"  ,it.DESCRIPTION"
-    _"  ,[DTSCREATED]"
-    _"  ,[DTSMODIFICATION]"
-    _"  ,[LOCATIONOID]"
-    _"  ,[QTYALLOCATED]"
-    _"  ,[QTYONHAND]"
-    _"  ,[QTYRESERVED]"
-    _"  ,checkdigit as LOCATIONID"
-	_"  ,wh.Name WAREHOUSE"
-	_"  ,a.Name WAREHOUSELOCATION"
-    _" FROM OBJT_INVENTORYRECORD ir"
-    _" join objt_item it on  it.OID=itemoid"
-    _" join OBJT_WAREHOUSE wh on ir.WAREHOUSEOID=wh.OID "
-    _" left outer join objt_warehouselocation a on a.OID=locationoid"
-    _" where tracelevel=0 "
-    _"   and it.name=? "
-    _"   and a.Name<>'MARSHALL'"
-*/
-]]></Content>
-</UDLText>
-
 <Method name="GeefSQLConnectie">
 <Private>1</Private>
 <Implementation><![CDATA[
Index: EWPAL.mac.rou
===================================================================
diff -u -r67861 -r68860
--- EWPAL.mac.rou	(.../EWPAL.mac.rou)	(revision 67861)
+++ EWPAL.mac.rou	(.../EWPAL.mac.rou)	(revision 68860)
@@ -622,24 +622,24 @@
  
  Quit
  
-
 FETCHOBJT(PRNr,%J)
-	Set it=##class(OBJTimpl.WMSOrder.OphalenVoorraadOpLocatie).%New().GeefIterator(PRNr)
+	new Ophaler,it,rs
+	Set Ophaler = ##class(OBJTimpl.WMSOrder.OphalenVoorraadOpLocatie).%New()
+	Set it=Ophaler.GeefIterator(PRNr)
 	While it.HasNext()
 	{	
-	Set rs=it.Next()
- 	Set Rec=rs.Data("LPN")
- 	Set $P(Rec,D,2)=+rs.Data("QTYONHAND")
-  	Set $P(Rec,D,10)=$P($zdth(rs.Data("DTSMODIFICATION"),8),",",1) ; datum
-  	Set $P(Rec,D,11)=$P($zdth(rs.Data("DTSMODIFICATION"),8),",",2) ; tijd
-  
-  	Set $P(Rec,D,16)=$G(rs.Data("LOCATIONID"))
-  	;Set:$P(Rec,D,16)="" $P(Rec,D,16)=$G(rs.Data("WAREHOUSE"))_":"_rs.Data("WAREHOUSELOCATION")
-  	Set ^HULP(%J,$O(^HULP(%J,""),-1)+1)=Rec
+		Set rs=it.Next()
+	 	Set Rec=rs.Data("LPN")
+	 	Set $P(Rec,D,2)=+rs.Data("QTYONHAND")
+	  	Set $P(Rec,D,10)=$P($zdth(rs.Data("DTSMODIFICATION"),8),",",1) ; datum
+	  	Set $P(Rec,D,11)=$P($zdth(rs.Data("DTSMODIFICATION"),8),",",2) ; tijd
+	  
+	  	Set $P(Rec,D,16)=$G(rs.Data("LOCATIONID"))
+	  	;Set:$P(Rec,D,16)="" $P(Rec,D,16)=$G(rs.Data("WAREHOUSE"))_":"_rs.Data("WAREHOUSELOCATION")
+	  	Set ^HULP(%J,$O(^HULP(%J,""),-1)+1)=Rec
 	}
 	Quit  	
 	
-	
  ;
 COPYOLD ; Copy van het oude EWPAL("D")
  ; Er worden 10 bestanden bijgehouden