Index: PVSTM.mac.rou
===================================================================
diff -u -r62525 -r69293
--- PVSTM.mac.rou	(.../PVSTM.mac.rou)	(revision 62525)
+++ PVSTM.mac.rou	(.../PVSTM.mac.rou)	(revision 69293)
@@ -27,7 +27,6 @@
  Do CLOSE^vhDEV(Device)
  
  Quit
- 
 
 PVSTM ; Order timings [ 11/08/2003   8:42 PM ]
  ; Overzicht contracten per klant en leverancier
@@ -207,6 +206,7 @@
  Quit
 ValiPakHist(Jaar) ;Stockrotatie
  New I,Cumul,TLNr,Rec
+ Set blOBJT=##class(OBJTimpl.PM.OBJTIdentLookupService).%New()
  Set BeginDat=$$INTDATE^vhLib.DataTypes("01/01/"_Jaar)
  Set EndDat=$$INTDATE^vhLib.DataTypes("31/12/"_Jaar)
  Set BeginWk=Jaar_".00 "
@@ -216,7 +216,7 @@
  Set Dev=0
  Set Dev=$$OPEN^vhDEV(,"VALIPAK Alle via HIST "_Jaar_".txt","W","T")  Quit:'$L(Dev)
  Use Dev
- Write $TR("PRNr;KortTekst;Stock;Klas;GenTyp;SubGenTyp;LevNr;LevNm;CiffPPL;Gewicht;AantalBslTot;AantalBslBE;AantalMwTot;AantalMwBE;AantalMwXX;AantalBslXX;BLBrut;BLNet;RecuPack",";",$c(9)),!
+ Write $TR("PRNr;KortTekst;OBJT IdentNr;ProdGrp;Stock;Klas;GenTyp;SubGenTyp;LevNr;LevNm;CiffPPL;Gewicht;AantalBslTot;AantalBslBE;AantalMwTot;AantalMwBE;AantalMwXX;AantalBslXX;BLBrut;BLNet;RecuPack",";",$c(9)),!
  Set PRNr=0
  For  Set PRNr=$O(^PRHIST(PRNr)) Quit:PRNr=""  Do
  . Set VolgNr=0
