Index: HADSTAT2.mac.rou =================================================================== diff -u -r29059 -r70681 --- HADSTAT2.mac.rou (.../HADSTAT2.mac.rou) (revision 29059) +++ HADSTAT2.mac.rou (.../HADSTAT2.mac.rou) (revision 70681) @@ -128,6 +128,7 @@ .Set:$P(GenRec,D)="PRF" Montage="PR" ; Losse profielen .Set:$P(GenRec,D)="TBX" Montage="T"_$S($P(GenRec,D,2)="PR+":"K",$P(GenRec,D,2)="PRO":"P",1:"X") ; Tandembox (std en pro) .Set:$P(GenRec,D)="LBX" Montage="L"_$S($P(GenRec,D,2)="STD":"X",1:"P") ; Legrabox(std en pro) + .Set:$P(GenRec,D)="MVX" Montage="M"_$S($P(GenRec,D,2)="STD":"X",1:"P") ; Merivobox(std en pro) .Set:$P(GenRec,D)="TAO" Montage="TA" ; TA'OR (std en pro) .Set:$P(GenRec,D,1,2)="TBX\BBX" Montage="BB" ; Burobox .Set:$P(GenRec,D,1,2)="DIV\POM" Montage="PM" ; Producten op maat @@ -179,6 +180,7 @@ .Set:(Soort="DV") $E(Batch,3)="D" ; Diverse aparte batch "..D" .Set:($E(Soort)="T") Batch=$E(Soort,1,2)_" " ; Tandembox en TA'OR BOX .Set:($E(Soort)="L") Batch=$E(Soort,1,2)_" " ; Legrabox + .Set:($E(Soort)="M") Batch=$E(Soort,1,2)_" " ; Merivobox .Set:(Soort="VM")||(Soort="PM")||(Soort="GM")||(Soort="BB")||(Soort="MM") Batch=Soort_" " .Set $P(Rec,D,1)=Batch .Set:LevWk=ProdWk $P(Rec,D,2)="A" @@ -188,7 +190,12 @@ .Merge ^HADPR("B",Batch)=Batches(Batch) Else Do ; Creatie batch met default informatie .Set Rec="Week "_$$EXTDATE^vhLib.DataTypes(ProdWk,"W")_" "_$S($E(Batch,3)="B":"Banco",$E(Batch,3)="P":"Profiel",$E(Batch,3)="D":"Diverse",$E(Batch,3)="Z":"Proforma/Herstelling",1:"basis") - .Set $P(Rec,D,2)=$H + .Set:$E(Soort)="T" Rec="TBX "_$S($E(Soort,2)="X":"V1",1:"Probox,...") + .Set:$E(Soort)="L" Rec="LBX "_$S($E(Soort,2)="X":"V1",1:"Probox,...") + .Set:$E(Soort)="M" Rec="MVX "_$S($E(Soort,2)="X":"V1",1:"Probox,...") + .Set:$E(Soort,1,2)="MM" Rec="Mat op maat" + .Set:$E(Soort,1,2)="TA" Rec="TAX" + .Set $P(Rec,D,2)=$H .Set $P(Rec,D,3)=$$CALCDATE^vhLib.DataTypes($$CALCDATE^vhLib.DataTypes(ProdWk,"W","FD"),"A","-0") .Set $P(Rec,D,4)=$$CALCDATE^vhLib.DataTypes($$CALCDATE^vhLib.DataTypes(ProdWk,"W","LD"),"A","+0") .Set ^HADPR("B",Batch)=Rec