Index: PVExcel.mac.rou =================================================================== diff -u -r47543 -r47552 --- PVExcel.mac.rou (.../PVExcel.mac.rou) (revision 47543) +++ PVExcel.mac.rou (.../PVExcel.mac.rou) (revision 47552) @@ -110,13 +110,19 @@ Quit $LG(##class(Prod.Kenmerk.DataDefinitie).Get(Groep,PRNr,Kenmerk)) ;'=ceRoutine("$$MemXLS^PVExcel";A2&"/013/"&B2) -MemProdXLS(Ref) +MemXLS(Ref) Set ^PVExcelTmp(Ref)="" - Quit $P(^KPR(Ref,0),"\") + Quit "Stored" VerwerkProdXLS - Set PRNr=0 Set Ref="" + Set PRNr=0 + Set Found=0,Count=0 + For Set PRNr=$O(^KPR(PRNr)) Quit:PRNr="" Do ;Q:Found + . Set:$P(^KPR(PRNr,2),"\",12)'="" $P(^KPR(PRNr,2),"\",12)="",Found=1 ;Do $$$PRSet(312,"") + . Set:$P(^KPR(PRNr,2),"\",11)'="" $P(^KPR(PRNr,2),"\",11)="",Found=1 ;Do $$$PRSet(311,"") + Set Ref="" For Set Ref=$O(^PVExcelTmp(Ref)) Quit:Ref="" Do + . w "." . Set IdentNr=$TR($P(Ref,"/"),".")_" " . Set ArtGrpVHBE=$ZCVT($P(Ref,"/",2),"U") . Set ArtGrpHLX=$ZCVT($P(Ref,"/",3),"U") @@ -131,10 +137,14 @@ . Set PRNr=$P($G(^KPR2(IdentNr)),"\") . Write:'PRNr !,IdentNr," ",ArtGrpVHBE," ",ArtGrpHLX . Q:'PRNr - . Do $$$PRSet(312,ArtGrpVHBE) - . Do $$$PRSet(311,ArtGrpHLX) + . s Count=Count+1 + . Set $P(^KPR(PRNr,2),"\",12)=ArtGrpVHBE + . Set $P(^KPR(PRNr,2),"\",11)=ArtGrpHLX + . ;Do $$$PRSet(312,ArtGrpVHBE) + . ;Do $$$PRSet(311,ArtGrpHLX) + ;Kill ^PVExcelTmp + w !,Count,! Quit - SetNonAct(Prod) Do MASTER^cQ5 Set D="\",Q="K",U=";" Index: EWPR.mac.rou =================================================================== diff -u -r29059 -r47552 --- EWPR.mac.rou (.../EWPR.mac.rou) (revision 29059) +++ EWPR.mac.rou (.../EWPR.mac.rou) (revision 47552) @@ -145,13 +145,13 @@ Set C("BARCODE")=$P(P(2),D,14) Set C("SORTKEY")=$$SORTKEY^PRODUKT(PRNr) Set C("GEWICHT")=$P(P(1),D,13)*1000 ; in mg, moet nauwkeuriger ingegeven kunnen worden - Set C("SAMPLETYPE")=$P(P(2),D,12) + Set C("SAMPLETYPE")="" ;$P(P(2),D,12) Set C("HOOGTE")=$P(P(1),D,4) Set C("BREEDTE")=$P(P(1),D,5) Set C("LENGTE")=$P(P(1),D,6) Set C("DATUMFIFO")=$P(P(1),D,8) Set C("OPSLAGZONE")=$P(P(2),D,15) - Set C("TELWIJZE")=$P(P(2),D,11) + Set C("TELWIJZE")="" ;$P(P(2),D,11) ;Wijzig accenten in std. ascii ;Do VANNAAR^vhTERMINA("ASCII") ;Set C("OMSCHRIJFNED")=$TR(C("OMSCHRIJFNED"),FVAN,FNAAR)