@@ -229,6 +229,8 @@
  . . If ($P(Rec,"\",4)="H")&&($P(Rec,"\",5)="W") Do
  . . . Set AantalMwTot=AantalMwTot-$P(Rec,"\",2)
  . . . Set KLNr=$P(Rec,"\",6)
+ . . . If 'KLNr,$P(Rec,"\",15) Do
+ . . . . Set KLNr=$O(^KSTPR($P(Rec,"\",15),0))
  . . . If KLNr,$D(^KK1(KLNr)),'$D(LandCache(KLNr)) Do
  . . . . Set LandCache(KLNr)=($$LAND^vhRtn1(KLNr,"K",1,1)="BE")
  . . . If KLNr&&$D(^KK1(KLNr)) Do
@@ -238,6 +240,8 @@
  . . If ($P(Rec,"\",4)="U")&&($P(Rec,"\",5)="M") Do
  . . . Set AantalBslTot=AantalBslTot-$P(Rec,"\",2)
  . . . Set KLNr=$P(Rec,"\",6)
+ . . . If 'KLNr,$P(Rec,"\",15) Do
+ . . . . Set KLNr=$O(^KSTPR($P(Rec,"\",15),0))
  . . . If KLNr,$D(^KK1(KLNr)),'$D(LandCache(KLNr)) Do
  . . . . Set LandCache(KLNr)=($$LAND^vhRtn1(KLNr,"K",1,1)="BE")
  . . . If KLNr&&$D(^KK1(KLNr)) Do
@@ -251,17 +255,18 @@
  . Set CiffPPL=$P(^KPR(PRNr,LevNr),D,23)
  . Set RecuPackPRNr=$P(^KPR(PRNr,LevNr),D,32)
  . Set RecuPackProd=$S(RecuPackPRNr:$P($G(^KPR(RecuPackPRNr,0),"***"_RecuPackPRNr_"***"),"\",1),1:"")
- . If ($P(GenTyp,"\")="TBX") Do
- . . Set Verpak=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"VERPAK"))
- . . Set:(Verpak="B")||(Verpak="A") RecuPackProd="VHOSS"
+ . If $P(GenTyp,"\")?1(1"TBX",1"LBX",1"MVX") Do
+ . . Set Kenmerken=##class(AXimpl.PM.Kenmerk.Kenmerken).%OpenId(PRNr)
+ . . Set:$isobject(Kenmerken)&&($zcvt(Kenmerken.VerpakkingType,"U")="VHOSS") RecuPackProd="VHOSS"
+ . . ;Set:(Verpak="B")||(Verpak="A") RecuPackProd="VHOSS"
  . Set Gewicht=$P(^KPR(PRNr,1),D,13)
  . Set LevNr=$E(LevNr,2,99)
  . Set LevNm=$P(^KLE(^KL1(LevNr),0),D,2)
  . Set BLRec=""
  . If LevNr=5005 Do
  . . Set BLID="0"_$TR($E($P(^KPR(PRNr,2),D,25),2,99),".","")
  . . Set BLRec=$G(^BLProd("D",BLID))
- . Write PRNr,$C(9),$P(^KPR(PRNr,0),D,1),$C(9),$P(^KPR(PRNr,1),D,20),$C(9),Klas,$C(9),$P(GenTyp,"\"),$C(9),$P(GenTyp,"\",2),$C(9),LevNr,$C(9),LevNm,$C(9),$TR(CiffPPL,".",","),$C(9),$TR(Gewicht,".",",")
+ . Write PRNr,$C(9),$P(^KPR(PRNr,0),D,1),$C(9),blOBJT.GeefOBJTIdentNr($$$PRGet($$$IdentNummer)),$C(9),$$PRODGRP^PRODUKT(PRNr),$C(9),$P(^KPR(PRNr,1),D,20),$C(9),Klas,$C(9),$P(GenTyp,"\"),$C(9),$P(GenTyp,"\",2),$C(9),LevNr,$C(9),LevNm,$C(9),$TR(CiffPPL,".",","),$C(9),$TR(Gewicht,".",",")
  . Write $C(9),$TR(+$J(AantalBslTot,0,2),".",","),$C(9),$TR(+$J(AantalBslBE,0,2),".",","),$C(9),$TR(+$J(AantalMwTot,0,2),".",","),$C(9),$TR(+$J(AantalMwBE,0,2),".",","),$C(9),$TR(+$J(AantalBslXX,0,2),".",","),$C(9),$TR(+$J(AantalMwXX,0,2),".",","),$C(9),$TR($P(BLRec,D,9),".",","),$C(9),$TR($P(BLRec,D,26),".",","),*9,RecuPackProd,!
  Do CLOSE^vhDEV(Dev)
  Quit 
@@ -300,9 +305,10 @@
  . Set CiffPPL=$P(^KPR(PRNr,LevNr),D,23)
  . Set RecuPackPRNr=$P(^KPR(PRNr,LevNr),D,32)
  . Set RecuPackProd=$S(RecuPackPRNr:$P($G(^KPR(RecuPackPRNr,0),"***"_RecuPackPRNr_"***"),"\",1),1:"")
- . If ($P(GenTyp,"\")="TBX") Do
- . . Set Verpak=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",PRNr,"VERPAK"))
- . . Set:(Verpak="B")||(Verpak="A") RecuPackProd="VHOSS"
+ . If $P(GenTyp,"\")?1(1"TBX",1"LBX") Do
+ . . Set Kenmerken=##class(AXimpl.PM.Kenmerk.Kenmerken).%OpenId(PRNr)
+ . . Set:$isobject(Kenmerken)&&($zcvt(Kenmerken.VerpakkingType,"U")="VHOSS") RecuPackProd="VHOSS"
+ . . ;Set:(Verpak="B")||(Verpak="A") RecuPackProd="VHOSS"
  . Set Gewicht=$P(^KPR(PRNr,1),D,13)
  . Set LevNr=$E(LevNr,2,99)
  . Set LevNm=$P(^KLE(^KL1(LevNr),0),D,2)