Index: BLPROD.mac.rou =================================================================== diff -u -r734 -r922 --- BLPROD.mac.rou (.../BLPROD.mac.rou) (revision 734) +++ BLPROD.mac.rou (.../BLPROD.mac.rou) (revision 922) @@ -152,7 +152,7 @@ ..Set BLID=$S($L(PRCd):$P(^KPR1(PRCd),D),1:"") If Via="I" Do Quit BLID .For Do Quit:'BLID If '$P(^KPR(BLID,1),D,25) Quit:$$CHECK(BLID,IsVHProd) - ..Set PRId=$P(^KPR(BLID,2),D,25),PRCId=$$TRIMN^vhRtn1(PRId) + ..Set PRId=$P(^KPR(BLID,2),D,25),PRCId=$$TRIMIDENT^vhRtn1(PRId) ;[IDENT] CW ..Set PRCId=$O(^KPR2(PRCId),Dir) ..Set BLID=$S($L(PRCId):$P(^KPR2(PRCId),D),1:"") W *7 @@ -163,7 +163,7 @@ Quit:'$D(^KPR(PRNr)) "" Set I=$O(^KPR(PRNr,"I")) Quit:$E(I)'="I" "" Set R=^KPR(PRNr,I),KKey=$P(R,D,4),R=^KPR(PRNr,2),IDNr=$P(R,D,25) - Set BLIDNr=$$TRIMN^vhRtn1(IDNr),$E(BLIDNr)=0 + Set BLIDNr=$$TRIMIDENT^vhRtn1(IDNr),$E(BLIDNr)=0 ;[IDENT] CW Quit:'$D(^BLProd("D",BLIDNr)) "" Set R=^BLProd("D",BLIDNr),BLKey=$P(R,D,19) Set oKlas=##class(Blum.Klassificatie).OpenV2(BLKey) @@ -194,24 +194,26 @@ Set BLID=BLID_" " Set BLKLNr=$G(BLKLNr) Set:BLKLNr VHKLNr=+$P($G(^BLBeri("K",BLKLNr)),D,3) - Set:BLKLNr IList=$P($G(^BLBeri("K",BLKLNr)),D,5) - Set:'$L($G(IList)) IList="0;1;2;3;4;5;8" + //Set:BLKLNr IList=$P($G(^BLBeri("K",BLKLNr)),D,5) + //IF '$L($G(IList)) + set IList="0;1;2;3;4;5;8" FOR CH=65:1:90 Set IList=IList_";"_$Char(CH) ;[IDENT] JCL A..Z Set PRNr="" ; Produkt nemen volgens de externe specificaties opgeslagen in ^PRPUTZ If BLKLNr For II=1:1:$L(IList,";") Quit:PRNr Do .Set I=$P(IList,";",II) .Set PRNr=$P($G(^KPR2(I_BLID)),D) Quit:'PRNr .If $P($G(^PRPUTZ("N",PRNr,VHKLNr,0)),D,1)'=BLKLNr Set PRNr="" Quit - ; Produkt nemen volgens identnummer beginnend met 0, 1, 2, 3 of 8 + ; Produkt nemen volgens identnummer beginnend met 0..8 en van A..Z For II=1:1:$L(IList,";") Quit:PRNr Do .Set I=$P(IList,";",II) .Set PRNr=$P($G(^KPR2(I_BLID)),D) Quit PRNr GetVHProds(BLID) - New IdentNr, PRNr, BI, lbPRNrs + New IdentNr, PRNr, BI, CH, lbPRNrs Set lbPRNrs="" - For BI=0,1,2,3,4,5,6,7,8 Do + For BI=0,1,2,3,4,5,6,7,8 DO IF BI=8 FOR CH=65:1:90 Do ; [IDENT] JCL ; UGLY 0..8 & A..Z + . If $G(CH)>64 Set BI=$char(CH) . Set IdentNr=BI_$S($L(BLID)=8:$E(BLID,2,8),1:BLID)_" " . Quit:'$D(^KPR2(IdentNr)) . Set lbPRNrs=lbPRNrs_$LB(+^(IdentNr)) @@ -220,8 +222,9 @@ ; Copieren van BLUM productgegens naar het VH product bestand ; vertrekkend van het BLUM identnr CopyBlumID(BLID,Opties) - New IdentNr, PRNr, BI - For BI=0,1,2,3,4,5,6,7,8 Do + New IdentNr, PRNr, BI , CH + For BI=0,1,2,3,4,5,6,7,8 DO IF BI=8 FOR CH=65:1:90 Do ; [IDENT] JCL + . If $G(CH)>64 Set BI=$char(CH) .Set IdentNr=BI_$S($L(BLID)=8:$E(BLID,2,8),1:BLID)_" " .Quit:'$D(^KPR2(IdentNr)) .Set PRNr=+^(IdentNr)