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)))