Index: PVExcel.mac.rou =================================================================== diff -u -r51636 -r54048 --- PVExcel.mac.rou (.../PVExcel.mac.rou) (revision 51636) +++ PVExcel.mac.rou (.../PVExcel.mac.rou) (revision 54048) @@ -1,6 +1,7 @@ PVExcel #include Prod.Product #include vhLib.Macro +#include BL.Derde.LevSpecifiek ; ***************************** ; KLANT @@ -19,6 +20,8 @@ Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New() #dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC =SalesPriceService.GeefPrijs(KLNr,PRNr,SimPPL,Aantal) #dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1) + Do DumpObject^%apiOBJ(Result) + Do DumpObject^%apiOBJ(ResultLine) Set Return=$$$ExcelNum(ResultLine.Price) Set Return=Return_"\"_$$$ExcelNum(ResultLine.GrossPrice) Set Return=Return_"\"_ResultLine.PriceUnit @@ -33,8 +36,16 @@ Quit:KLNr="" "#No klantnr" Quit:'$D(^DKL("K","KL.A",KLNr)) "#Bad klantnr" Quit $$GetKlant2(KLNr,FieldKey) + +SetPool(Ref) + Set Bidi=$P(Ref,"->",1) + Set Pool=$P(Ref,"->",2) + Quit:(Bidi="")||(Pool="") "" + Set Antwoord=##class(WS.TAPI.Router).SetPool(Bidi,Pool) + Quit Antwoord + + - GetKlant2(KLNr,BIndex) New R,Node,Piece,OldValue,NBIndex Set Piece=BIndex#100 @@ -111,13 +122,34 @@ GetBasisIdentNr(IdentNr) Set PRNr=$$GetPRNr(IdentNr) Quit:PRNr="" "N/A" - w PRNr, " " + ;w PRNr, " " Set GenPRNr=$P(^KPR(PRNr,0),"\",3) - w GenPRNr," " - Quit:GenPRNr'?1.9N IdentNr + ;w GenPRNr," " + Quit:GenPRNr'?1.9N ##class(AX.Uitgaand.EC.DataAX.impl.Translator).%New().GeefItemIDForAX(PRNr) Set BasisIdentNr=$P(^KPR(GenPRNr,2),"\",25) Quit BasisIdentNr + +GetKlasHLX(IdentNr) + Set PRNr=$$GetPRNr(IdentNr) + Quit:PRNr="" "N/A" + Quit $E($$$PRGet($$$Hoofdgroep),3,4)_$S($$$PRGet($$$LeveranciersNr)=$$$LevHalux:" EP",1:"") + Quit + Quit "BSL" +GetKlas(IdentNr) + Set PRNr=$$GetPRNr(IdentNr) + Quit:PRNr="" "N/A" + Quit $E($$$PRGet($$$Hoofdgroep),3,4) + Quit + Quit "BSL" + +GetKortTekst(IdentNr) + Set PRNr=$$GetPRNr(IdentNr) + Quit:PRNr="" "N/A" + Quit $$GetOrOld^PRODUKT(PRNr,$$$KortTekst) + + + GetProdType(IdentNr) Set PRNr=$$GetPRNr(IdentNr) Quit:PRNr="" "N/A" @@ -155,21 +187,23 @@ ;'=ceRoutine("$$MemXLS^PVExcel";A2&"/013/"&B2) MemXLS(Ref) - Set ^PVExcelTmp(Ref)="" + Set ^PVExcelTmp($P(Ref,"/",1))=$P(Ref,"/",2,3) Quit "Stored" - +OLUsed(Ref) + Set ^APPS.VKP.Maatwerk.LadeCodeUsed($TR(Ref," "))="" + Quit "Stored" VerwerkProdXLS Set PRNr=0 Set Found=0,Count=0 - For Set PRNr=$O(^KPR(PRNr)) Quit:PRNr="" Do ;Q:Found + ;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") + . Set ArtGrpVHBE=$ZCVT($P(^PVExcelTmp(Ref),"/",1),"U") + . Set ArtGrpHLX=$ZCVT($P(^PVExcelTmp(Ref),"/",2),"U") . Set:ArtGrpVHBE="SERVICE" ArtGrpVHBE="SERV" . Set:ArtGrpVHBE="GRONDSTOF" ArtGrpVHBE="GS" . Set:ArtGrpVHBE="VERPAKKING" ArtGrpVHBE="VERP"