Index: KPRIJSADMIN.mac.rou =================================================================== diff -u -r48131 -r48137 --- KPRIJSADMIN.mac.rou (.../KPRIJSADMIN.mac.rou) (revision 48131) +++ KPRIJSADMIN.mac.rou (.../KPRIJSADMIN.mac.rou) (revision 48137) @@ -139,9 +139,10 @@ Set R = $$PROD(.PRNr,.Korting1,.Korting2,.KlMunt,.NetBrutP,.KlTyp,.NoSa,.SimPPL,.KlantGrOrde,.CheckKAT,.BusinessType) Set $P(R,"\") = $P(R,"\")*$$GETBTWFACTOR(.Land) Quit R + ProdViaCodex(PRNr,Codex) New KLNr - Set KLNr=$Case(Codex,"L":6819,"R":6820,"S":6821,"B":6822,"G":29391,"P":13854,"C":15876) + Set KLNr=$Case(Codex,"L":$$$KlantLVanHoecke,"R":$$$KlantRVanHoecke,"S":$$$KlantSVanHoecke,"B":$$$KlantBVanHoecke,"G":$$$KlantGVanHoecke,"P":$$$KlantPVanHoecke,"C":$$$KlantCVanHoecke) Quit:'$D(^KK1(KLNr)) "" Quit $$KLANTPR(KLNr,PRNr) @@ -153,7 +154,7 @@ New R,KatPr,CorFakt,KatProd,IsKatPr,FaMunt,Munt,MuntPar,IsKsCust,PrijsKl,VkpPr,KortNiv,AkpEUR,VkpEUR,LijstEUR,LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork New BTWfactor,LijstPr1,VkpEURIncl,VkpPr1,VkpPrIncl - If ($G(Korting1)'="")&&("CPLRSBG"[Korting1) Quit $$ProdViaCodex(PRNr,Korting1) + If $$$CheckAXFase&&($G(Korting1)'="")&&("CPLRSBG"[Korting1) Quit $$ProdViaCodex(PRNr,Korting1) ; Opgezet via GETPROD : LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork Index: KPRIJS.mac.rou =================================================================== diff -u -r48131 -r48137 --- KPRIJS.mac.rou (.../KPRIJS.mac.rou) (revision 48131) +++ KPRIJS.mac.rou (.../KPRIJS.mac.rou) (revision 48137) @@ -139,9 +139,10 @@ Set R = $$PROD(.PRNr,.Korting1,.Korting2,.KlMunt,.NetBrutP,.KlTyp,.NoSa,.SimPPL,.KlantGrOrde,.CheckKAT,.BusinessType) Set $P(R,"\") = $P(R,"\")*$$GETBTWFACTOR(.Land) Quit R + ProdViaCodex(PRNr,Codex) New KLNr - Set KLNr=$Case(Codex,"L":6819,"R":6820,"S":6821,"B":6822,"G":29391,"P":13854,"C":15876) + Set KLNr=$Case(Codex,"L":$$$KlantLVanHoecke,"R":$$$KlantRVanHoecke,"S":$$$KlantSVanHoecke,"B":$$$KlantBVanHoecke,"G":$$$KlantGVanHoecke,"P":$$$KlantPVanHoecke,"C":$$$KlantCVanHoecke) Quit:'$D(^KK1(KLNr)) "" Quit $$KLANTPR(KLNr,PRNr) @@ -153,7 +154,7 @@ New R,KatPr,CorFakt,KatProd,IsKatPr,FaMunt,Munt,MuntPar,IsKsCust,PrijsKl,VkpPr,KortNiv,AkpEUR,VkpEUR,LijstEUR,LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork New BTWfactor,LijstPr1,VkpEURIncl,VkpPr1,VkpPrIncl - If ($G(Korting1)'="")&&("CPLRSBG"[Korting1) Quit $$ProdViaCodex(PRNr,Korting1) + If $$$CheckAXFase&&($G(Korting1)'="")&&("CPLRSBG"[Korting1) Quit $$ProdViaCodex(PRNr,Korting1) ; Opgezet via GETPROD : LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork Index: PVAX.mac.rou =================================================================== diff -u --- PVAX.mac.rou (revision 0) +++ PVAX.mac.rou (revision 48137) @@ -0,0 +1,120 @@ +#include BL.Derde.LevSpecifiek +#include Prod.Product +#include vhLib.Macro +PVAX + Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New() + Do PrijsOphalen(1125,249821) + Do PrijsOphalen(4810,808099) + Do PrijsOphalen(4810,3551) + Do PrijsOphalen(4810,1277761) + Do PrijsOphalen(4810,113091) ; schroeven per honderd + Do PrijsOphalen(4810,685017) + Do PrijsOphalen(4810,794520) + Do PrijsOphalen(14604,675436,100) + Do PrijsOphalen(14604,904305) + Do PrijsOphalen(14604,794520,200) + Do PrijsOphalen(19485,675436,500) + Quit + +PrijsOphalen(KLNr,PRNr,CifPPL) + Write !,KLNr," ",$P(^KKL(^KK1(KLNr),0),"\",2),! + Write PRNr," ",$P(^KPR(PRNr,2),"\",25)," ",$P(^KPR(PRNr,0),"\"),! + Set Result=SalesPriceService.GeefPrijs(KLNr,PRNr,.CifPPL) + d DumpObject^%apiOBJ(Result) + Set PrijsRec=$$KLANTPR^KPRIJSADMIN(KLNr,PRNr,,.CifPPL) + Write !,"Admin prijs: ",$P(PrijsRec,"\")," lijstprijs : ",$P(PrijsRec,"\",4),! + q + +All + ;Do KlantCheck(4810) ; lobelle + ;Do KlantCheck(1736) ; dupont + Do KlantCheck(1614) ; Vossaert (B2C) + ;Do KlantCheck(3042) ; dovy + ;Do KlantCheck(23112) ; DKG + q +KlantCheck(KLNr) + w ^KK1(KLNr),! + Set TijdStipStartLog=$zH + Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New() + Do SalesPriceService.Initialisatie(KLNr) + Kill CacheID + Set PRNr=$O(^KSTKL(KLNr,0)) + Set Count=0 + While PRNr + { + Quit:$D(^KPR(PRNr,"J"_$$$LevHalux)) + Quit:$$$PRGet($$$GenProduct)'="" + Quit:$$$PRGet($$$NONAktief)=1 + If $D(^KPR(PRNr,"J"_$$$LevVanHoecke)) { + Set CifPPL=$$CifPPL^KPRIJS(PRNr) + } Else { + Set CifPPL="" + } + Set MessageId=SalesPriceService.VoegToeProduct(PRNr,CifPPL) + Set Count=Count+1 + Set CacheId(MessageId)=PRNr + Set PRNr=$O(^KSTKL(KLNr,PRNr)) + } + Set TijdOphalen=$ZH-TijdStipStartLog + Set TijdStipStartLog=$zH + Do SalesPriceService.VoerUit() + Set TijdWebservice=$ZH-TijdStipStartLog + Set TijdStipStartLog=$zH + Set it=SalesPriceService.GeefResultaatIterator() + Set Dev=$$OPEN^vhDEV("f:\AX.EC","PrijsVGL AX "_KLNr_".txt","W") + Use Dev + Write "GUID PRNr ItemID KortTekst InclBTW AXPrice AXGO AdminPrice AdminGO Verschil ErrorTxt",! + While it.HasNext() + { + Set Result=it.Next() + Set MessageId="{"_$zcvt(Result.MessageId,"U")_"}" + Set PRNr=$G(CacheId(MessageId)) + Set PrijsRec=$$KLANTPR^KPRIJSADMIN(KLNr,PRNr) + write Result.MessageId,*9 + Write PRNr,*9,Result.ItemId,*9,$$$PRGet($$$KortTekst) + Write *9,SalesPriceService.PrijzenInclBTW(),*9,$$$ExcelNum(Result.Price),*9,Result.PriceUnit + Write *9,$$$ExcelNum($P(PrijsRec,"\",1)),*9,$P(PrijsRec,"\",11) + Write:'$L(Result.ErrorTxt) *9,$$$ExcelNum((Result.Price/Result.PriceUnit)-($P(PrijsRec,"\",1)/$P(PrijsRec,"\",11))) + Write:$L(Result.ErrorTxt) *9,"error" + Write *9,Result.ErrorTxt + Write ! + ;d DumpObject^%apiOBJ(Result) + + } + Do CLOSE^vhDEV(Dev) + Write KLNr," #Prod:",Count," Ophalen:",TijdOphalen," Webservice:",TijdWebservice," Vgl: ",$ZH-TijdStipStartLog,! + Quit + +Multi + Set SalesPriceService=##class(AXimpl.Admin.VKP.SalesPriceService).%New() + Do SalesPriceService.Initialisatie(4810) + Do SalesPriceService.VoegToeProduct(3551) + Do SalesPriceService.VoegToeProduct(685017) + Do SalesPriceService.VoegToeProduct(675436,100) + Do SalesPriceService.VoerUit() + Set it=SalesPriceService.GeefResultaatIterator() + While it.HasNext() + { + Set Result=it.Next() + d DumpObject^%apiOBJ(Result) + } + Quit +KLANTPR + Set PRNr=3551 + Set KLNr=4810 + W "Admin:",$$KLANTPR^KPRIJSADMIN(KLNr,PRNr),! + W "AX :",$$KLANTPR^KPRIJSAX(KLNr,PRNr),! + q + +PRIJSGEG + Set PRNr=3551 + W "Admin:",$$PRIJSGEG^KPRIJSADMIN(PRNr),! + W "AX :",$$PRIJSGEG^KPRIJSAX(PRNr),! + q + + +ZETURL + + Do ##class(TECH.Config.ConfigMgr).Instance().SetString("VHIP907SalesPriceServiceUrl","http://ax-aos-dev:84/MicrosoftDynamicsAXAif60_ACCEPT/SalesPriceService/xppservice.svc") + Do ##class(TECH.Config.ConfigMgr).Instance().SetString("VHIP907SalesPriceServiceUrl","http://ax_scan:81/MicrosoftDynamicsAXAif60_PROD/SalesPriceService/xppservice.svc") + q Index: BL/Derde/KlantSpecifiek.inc.rou =================================================================== diff -u -r29059 -r48137 --- BL/Derde/KlantSpecifiek.inc.rou (.../KlantSpecifiek.inc.rou) (revision 29059) +++ BL/Derde/KlantSpecifiek.inc.rou (.../KlantSpecifiek.inc.rou) (revision 48137) @@ -23,8 +23,13 @@ #define KlantVanHoeckeNV 4682 #define KlantVanHoeckeBV 9544 #define KlantAtlasHolding 5069 - #define KlantBVanHoecke 6822 + #define KlantGVanHoecke 29391 + #define KlantBVanHoecke 6820 + #define KlantSVanHoecke 6821 + #define KlantRVanHoecke 6822 #define KlantLVanHoecke 6819 + #define KlantPVanHoecke 13854 + #define KlantCVanHoecke 15876 #define KlantTest 1000 ; IP vertegenwoordiger Index: KPRIJSAX.mac.rou =================================================================== diff -u -r48131 -r48137 --- KPRIJSAX.mac.rou (.../KPRIJSAX.mac.rou) (revision 48131) +++ KPRIJSAX.mac.rou (.../KPRIJSAX.mac.rou) (revision 48137) @@ -139,9 +139,10 @@ Set R = $$PROD(.PRNr,.Korting1,.Korting2,.KlMunt,.NetBrutP,.KlTyp,.NoSa,.SimPPL,.KlantGrOrde,.CheckKAT,.BusinessType) Set $P(R,"\") = $P(R,"\")*$$GETBTWFACTOR(.Land) Quit R + ProdViaCodex(PRNr,Codex) New KLNr - Set KLNr=$Case(Codex,"L":6819,"R":6820,"S":6821,"B":6822,"G":29391,"P":13854,"C":15876) + Set KLNr=$Case(Codex,"L":$$$KlantLVanHoecke,"R":$$$KlantRVanHoecke,"S":$$$KlantSVanHoecke,"B":$$$KlantBVanHoecke,"G":$$$KlantGVanHoecke,"P":$$$KlantPVanHoecke,"C":$$$KlantCVanHoecke) Quit:'$D(^KK1(KLNr)) "" Quit $$KLANTPR(KLNr,PRNr) @@ -153,7 +154,7 @@ New R,KatPr,CorFakt,KatProd,IsKatPr,FaMunt,Munt,MuntPar,IsKsCust,PrijsKl,VkpPr,KortNiv,AkpEUR,VkpEUR,LijstEUR,LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork New BTWfactor,LijstPr1,VkpEURIncl,VkpPr1,VkpPrIncl - If ($G(Korting1)'="")&&("CPLRSBG"[Korting1) Quit $$ProdViaCodex(PRNr,Korting1) + If $$$CheckAXFase&&($G(Korting1)'="")&&("CPLRSBG"[Korting1) Quit $$ProdViaCodex(PRNr,Korting1) ; Opgezet via GETPROD : LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork