Index: EWSTAT.mac.rou
===================================================================
diff -u -r60084 -r69296
--- EWSTAT.mac.rou	(.../EWSTAT.mac.rou)	(revision 60084)
+++ EWSTAT.mac.rou	(.../EWSTAT.mac.rou)	(revision 69296)
@@ -32,7 +32,10 @@
  Quit
  
 DISP ; Lichtkrant magazijn
-	New CONSNr,ORDNr,OLUNr,SOLNr,Rec,Cnt,Dev,MagNr,PRNr,Kleur,BonErr,Ident,TeDoen,Opslag,PalId
+
+ ;Quit:'##class(TECH.Config.ConfigMgr).Instance().GetBoolean("EWSTAT_LichtkrantInMagazijnAansturen")	
+
+ New CONSNr,ORDNr,OLUNr,SOLNr,Rec,Cnt,Dev,MagNr,PRNr,Kleur,BonErr,Ident,TeDoen,Opslag,PalId
  
  Set D="\"
  Kill Cnt
@@ -67,13 +70,15 @@
  .Write $$HEX^vhRtn1("0,0,0,0,0,01,5A,30,30,02,45,3B"),$P(Date,".",2),$P(Date,"."),$P(Date,".",3),$$HEX^vhRtn1("04") ;Datum
  Write $$HEX^vhRtn1("0,0,0,0,0,01,5A,30,30,02") ; Broadcast naar alle displays
  Write $$HEX^vhRtn1("41,41") ; Write tot file "A"
+ ;Write $$HEX^vhRtn1("1B,20")
  Write $$HEX^vhRtn1("1B,20")
  
  ;If SuperSpoed Do  ; Superspoed
  . Write "T"_"[SUPERSPOED] " ; De eerste karakter 'T' wordt niet getoond op het display
  
  If $D(^EWREC("P","DISPTXT")) Do  ; Vaste tekst
- . Write "T"_$G(^EWREC("P","DISPTXT")) ; De eerste karakter 'T' wordt niet getoond op het display
+ . Write $$HEX^vhRtn1(62),Kleur(3),$G(^EWREC("P","DISPTXT")) 
+ 
  Else  If $P($G(Cnt),D,2) Do  ;Te verwerken lijnen
  . Write $$HEX^vhRtn1("15") ; slow speed als er meer tekst is dan op het scherm kan
  . Set Mag=""
@@ -101,13 +106,13 @@
  Set Txt=Txt+1,Txt(Txt)="              "
  Set Txt=Txt+1,Txt(Txt)="Orders      : "
  Set Txt=Txt+1,Txt(Txt)="Orderlijnen : "
- For Mag="E","H","L","O","U","A" Set Txt=Txt+1,Txt(Txt)="   "_$P("Auto   ;Ugly   ;Transf.;Lang   ;Halux  ;Orgalux",";",$F("EUALHO",Mag)-1)_"  : "
+ For Mag="V","H","L","O","U","A" Set Txt=Txt+1,Txt(Txt)="   "_$P("Objt   ;Ugly   ;Transf.;Lang   ;Halux  ;Orgalux",";",$F("VUALHO",Mag)-1)_"  : "
  For Mode="W","V","K" Do
  .Set Txt=0
  .Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$S(Mode="W":" WMS",Mode="V":"VOLG",1:"KODE")_" : "
  .Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$J($P($G(Cnt(Mode)),D,1),4)_" : "
  .Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$J($P($G(Cnt(Mode)),D,2),4)_" : "
- .For Mag="E","H","L","O","U","A" Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$J($P($G(Cnt(Mode,Mag)),D,2),4)_" : "
+ .For Mag="V","H","L","O","U","A" Set Txt=Txt+1,Txt(Txt)=Txt(Txt)_$J($P($G(Cnt(Mode,Mag)),D,2),4)_" : "
  Set Txt=Txt+1,Txt(Txt)=""
  Set Tijd=$P($G(Cnt("W","E")),D,5)
  Set Qty=$P($G(Cnt("W")),D,2)
@@ -209,7 +214,7 @@
 TRANSORD New DatRec,I,Key,Label,Dev
  Do FETCH(DatVan,DatTot)
  Quit:'$D(^HULP(%J,"F"))
- Set Dev=$$OPEN^vhDEV($$DIRUSER^vhDEV,$$ASKFILE^vhDEV("PICKSTAT.TXT"),"W")
+ Set Dev=$$OPEN^vhDEV(,"PICKSTAT.TXT","W")
  Use Dev
  Set Date="",Count=0
  Write "Jaar",$C(9),"Maand",$C(9),"Datum",$C(9),"Dag",$C(9)
@@ -371,14 +376,17 @@
  .Set R=^ORDW("D",CONSNr)
  .Quit:$P(R,D,20)'="B"
  .Set KLNr=$P(R,D),DatBon=+$P(R,D,23) ; Einde consolidatie
+ .Set Vzw=$$COMPACTVZW($P(R,D,2)) 
  .Set:'DatBon DatBon=+$P(R,D,19) ; Op bon gezet
  .Set:'DatBon DatBon=+$P(R,D,22) ; Begin picking
  .Quit:DatBon<DatVan
  .If DatTot,DatBon>DatTot Quit
  .Set ^HULP(%J,"F",DatBon,"K",KLNr)=""
  .Set LevAdr=$G(^ORDW("D",CONSNr,"A"))
- .Set LevAdr=$E(LevAdr,1,50)_KLNr
+ .Set LevAdr=$E(LevAdr,1,100)_KLNr
  .Set ^HULP(%J,"F",DatBon,"A",LevAdr)=""
+ .Set ^HULP(%J,"F",DatBon,"VZWADR",Vzw,LevAdr)=""
+ .Set ^HULP(%J,"F",DatBon,"VZWBON",Vzw,CONSNr)=""
  .Kill DatRec
  .Merge DatRec=^HULP(%J,"F",DatBon,"D")
  .Set MemMol=$G(DatRec("MOL"))
@@ -406,6 +414,7 @@
  ....Set PRNr=$P(R,D,1)
  ....Set SoftV=$P(R,D,13)
  ....Set:SoftV?1N SoftV="E" ; Groepering van automatisch mag.
+ ....Set:SoftV="V" SoftV="E" ; OBJT
  ....Quit:'$L(SoftV)
  ....Quit:'$L($P(R,D,10))&'$L($P(R,D,5)) ; Bronpallet
  ....Set:IsOrgal DatRec("ORGAOL")=$G(DatRec("ORGAOL"))+1
@@ -419,7 +428,7 @@
  ..... If $P(R,D,5)<15000000 Set DatRec("SOLED")=$G(DatRec("SOLED"))+1 ; SOL Directe uitvoer
  ..... Else  Do
  ...... Set DatRec("SOLEP")=$G(DatRec("SOLEP"))+1 ; EWMS pickpost
- ...... If $P(R,D,5)<(15800000) Set DatRec("SOLEP1")=$G(DatRec("SOLEP1"))+1 ; Pickpost 1
+ ...... If $P(R,D,5)<(16600000) Set DatRec("SOLEP1")=$G(DatRec("SOLEP1"))+1 ; Pickpost 1
  ...... Else  If $P(R,D,5)<(16990000) Set DatRec("SOLEP2")=$G(DatRec("SOLEP2"))+1 ; Pickpost2
  ...... Else  Set DatRec("SOLEU")=$G(DatRec("SOLEU"))+1 ; EWMS uglypick
  ..... Set:IsOrgal DatRec("SOLEO")=$G(DatRec("SOLEO"))+1 ; Dubbeltelling orgalux
@@ -442,6 +451,12 @@
  .For  Set KLNr=$O(^HULP(%J,"F",DatBon,"K",KLNr)) Quit:KLNr=""  Set DatRec("KL")=$G(DatRec("KL"))+1 ; Aantal klanten
  .Set LevAdr=""
  .For  Set LevAdr=$O(^HULP(%J,"F",DatBon,"A",LevAdr)) Quit:LevAdr=""  Set DatRec("KLA")=$G(DatRec("KLA"))+1 ; Aantal leveringsadressen
+ .Set (Vzw,LevAdr)=""
+ .For  Set Vzw=$O(^HULP(%J,"F",DatBon,"VZWADR",Vzw)) Quit:Vzw=""  Do
+ . . For  Set LevAdr=$O(^HULP(%J,"F",DatBon,"VZWADR",Vzw,LevAdr)) Quit:LevAdr=""  Set DatRec("KLA"_Vzw)=$G(DatRec("KLA"_Vzw))+1 ; Aantal leveringsadressen per verzend wijze
+ .Set (CONSNr,LevAdr)=""
+ .For  Set Vzw=$O(^HULP(%J,"F",DatBon,"VZWBON",Vzw)) Quit:Vzw=""  Do
+ . . For  Set CONSNr=$O(^HULP(%J,"F",DatBon,"VZWBON",Vzw,CONSNr)) Quit:CONSNr=""  Set DatRec("BON"_Vzw)=$G(DatRec("BON"_Vzw))+1 ; Aantal leveringsadressen per verzend wijze
  .Set CONSNr=""
  .For  Set CONSNr=$O(^HULP(%J,"F",DatBon,"P",CONSNr)) Quit:CONSNr=""  Do
  ..Set PRNr=""
@@ -451,6 +466,22 @@
  .Merge ^HULP(%J,"F",DatBon,"D")=DatRec
  Quit
  ;
+COMPACTVZW(Vzw)
+ New CompactVzw
+ If Vzw?1"OD".E
+ { 
+ 	Set CompactVzw="OD" 
+ }
+ ElseIf Vzw?1"DI1"
+ {
+	Set CompactVzw="GLS"
+ }
+ Else
+ {
+	 Set CompactVzw="ANDERE"
+ }
+ Quit CompactVzw
+ 
 PICKLOG(PalId,Datum) 
  Quit
  
@@ -491,29 +522,33 @@
 LORDdef ;ProgrLabel;DisplayLabel;TransferLabel
 LORD1 ;KL  ;Klanten;#KL
 LORD2 ;KLA   ;Leveringsadressen;LevAdr
-LORD3 ;WBON  ;WMS Leveringsbons;Bons WMS
-LORD4 ;WOL   ;   Orderlijnen;OL WMS
-LORD5 ;WOLQ  ;      Status Q,K of E;
-LORD6 ;WOLe  ;      Status e of m;
-LORD7 ;WOLK  ;   Orderlijnen (incl. kind);OLKind
-LORD8 ;WOLP  ;      Zelfde produkt;OLIdemProd
-LORD9 ;SOL   ;   Suborderlijnen;SubOL
-LORD10 ;SOLE  ;   EWMS;
-LORD11 ;SOLEP ;      Pickpost;SubOLEPick
-LORD12 ;SOLEP1;         PP1  ;SubOLEPick1
-LORD13 ;SOLEP2;         PP2  ;SubOLEPick2
-LORD14 ;SOLED ;      Directe uitvoer;SubOLDirUitv
-LORD15 ;SOLEU ;      Ugly pick;SubOLEUglyPick
-LORD16 ;SOLEO ;      Orgalux dubbeltelling;SubOLEOrgalux dubtel
-LORD17 ;SOLU  ;   UGLY;
-LORD18 ;SOLUH ;      Halux   ;SubOLHalux
-LORD19 ;SOLUL ;      Langgoed;SubOLLanggoed
-LORD20 ;SOLUO ;      Orgalux ;SubOLOrgalux
-LORD21 ;SOLUU ;      Ugly    ;SubOLUgly
-LORD22 ;SOLUA ;      Tandem  ;SubOLTandem
-LORD23 ;SOLUK ;      Aventos ;SubOLAventos
-LORD24 ;MBON  ;Manueel leveringsbons;Bons Manueel
-LORD25 ;MOL   ;   Orderlijnen;OL Manueel
+LORD3 ;KLAOD   ;   Leveringsadr OD;Lev OD
+LORD4 ;KLAGLS  ;   Leveringsadr DI1;Lev GLS
+LORD5 ;WBON  ;WMS Leveringsbons;Bons WMS
+LORD6 ;BONOD   ;   Leveringsbons OD;Bons OD
+LORD7 ;BONGLS  ;   Leveringsbons DI1;Bons GLS
+LORD8 ;WOL   ;   Orderlijnen;OL WMS
+LORD9 ;WOLQ  ;      Status Q,K of E;
+LORD10 ;WOLe  ;      Status e of m;
+LORD11 ;WOLK  ;   Orderlijnen (incl. kind);OLKind
+LORD12 ;WOLP  ;      Zelfde produkt;OLIdemProd
+LORD13 ;SOL   ;   Suborderlijnen;SubOL
+LORD14 ;SOLE  ;   OBJT;
+LORD15x ;SOLEP ;      Pickpost;SubOLEPick
+LORD16x ;SOLEP1;         PP1  ;SubOLEPick1
+LORD17x ;SOLEP2;         PP2  ;SubOLEPick2
+LORD15 ;SOLED ;      Objective;SubOLDirUitv
+LORD19x ;SOLEU ;      Ugly pick;SubOLEUglyPick
+LORD20x ;SOLEO ;      Orgalux dubbeltelling;SubOLEOrgalux dubtel
+LORD16 ;SOLU  ;   UGLY;
+LORD17 ;SOLUH ;      Halux   ;SubOLHalux
+LORD18 ;SOLUL ;      Langgoed;SubOLLanggoed
+LORD19 ;SOLUO ;      Orgalux ;SubOLOrgalux
+LORD20 ;SOLUU ;      Ugly    ;SubOLUgly
+LORD21 ;SOLUA ;      Tandem  ;SubOLTandem
+LORD22 ;SOLUK ;      Aventos ;SubOLAventos
+LORD23 ;MBON  ;Manueel leveringsbons;Bons Manueel
+LORD24 ;MOL   ;   Orderlijnen;OL Manueel
  
 Lijst 
  New R,CONSNr,DatBon,PRNr,DatRec,KLNr,PRNr