Index: EWORDST.mac.rou
===================================================================
diff -u -r66860 -r67030
--- EWORDST.mac.rou	(.../EWORDST.mac.rou)	(revision 66860)
+++ EWORDST.mac.rou	(.../EWORDST.mac.rou)	(revision 67030)
@@ -470,7 +470,11 @@
  Set KLNr=$P(R,D)
  
  If $D(^ORDW("D",CONSNr,"S","V")) Do  Quit:R'=1 ; OBJT  order manueel te verwijderen uit OBJT
- .Set R=$$^vhTXTPOP("EWORDST","DELOBJT","",$$EXTNUM^vhLib.DataTypes(CONSNr,0,".",0),$P(^KKL(^KK1(KLNr),0),D,2),$G(^ORDW("D",CONSNr)))
+ .Set Status=##class(OBJTimpl.WMSOrder.OphalenOrderInOBJT).%New().GeefStatusVertaald(CONSNr)
+ .If Status="Niet in OBJT" Set R=1 Quit
+ .If Status="Geannuleerd" Set R=1 Quit
+ .Set:Status="Gealloceerd" R=$$^vhTXTPOP("EWORDST","DELOBJT","",$$EXTNUM^vhLib.DataTypes(CONSNr,0,".",0),Status)
+ .Set:Status'="Gealloceerd" R=$$^vhTXTPOP("EWORDST","DELOBJTNODEL","",$$EXTNUM^vhLib.DataTypes(CONSNr,0,".",0),Status)
 
  If $L($P(R,D,20)),$P(R,D,20)'="W",$P(R,D,20)'="K" Quit  ; Alleen indien nog niets verwerkt door WMS
  . Set R=$$^vhTXTPOP("EWORDST","NODELBADSTAT","",$$EXTNUM^vhLib.DataTypes(CONSNr,0,".",0),$P(^KKL(^KK1(KLNr),0),D,2),$G(^ORDW("D",CONSNr)))
Index: vhDeploy/D20220304xOBJTDatasourceNaam.cls.xml
===================================================================
diff -u
--- vhDeploy/D20220304xOBJTDatasourceNaam.cls.xml	(revision 0)
+++ vhDeploy/D20220304xOBJTDatasourceNaam.cls.xml	(revision 67030)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.D20220304xOBJTDatasourceNaam">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Projectsetting Datasourcename Objective database</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim ConfigMgr as TECH.Config.ConfigMgr = ##class(TECH.Config.ConfigMgr).Instance()
+	If $$$Not(ConfigMgr.BestaatSleutel("OBJTimpl.DatasourceName")) {
+		if ##class(TECH.Config.ConfigMgr).Instance().GeefOmgeving() = "PROD" {
+			Do ConfigMgr.ZetString("OBJTimpl.DatasourceName", "OBJT_PRD")
+		} else {
+			Do ConfigMgr.ZetString("OBJTimpl.DatasourceName", "OBJT_ACP")
+		}
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: OBJTimpl/WMSOrder/OphalenOrderInOBJT.cls.xml
===================================================================
diff -u
--- OBJTimpl/WMSOrder/OphalenOrderInOBJT.cls.xml	(revision 0)
+++ OBJTimpl/WMSOrder/OphalenOrderInOBJT.cls.xml	(revision 67030)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="OBJTimpl.WMSOrder.OphalenOrderInOBJT">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="ConfigMgr">
+<Type>TECH.Config.ConfigMgr</Type>
+<Private>1</Private>
+</Property>
+
+<UDLText name="T">
+<Content><![CDATA[
+// W ##class(OBJTimpl.WMSOrder.OphalenOrderInOBJT).%New().GeefStatusVertaald(322726)
+
+]]></Content>
+</UDLText>
+
+<Method name="%OnNew">
+<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefSQLConnectie">
+<ReturnType>%SQLGatewayConnection</ReturnType>
+<Implementation><![CDATA[
+	Set SqlConnection =##class(%SQLGatewayConnection).%New()
+    #dim OBJTSqlServer As %String = ..ConfigMgr.GeefString("OBJTimpl.DatasourceName")
+    Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(SqlConnection.Connect(OBJTSqlServer,"",""))
+    Quit SqlConnection
+]]></Implementation>
+</Method>
+
+<Method name="GeefStatusVertaald">
+<FormalSpec>CONSNr:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Status as %String =..GeefStatus(CONSNr)
+	
+	Quit:Status="" "Niet in OBJT"
+	Quit:Status=1 "Gealloceerd"
+	Quit:Status=2 "Vrijgegeven"
+	Quit:Status=3 "Picking"
+	Quit:Status=12 "Geannuleerd"
+	Quit:Status=14 "Afgewerkt"
+	Quit "??? " _ Status
+]]></Implementation>
+</Method>
+
+<Method name="GeefStatus">
+<FormalSpec>CONSNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim PickID as %String =..GeefOBJTPickID(CONSNr)
+	Quit:PickID="" ""
+	
+    Set res=##class(TECH.ResultSet).%New("%DynamicQueryGW:SQLGW")
+    #dim OBJTConnection as %SQLGatewayConnection =..GeefSQLConnectie()
+	#dim Status as %String = ""
+    #dim SqlStatement as %String = "Select OUTBOUNDSTATUS FROM [OBJT_OUTBOUNDORDER] WHERE ID=?"
+    
+    try
+    {
+    	Do res.Prepare(SqlStatement,,OBJTConnection)
+	    Do res.Execute(PickID)    
+    } catch {
+	    do OBJTConnection.Disconnect()
+	    do ##class(TECH.ExceptionHandler).Rethrow()
+    }
+    If res.Next()
+    {
+	    Set Status=$G(res.Data("OUTBOUNDSTATUS"))
+    }
+    do OBJTConnection.Disconnect()
+
+    Quit Status
+]]></Implementation>
+</Method>
+
+<Method name="GeefOBJTPickID">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>CONSNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	Quit:'($D(^ORDW("D",CONSNr))#10) ""
+	#dim JaarMaand as %String = $$EXTDATE^vhLib.DataTypes(+$P(^ORDW("D",CONSNr),"\",18),"DM") ; geeft YY-MM
+	#dim OBJTPickID as %String = $E($TR(JaarMaand,"-")_"9999",1,4)_CONSNr ; voor uniciteit op lange termijn wordt YYMM toegevoegd
+	Quit OBJTPickID
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>