Index: EWORDS5.mac.rou
===================================================================
diff -u -r47926 -r49760
--- EWORDS5.mac.rou	(.../EWORDS5.mac.rou)	(revision 47926)
+++ EWORDS5.mac.rou	(.../EWORDS5.mac.rou)	(revision 49760)
@@ -1,7 +1,7 @@
- 
-EWORDS5 ;E'WMS Markeren voor orderpicking [ 10/28/2003  10:26 AM ]
+EWORDS5 ;E'WMS Markeren voor orderpicking
  #Include BL.Derde.Kennis
  #Include BL.Derde.KlantSpecifiek
+ #Include vhLib.Macro
  ;
 CHKMARK(Ref) 
  New R,PRNr,ORDNr,OLNr,Mark,Aantal,FysStock,TOENr,OLUNr,ResWMS
@@ -14,9 +14,10 @@
  Quit Mark
  ;
  ; MarkOrd indien markering volledig order
-MARKLINE(Ref,MarkOrd,Unmark,IsNodigControleerBezwaren = 1,GaVerder = 1) 
+MARKLINE(Ref,MarkOrd,Unmark,IsNodigControleerBezwaren = 1,GaVerder = 1)
  New R,ORDNr,OLNr,Aantal,OLUNr,PRNr,FysStock,ResWMS,PraStock,StockUpd,FirstMark,AskLink
  New DynTheoS,VerzW,LevWk,KlOLNr,InGroep,TOENr
+ 
  Set MarkOrd=$G(MarkOrd),Unmark=$G(Unmark),R=^HULP(%J,KLNr,"O",Ref),ORDNr=$P(R,D),OLNr=$P(R,D,11)
  
  Set FirstMark='$D(^HULP(%J,KLNr,"M","A"))
@@ -100,22 +101,35 @@
  Quit GaVerder
  
 MARKORD(Ref) 
- New R,ORDNr,OLNr,Quit,Marked,OLUNr,StartRef,VerzW,AskLink,IsNodigControleerBezwaren,GaVerder
- new OrderStaatVolledigBijVanHoeckeArray
+ New R,ORDNr,OLNr,Quit,Marked,OLUNr,StartRef,VerzW,AskLink
+ New OrderStaatVolledigBijVanHoeckeArray
+ New IsNodigControleerBezwaren, GaVerder, IsOrderVolledigGemarkeerd
+ 
  Set OrderStaatVolledigBijVanHoeckeArray = ##class(%ArrayOfDataTypes).%New()
- Set StartRef=Ref,R=^HULP(%J,KLNr,"O",Ref),ORDNr=$P(R,D),Marked=''$D(^HULP(%J,KLNr,"M","A",ORDNr))
+ Set StartRef = Ref
+ Set R = ^HULP(%J,KLNr,"O",Ref)
+ Set ORDNr = $Piece(R,D)
+ Set Marked = ''$Data(^HULP(%J,KLNr,"M","A",ORDNr))
+ 
  If 'Marked,'$$MagazijnBeschikbaar^EWORDS6(ORDNr,0) Quit:'$$^vhTXTPOP("EWORDS","MAGAZIJNNIETBESCHIKBAAR")
  
- Set R=^KOD(KLNr,"F",ORDNr,1),VerzW=$P($$DEFAULT^KLVERZW(,KLNr,ORDNr),";")
+ Set R = ^KOD(KLNr, "F", ORDNr, 1)
+ Set VerzW = $Piece($$DEFAULT^KLVERZW(, KLNr, ORDNr), ";")
  
  If '$D(^HULP(%J,KLNr,"M")),VerzW'=$P($G(^HULP(%J,KLNr,"V")),D) Do MODVERZW^EWORDS(VerzW)
- Set IsNodigControleerBezwaren = 1
- Set GaVerder = 1
+ 
+ #dim IsOrderVolledigGemarkeerd As %Boolean = $$$True
+ #dim IsNodigControleerBezwaren As %Boolean = $$$True
+ #dim GaVerder As %Boolean = $$$True
+ 
  If $$CUMORD^EWORDS3(.Ref) Do
  . If 'Marked,$$CHKLINK(ORDNr) Set AskLink=$$ASKLINK(ORDNr) If AskLink'=ORDNr Do:AskLink'="A" SERIE("LINK",ORDNr,"L") Quit
  . For  Set Ref=$O(^HULP(%J,KLNr,"O",Ref)) Quit:Ref=""  Do  Quit:Quit
- . . Quit:'GaVerder
- . . Set R=^HULP(%J,KLNr,"O",Ref),Quit=ORDNr'=$P(R,D),OLNr=$P(R,D,11),OLUNr=$P(R,D,19)
+ . . Quit:$$$Not(GaVerder)
+ . . Set R = ^HULP(%J, KLNr, "O", Ref)
+ . . Set Quit = $$$Not(ORDNr = $Piece(R, D))
+ . . Set OLNr = $Piece(R, D, 11)
+ . . Set OLUNr = $Piece(R, D, 19)
  . . Quit:Quit
  . . If Marked!('Marked&'$D(^HULP(%J,KLNr,"M","A",ORDNr,OLUNr))) Do
  . . . Do MARKLINE(.Ref,1+Marked,Marked,IsNodigControleerBezwaren,.GaVerder)
@@ -564,4 +578,3 @@
  . . new sdVerzendWijze set sdVerzendWijze = ^HULP(%J,KLNr,"V")
  . . Do DISPLAY^vhScherm("EWORDSH",,,,"VERZWIJZE;GERAAPT;VERZZONE;VERZDATUM")
  Quit
-