Index: APPS/Halux/Component/impl/ImportBSKey.cls.xml =================================================================== diff -u -r57547 -r62525 --- APPS/Halux/Component/impl/ImportBSKey.cls.xml (.../ImportBSKey.cls.xml) (revision 57547) +++ APPS/Halux/Component/impl/ImportBSKey.cls.xml (.../ImportBSKey.cls.xml) (revision 62525) @@ -46,8 +46,8 @@ Set BS.Familie=reader.Column(1) Set:BS.Familie="TA.B" BS.Familie="TAX" Set BS.BSKey=$P(reader.Column(2),".",1) - Set BS.Werkpost=$tr(reader.Column(3),"""") - Set BS.WerkpostAlsBinnenlade=reader.Column(4) + Set BS.Werkpost=$tr(reader.Column(3),"""","") + Set BS.WerkpostAlsBinnenlade=$tr(reader.Column(4),"""","") Set BS.WerkpostAlsSpoelbak=reader.Column(5) Do BS.Save() } Index: Flow/Toelev/Hoofding.cls.xml =================================================================== diff -u -r29059 -r62525 --- Flow/Toelev/Hoofding.cls.xml (.../Hoofding.cls.xml) (revision 29059) +++ Flow/Toelev/Hoofding.cls.xml (.../Hoofding.cls.xml) (revision 62525) @@ -179,6 +179,13 @@ + +%String +1 + Set {*}=##class(Flow.Toelev.Hoofding).ProductieDueOutTxt({ProductieDueOut}) +1 + + Leeg = Stock @@ -252,6 +259,22 @@ 0 + +1 +TimeStamp:%String +%String + + + + + + + 0 1 Index: APPS/Halux/Opvolging/impl/LaatsteActie.cls.xml =================================================================== diff -u --- APPS/Halux/Opvolging/impl/LaatsteActie.cls.xml (revision 0) +++ APPS/Halux/Opvolging/impl/LaatsteActie.cls.xml (revision 62525) @@ -0,0 +1,137 @@ + + + +persistent +1 +TECH.Persistent + + +%TimeStamp + + + +%String + + + +%String + + + + +Link naar DS.PPS.TBX.Queue +%String + + + + +Link naar APPS.Halux.PPS.Activiteit.dto.ProductieSequentieWerklijstItem +%String + + + +APPS.Halux.common.enu.Werkpost + + + +APPS.Halux.common.enu.ProductieLijn + + + +%String + + + +Werkpost:APPS.Halux.common.enu.Werkpost +%Status + + + + +1 +Werkpost:APPS.Halux.common.enu.Werkpost,Lijn:APPS.Halux.common.enu.ProductieLijn,ProdGrp:%String="",BatchID:%String,QueueID:%String="",UniqueID:%String="" +%Status + + + + +1 +Werkpost:APPS.Halux.common.enu.Werkpost + + + + +1 +1 +Werkpost +1 + + + +%Library.CacheStorage +^APPS.Halux.OpEDFA.LaatsteActieD +LaatsteActieDefaultData +^APPS.Halux.OpEDFA.LaatsteActieD +^APPS.Halux.OpEDFA.LaatsteActieI +^APPS.Halux.OpEDFA.LaatsteActieS + + +%%CLASSNAME + + +Tijd + + +BatchID + + +QueueID + + +UniqueID + + +Werkpost + + +Lijn + + +ProdGrp + + +Tijdstip + + +VorigBatchID + + + + + + + Index: APPS/BD/OrderStat/impl/PKG =================================================================== diff -u --- APPS/BD/OrderStat/impl/PKG (revision 0) +++ APPS/BD/OrderStat/impl/PKG (revision 62525) @@ -0,0 +1,4 @@ + + + + Index: APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml =================================================================== diff -u -r54527 -r62525 --- APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml (.../Extract2IntakeEnGeleverd.cls.xml) (revision 54527) +++ APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml (.../Extract2IntakeEnGeleverd.cls.xml) (revision 62525) @@ -140,7 +140,7 @@ Set ..TotDatum=+$G(Tot) If ..Jaar="All" { - Set ..VanDatum=$$INTDATE^vhLib.DataTypes("01/01/"_2015) + Set ..VanDatum=$$INTDATE^vhLib.DataTypes("01/11/"_2017) Set ..TotDatum=$$INTDATE^vhLib.DataTypes("31/12/"_2017) } Else @@ -532,8 +532,13 @@ If '..ExistProduct(PRNr) Quit:'..CheckDatum(-..MinDatum) + Set CommKlantNr=$LI(##class(BL.Derde.Klant.Relaties).CommercieleOverdracht(..KLNr),1) + If CommKlantNr=""||('$P(^KKL(^KK1(..KLNr),2),"\",10)) + { Set CommKlantNr=..KLNr} + Else + { Write ^KK1(..KLNr), "->" , ^KK1(CommKlantNr),! } ;Set OrderInLevering=##class(OrderGeleverd).Add(..FromType,..KLNr,..ORDNr,..OrderDatum,..OrderTijd,..IntakeType,..OrderVerwerker,..BONNr,..LeverDatum,..Verzendwijze,..PickDatum,..PickTijd,..Straat,..PostKode,..Woonplaats,..LandKode,..Afstand.Afstand,PRNr,Qty,BevestigdeLeverDatum,VerwachteLeverDatum,OmzetVerkoop,OmzetAankoop) - Set OrderFactuur=##class(OrderFacturen).Add(..Translator,..FAKNr,-..MinDatum,..FromType,..KLNr,..ORDNr,..OrderDatum,..OrderTijd,..IntakeType,..OrderVerwerker,..BONNr,..LeverDatum,..Verzendwijze,..PickDatum,..PickTijd,..Straat,..PostKode,..Woonplaats,..LandKode,..Afstand.Afstand,PRNr,Qty,BevestigdeLeverDatum,VerwachteLeverDatum,OmzetVerkoop,OmzetAankoop) + Set OrderFactuur=##class(OrderFacturen).Add(..Translator,..FAKNr,-..MinDatum,..FromType,CommKlantNr,..ORDNr,..OrderDatum,..OrderTijd,..IntakeType,..OrderVerwerker,..BONNr,..LeverDatum,..Verzendwijze,..PickDatum,..PickTijd,..Straat,..PostKode,..Woonplaats,..LandKode,..Afstand.Afstand,PRNr,Qty,BevestigdeLeverDatum,VerwachteLeverDatum,OmzetVerkoop,OmzetAankoop) Do ##class(OrderFacturen).MaandCumul(OrderFactuur) ]]> @@ -611,7 +616,7 @@ Index: AXimpl/PM/SchaduwPrijs/CalculateAll.cls.xml =================================================================== diff -u -r58234 -r62525 --- AXimpl/PM/SchaduwPrijs/CalculateAll.cls.xml (.../CalculateAll.cls.xml) (revision 58234) +++ AXimpl/PM/SchaduwPrijs/CalculateAll.cls.xml (.../CalculateAll.cls.xml) (revision 62525) @@ -94,9 +94,9 @@ Set SchaduwPrijs.ItemID=ItemID Set SchaduwPrijs.ConfigID=ConfigID Do SchaduwPrijs.AdminProductSetObjectId(PRNr) - Set SchaduwPrijs.FutureCostPrice=+$J($$CifPPL^KPRIJS(PRNr,"S")*100,0,2) + Set SchaduwPrijs.FutureCostPrice=+$J($$CifPPL^KPRIJS(PRNr,"S"),0,2)*100 Set SchaduwPrijs.FutureUnitPrice=100 - Set SchaduwPrijs.CurrentCostPrice=+$J($$CifPPL^KPRIJS(PRNr,"N")*100,0,2) + Set SchaduwPrijs.CurrentCostPrice=+$J($$CifPPL^KPRIJS(PRNr,"N"),0,2)*100 Set SchaduwPrijs.CurrentUnitPrice=100 Do SchaduwPrijs.Save() } Index: APPS/Halux/Component/impl/ConvertLBX.cls.xml =================================================================== diff -u -r57552 -r62525 --- APPS/Halux/Component/impl/ConvertLBX.cls.xml (.../ConvertLBX.cls.xml) (revision 57552) +++ APPS/Halux/Component/impl/ConvertLBX.cls.xml (.../ConvertLBX.cls.xml) (revision 62525) @@ -6,6 +6,7 @@ MONTAGE" && (..VerpakCode'="V1") + { + set ..TransferTo="MAT>PROBOX" + } ]]> Index: AX/Uitgaand/EC/Klanten/impl/ExportProductHistoriek.cls.xml =================================================================== diff -u -r50353 -r62525 --- AX/Uitgaand/EC/Klanten/impl/ExportProductHistoriek.cls.xml (.../ExportProductHistoriek.cls.xml) (revision 50353) +++ AX/Uitgaand/EC/Klanten/impl/ExportProductHistoriek.cls.xml (.../ExportProductHistoriek.cls.xml) (revision 62525) @@ -81,6 +81,7 @@ . . . . Set HistRec=^KKAAP(..KlantId,HoofdGroep,Groep,SubGroep,KortText) . . . . Set PRNr=$P(HistRec,"\",15) . . . . Quit:'..CheckProduct(PRNr) + . . . . Quit:$P(^KKAAP(..KlantId,HoofdGroep,Groep,SubGroep,KortText),"\",3)'>0 ; alleen producten die de klant gekocht en gehouden heeft . . . . Set Proxy=..BuildProxy(HistRec) . . . . Do ..Writer.Object(Proxy,"PakketRef") . . . . Do ..ExportSamenvatting.Increment() Index: APPS/Halux/Opvolging/impl/LadeActieEventCatcher.cls.xml =================================================================== diff -u --- APPS/Halux/Opvolging/impl/LadeActieEventCatcher.cls.xml (revision 0) +++ APPS/Halux/Opvolging/impl/LadeActieEventCatcher.cls.xml (revision 62525) @@ -0,0 +1,126 @@ + + + + +1 +%RegisteredObject + + + +d ##class(APPS.Halux.Opvolging.impl.LadeActieEventCatcher).Test() +1 + + + + + +d ##class(APPS.Halux.Opvolging.impl.LadeActieEventCatcher).InitSubscriptions() +1 + + + + + +Lade geperst dmv oude pers : TBX +1 +Event:APPS.Halux.common.event.LadeGeperstEvent + + + + + +Lade geperst dmv nieuwe pers : LBX +1 +Event:APPS.Halux.common.event.NieuwLadeGeperstEvent + + + + +1 +Werkpost:APPS.Halux.common.enu.Werkpost +APPS.Halux.common.enu.ProductieLijn + + + + +1 +Werkpost:APPS.Halux.common.enu.Werkpost +%String + + + + + + Index: RPLKL2.mac.rou =================================================================== diff -u -r57611 -r62525 --- RPLKL2.mac.rou (.../RPLKL2.mac.rou) (revision 57611) +++ RPLKL2.mac.rou (.../RPLKL2.mac.rou) (revision 62525) @@ -284,8 +284,6 @@ S U2=UR_D_$P(U2,D,2)_D_D_$P(U2,D,3)_"\"_$S($L($P(U2,D,16)):" "_$P($P(U2,D,16),".",1,2)_"b",1:"")_"\\\"_$P(U2,D,18)_"\\\"_$J($P(U2,D,25),4)_"\\\" S $P(U2,D,9)=$$TRANSPORT^FLOWORD(UR,2) S:$L($P(U2,D,9)) $P(U2,D,9)="*"_$P(U2,D,9)_"*" - // tsl = (nog) te sluiten (= tijdens ingave, of indien reflection sluiten tijdens ingave, of tijdelijk order aangemaakt vanuit AX maar dan niet behandeld. - // vtg = vrij te geven (door de boekhouding): is niet meer mogelijk, aangezien boekhoudkundige vrijgave in AX gebeurt. I $P(U2,D,9)="",'$P(Close,D) S $P(U2,D,9)="tsl" I $P(Close,D,2)=1 S $P(U2,D,9)="vtg" S UZ=100,VNRX=VNR+1 G ORD3 Index: APPS/VKP/VerzendWijze.cls.xml =================================================================== diff -u -r61562 -r62525 --- APPS/VKP/VerzendWijze.cls.xml (.../VerzendWijze.cls.xml) (revision 61562) +++ APPS/VKP/VerzendWijze.cls.xml (.../VerzendWijze.cls.xml) (revision 62525) @@ -246,7 +246,7 @@ Set DueOutPickingTime = ..VerzendWijze.DueOutMagazijn } - If $Extract(..VerzendWijzeID, 1, 3) = "DI1", ..LandCode="NL" Set DueOutPickingTime = $$INTTIME^vhLib.DataTypes("12:00") + If $Extract(..VerzendWijzeID, 1, 3) = "DI1", ..LandCode="NL" Set DueOutPickingTime = $$INTTIME^vhLib.DataTypes("13:00") Quit DueOutPickingTime ]]> Index: APPS/Halux/Component/impl/ConvertTAX.cls.xml =================================================================== diff -u -r57552 -r62525 --- APPS/Halux/Component/impl/ConvertTAX.cls.xml (.../ConvertTAX.cls.xml) (revision 57552) +++ APPS/Halux/Component/impl/ConvertTAX.cls.xml (.../ConvertTAX.cls.xml) (revision 62525) @@ -6,6 +6,7 @@ MONTAGE" ; && (..VerpakCode'="V1") + { + set ..TransferTo="MAT>PROBOX" + } ]]> Index: APPS/Halux/Component/impl/ConvertDIV.cls.xml =================================================================== diff -u -r57552 -r62525 --- APPS/Halux/Component/impl/ConvertDIV.cls.xml (.../ConvertDIV.cls.xml) (revision 57552) +++ APPS/Halux/Component/impl/ConvertDIV.cls.xml (.../ConvertDIV.cls.xml) (revision 62525) @@ -22,9 +22,9 @@ Set:$E(KortTekst,1,3)="Z37" ..ToepassingCode="Ompak",..Activiteit="Set" Set:$E(KortTekst,1,3)="Z31" ..ToepassingCode="Inkorten",..Activiteit="Inkorten" Set:$E(KortTekst,1,3)="ZRG" ..ToepassingCode="Inkorten",..Activiteit="Inkorten" - Set:$E(KortTekst,1,3)="ZW7" ..ToepassingCode="Front",..Activiteit="Set" + Set:$E(KortTekst,1,3)="ZW7" ..ToepassingCode="Ompak",..Activiteit="Set" Set:$E(KortTekst,1,3)="ZR7" ..ToepassingCode="Inkorten",..Activiteit="Inkorten" - Set:$E(KortTekst,1,3)="ZE7" ..ToepassingCode="Inkorten",..Activiteit="Inkorten" + Set:$E(KortTekst,1,3)="ZE7" ..ToepassingCode="Ompak",..Activiteit="Inkorten" Set:$E(KortTekst,2,3)="20" ..ToepassingCode="Aventos",..Activiteit="Set" Set:$E(KortTekst,1,3)="Z40" ..ToepassingCode="Inkorten",..Activiteit="Inkorten" Set:$E(KortTekst,1,3)="Z10" ..ToepassingCode="Ompak",..Activiteit="Ompak" @@ -35,14 +35,26 @@ KLANT" } elseif ..ToepassingCode="Inkorten" { - Set ..TransferTo="INKORTEN" + Set ..TransferTo="INKORTEN ALU>KLANT" + } + elseif ..ToepassingCode="Inkorten glas" + { + Set ..TransferTo="INKORTEN GLAS>KLANT" } - Else { - Set ..TransferTo="OMPAK" + Else + { + If +$$$ProductGet(..MPRNr,$$$StockType) ; stock + { + Set ..TransferTo="OMPAK>VOORRAAD" + } + Else + { + Set ..TransferTo="OMPAK>KLANT" + } } ]]> Index: AXimpl/Admin/TRANSPORT/Levbon/Processor.cls.xml =================================================================== diff -u -r58210 -r62525 --- AXimpl/Admin/TRANSPORT/Levbon/Processor.cls.xml (.../Processor.cls.xml) (revision 58210) +++ AXimpl/Admin/TRANSPORT/Levbon/Processor.cls.xml (.../Processor.cls.xml) (revision 62525) @@ -18,10 +18,22 @@ AXimpl.Admin.TRANSPORT.Levbon.BonLevering + +%List + + AX.Uitgaand.EC.DataAX.impl.Translator + +APPS.OV.impl.TrackAndTraceService + + + +TECH.ObjectUtils.impl.Differenciator + + %Status 1 @@ -81,17 +96,19 @@ KLNr:%String,Node:%String,BONNr:%String @@ -101,13 +118,33 @@ 1) || (Verschillen.GetAt(1)'["CreatieDatum") + { + Do ##class(AXimpl.Admin.TRANSPORT.Levbon.BonLevering).%DeleteId(BonLevering.AXOrderID_"||"_BonLevering.LeveringBonNr) + Set IsChanged=1 + } + } + } + else + { + Set IsChanged=1 + } + Do:IsChanged BonLevering.Save() + Set ..AXOrdersFetched=..AXOrdersFetched_$LB(AXOrderID) } } ]]> @@ -148,7 +185,7 @@ Set ..BonLevering.StraatEnNr=$P(AdresRec,"\",5) Set ..BonLevering.Postkode=$P(AdresRec,"\",6) Set ..BonLevering.Gemeente=$P(AdresRec,"\",7) - Set ..BonLevering.Landkode3=$$LAND^vhRtn1($P(AdresRec,"\",8),1,1) + Set ..BonLevering.Landkode3=..LandCode3($P(AdresRec,"\",8)) ;$$LAND^vhRtn1($P(AdresRec,"\",8),1,1) Do ..VertaalVerzendwijzeVanBon($P(Rec,"\",7)) Set ..BonLevering.VerwachteOntvangstDatum=$$INTDATE^vhLib.DataTypes($P(Rec,"\",2)) Do ..VoegtoeBonVerzendwijzeEnDatum() @@ -164,6 +201,7 @@ If VerzendDatum'="" { Set ..BonLevering.VerzendDatum=+VerzendDatum + Set ..BonLevering.VerzendTijdstip=$P($$$Timestamp(VerzendDatum),".",1) ; milliseconden eraf halen Do ..GeefVerzendwijzeVanTransport(TRANSNr) Set ..BonLevering.TransportID=TRANSNr Set ..BonLevering.GroeperingID=GroepBONNr @@ -176,20 +214,44 @@ Set ..BonLevering.StraatEnNr=$P(AdresRec,"\",5) Set ..BonLevering.Postkode=$P(AdresRec,"\",6) Set ..BonLevering.Gemeente=$P(AdresRec,"\",7) - Set ..BonLevering.Landkode3=$$LAND^vhRtn1($P(AdresRec,"\",8),1,1) + Set ..BonLevering.Landkode3=..LandCode3($P(AdresRec,"\",8)) } ; Colliegegevens Set ..BonLevering.AantalCollie=$P($G(^TRANSP("D",TRANSNr,"D",GroepBONNr,"Q","C")),"\") Set ..BonLevering.AantalEuroPallet=$P($G(^TRANSP("D",TRANSNr,"D",GroepBONNr,"Q","E")),"\") Set ..BonLevering.AantalHalvePallet=$P($G(^TRANSP("D",TRANSNr,"D",GroepBONNr,"Q","P")),"\") Set ..BonLevering.AantalBigPallet=$P($G(^TRANSP("D",TRANSNr,"D",GroepBONNr,"Q","B")),"\") - Set ..BonLevering.AantalLanggoed=$P($G(^TRANSP("D",TRANSNr,"D",GroepBONNr,"Q","C")),"\") + Set ..BonLevering.AantalLanggoed=$P($G(^TRANSP("D",TRANSNr,"D",GroepBONNr,"Q","L")),"\") } + Do ..VulAanTrackAndTrace() } ]]> + +LandID:%String + + + + + + + VerzendwijzeBon:%String Index: PVSTM.mac.rou =================================================================== diff -u -r29059 -r62525 --- PVSTM.mac.rou (.../PVSTM.mac.rou) (revision 29059) +++ PVSTM.mac.rou (.../PVSTM.mac.rou) (revision 62525) @@ -1,4 +1,34 @@ #include vhLib.Macro +#include Prod.Product +#include BL.Derde.KlantSpecifiek + +PickingWho + Set Device=$$OPEN^vhDEV(,"StatIO.txt","W","T") + Use Device + Write "BONNr Datum Tijd Persoon SoftMag PickAantal PRNr KortTekst",! + Set CONSNr="" + For Set CONSNr=$O(^ORDW("D",CONSNr)) Quit:CONSNr="" Do + . Set ORDNr="" + . For Set ORDNr=$O(^ORDW("D",CONSNr,"D",ORDNr)) Quit:ORDNr="" Do + . . Set OLUNr="" + . . For Set OLUNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr)) Quit:OLUNr="" Do + . . . Set Rec=^(OLUNr) + . . . Set LijnCnt=0 + . . . Set SOLNr="" + . . . For Set SOLNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SOLNr)) Quit:SOLNr="" Do + . . . . Set SOLRec=^(SOLNr) + . . . . Set SoftMag=$P(SOLRec,"\",13) + . . . . Set User=$P(SOLRec,"\",12) + . . . . Set TijdStip=$P(SOLRec,"\",6) + . . . . Set PRNr=$P(SOLRec,D,1) + . . . . Write CONSNr,*9,$$$ExcelDat(TijdStip),*9,$$$ExcelTime($P(TijdStip,",",2)),*9,User,*9,SoftMag,*9,$P(SOLRec,D,4),*9,PRNr,*9,$$GetOrOld^PRODUKT(PRNr,$$$KortTekst) + . . . . Write ! + + Do CLOSE^vhDEV(Device) + + Quit + + PVSTM ; Order timings [ 11/08/2003 8:42 PM ] ; Overzicht contracten per klant en leverancier Do BLDCONTR^Stat.Product.StockWaarde @@ -171,9 +201,70 @@ Set Jaar=$$EXTDATE^vhLib.DataTypes($H,"J4")-1 Write @F11,@F1,@FMTI," Tellingen v/d OrderLijnen - "_QN_" ",@FMTi,!! Write "Kalenderjaar: ",Jaar,! - Do ValiPakAlle(Jaar) + Do ValiPakHist(Jaar) + ;Do ValiPakAlle(Jaar) ;Do ValiPakHalux(Jaar) Quit +ValiPakHist(Jaar) ;Stockrotatie + New I,Cumul,TLNr,Rec + Set BeginDat=$$INTDATE^vhLib.DataTypes("01/01/"_Jaar) + Set EndDat=$$INTDATE^vhLib.DataTypes("31/12/"_Jaar) + Set BeginWk=Jaar_".00 " + Set EindeWk=Jaar_".53 " + Set BeginMnd=Jaar_".01 " + Set EindeMnd=Jaar_".12 " + 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)),! + Set PRNr=0 + For Set PRNr=$O(^PRHIST(PRNr)) Quit:PRNr="" Do + . Set VolgNr=0 + . Set (AantalBslTot,AantalBslBE,AantalMwTot, AantalMwBE,AantalMwXX,AantalBslXX)=0 + . For Set VolgNr=$O(^PRHIST(PRNr,VolgNr)) Quit:VolgNr="" Do + . . Set Rec=^PRHIST(PRNr,VolgNr) + . . Set Datum=+$P(Rec,"\") + . . Quit:DatumEndDat + . . If ($P(Rec,"\",4)="H")&&($P(Rec,"\",5)="W") Do + . . . Set AantalMwTot=AantalMwTot-$P(Rec,"\",2) + . . . Set KLNr=$P(Rec,"\",6) + . . . 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 + . . . . Set:LandCache(KLNr) AantalMwBE=AantalMwBE-$P(Rec,"\",2) + . . . Else Do + . . . . Set AantalMwXX=AantalMwXX-$P(Rec,"\",2) + . . If ($P(Rec,"\",4)="U")&&($P(Rec,"\",5)="M") Do + . . . Set AantalBslTot=AantalBslTot-$P(Rec,"\",2) + . . . Set KLNr=$P(Rec,"\",6) + . . . 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 + . . . . Set:LandCache(KLNr) AantalBslBE=AantalBslBE-$P(Rec,"\",2) + . . . Else Do + . . . . Set AantalBslXX=AantalBslXX-$P(Rec,"\",2) + . Quit:(AantalMwTot+AantalBslTot)'>0 + . Set Klas=$O(^KPR(PRNr,"I")) Set Klas=$P(^KPR(PRNr,Klas),D,3) + . Set GenTyp=$$GENTYP^HAD(PRNr) + . Set LevNr=$O(^KPR(PRNr,"J")) + . 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" + . 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 $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 ValiPakAlle(Jaar) ;Stockrotatie New I,Cumul,TLNr,Rec @@ -186,11 +277,11 @@ Use Dev Write $TR("PRNr;KortTekst;Stock;Klas;GenTyp;SubGenTyp;LevNr;LevNm;CiffPPL;Gewicht;Week;Stock;AantalTot;AantalBE;BLBrut;BLNet;RecuPack",";",$c(9)),! Set PRNr=0 - For Set PRNr=$O(^KSPW(PRNr)) Quit:PRNr="" Do + For Set PRNr=$O(^KSTPR(PRNr)) Quit:PRNr="" Do . Set Wk=BeginWk . Set Stock="" . Set Week=0 - . For Set Wk=$O(^KSPW(PRNr,Wk)) Quit:Wk="" Quit:+Wk>+EindeWk!(Wk="") Do + . ;For Set Wk=$O(^KSPW(PRNr,Wk)) Quit:Wk="" Quit:+Wk>+EindeWk!(Wk="") Do . . Set Week=Week+1 . . Set Rec=^KSPW(PRNr,Wk) . . Set Stock=Stock+$P(Rec,D,4) @@ -207,15 +298,19 @@ . Set GenTyp=$$GENTYP^HAD(PRNr) . Set LevNr=$O(^KPR(PRNr,"J")) . Set CiffPPL=$P(^KPR(PRNr,LevNr),D,23) - . Set HasRecuPack=$P(^KPR(PRNr,LevNr),D,32)?4.7N + . 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" . 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,".",","),$C(9),Week,$C(9),Stock,$C(9),$TR(+$J(AantalTot,0,2),".",","),$C(9),$TR(+$J(AantalBE,0,2),".",","),$C(9),$TR($P(BLRec,D,9),".",","),$C(9),$TR($P(BLRec,D,26),".",","),*9,$S(HasRecuPack:"R",1:""),! + . 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,".",","),$C(9),Week,$C(9),Stock,$C(9),$TR(+$J(AantalTot,0,2),".",","),$C(9),$TR(+$J(AantalBE,0,2),".",","),$C(9),$TR($P(BLRec,D,9),".",","),$C(9),$TR($P(BLRec,D,26),".",","),*9,RecuPackProd,! Do CLOSE^vhDEV(Dev) Quit Index: AXimpl/Admin/TRANSPORT/Levbon/BonLevering.cls.xml =================================================================== diff -u -r58984 -r62525 --- AXimpl/Admin/TRANSPORT/Levbon/BonLevering.cls.xml (.../BonLevering.cls.xml) (revision 58984) +++ AXimpl/Admin/TRANSPORT/Levbon/BonLevering.cls.xml (.../BonLevering.cls.xml) (revision 62525) @@ -14,7 +14,6 @@ %String -1 @@ -25,6 +24,10 @@ %Date + +%TimeStamp + + %Date @@ -108,13 +111,31 @@ %String + +%String + + + + +%String + + + + +%Date + + 1 1 AXOrderID,LeveringBonNr 1 + +CreatieDatum + + %Library.CacheStorage ^AXimpl.Admin.TRDBB.BonLeveringD @@ -192,6 +213,24 @@ Naam + +VerzendTijdstip + + +TrackAndTraceInterneURL + + +TrackAndTracePubliekeURL + + +TrackAndTracePrivaatURL + + +KlantNr + + +CreatieDatum + Index: AXimpl/PM/SchaduwPrijs/AXProductIterator.cls.xml =================================================================== diff -u -r58234 -r62525 --- AXimpl/PM/SchaduwPrijs/AXProductIterator.cls.xml (.../AXProductIterator.cls.xml) (revision 58234) +++ AXimpl/PM/SchaduwPrijs/AXProductIterator.cls.xml (.../AXProductIterator.cls.xml) (revision 62525) @@ -36,30 +36,33 @@ 1 ''" - _" where sl.Dataareaid='vhbe' " - _" and case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN 'KIND' WHEN 0 THEN 'BESLAG' ELSE 'MW' END <> 'BESLAG'" - + _" join InventTable " + _" on InventTable.ITEMID = sl.ITEMID and InventTable.DataAreaId = sl.DataAreaId and inventtable.PARTITION = sl.PARTITION " + _" join INVENTDIM dim " + _" on dim.DATAAREAID = sl.DATAAREAID and dim.INVENTDIMID = sl.INVENTDIMID and dim.Partition=sl.PARTITION " + _" join INVENTDIM dimbase " + _" on dimbase.DATAAREAID = dim.DATAAREAID and dimbase.Partition=dim.PARTITION " + _" and dim.ConfigID =dimbase.configid and dimbase.WMSLOCATIONID='' and dimbase.inventlocationid ='' and dimbase.inventsiteid='' " + _" and dimbase.inventbatchid=''" + _" join INVENTDIMCOMBINATION as Idc " + _" on Idc.DATAAREAID= sl.DATAAREAID and Idc.ITEMID=sl.ITEMID and Idc.INVENTDIMID=DimBase.INVENTDIMID and idc.PARTITION = sl.PARTITION " + _" join ECORESPRODUCT ResProduct " + _" on idc.DISTINCTPRODUCTVARIANT= ResProduct.RecID and ResProduct.PARTITION = sl.PARTITION " + _" join ECORESPRODUCT ResProductMaster " + _" on ResProductMaster.RecID= ResProduct.ProductMaster and ResProduct.PARTITION = sl.PARTITION " + _" left outer join ADUEcoResAttributeCombination as Kenmerk " + _" on dim.ConfigId=Kenmerk.ConfigId and sl.ITEMID=Kenmerk.ITEMID and dim.ConfigId<>'' and kenmerk.Partition=sl.Partition " + _" where sl.Dataareaid='vhbe' and sl.Partition='5637144576' " + _" and ResProductMaster.ADUCALCTECHNOLOGYBOMBOL in (2,3)" + _" and sl.CREATEDDATETIME >= '"_$zd(VanafDatum,3)_"'" Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement) ]]> Index: Prod/Product.cls.xml =================================================================== diff -u -r60676 -r62525 --- Prod/Product.cls.xml (.../Product.cls.xml) (revision 60676) +++ Prod/Product.cls.xml (.../Product.cls.xml) (revision 62525) @@ -479,27 +479,6 @@ 0 - -%String -1 - Set {*}=$Translate( $Piece( $Get(^KPR({Id},"I1")) ,"\",1), " ", "") -1 - - - -%String -1 - Set {*}=$Translate( $Piece( $Get(^KPR({Id},"I1")) ,"\",2), " ", "") -1 - - - -%String -1 - Set {*}=$Translate( $Piece( $Get(^KPR({Id},"I1")) ,"\",3), " ", "") -1 - - Format: String: 25 @@ -934,26 +913,30 @@ Set vCtrlNr="" ;Input onthouden voor foutmeldigen + New OrigDossier Set OrigDossier=Dossier ;Eventueel reeds geplaatste (foutieve of correcte) punten weghalen Set Dossier=$TR(Dossier,".","") - ;Controlecijfer ophalen (laatste karakter) - Set CtrlNr = $Extract(Dossier,*) + ;Controlecijfer ophalen + New Loop,tmpChar,CtrlNr + Set CtrlNr = $Extract(Dossier,$Length(Dossier),$Length(Dossier)+1) Quit:(CtrlNr="") "" Write "Controlecijfer: "_CtrlNr,! ;Controlecijfer van dossier strippen - Set Rest = $Extract(Dossier,1,*-1) + New Rest + Set Rest = $Extract(Dossier,1,$Length(Dossier)-1) Quit:(Rest="") "" ;Controledigit checken Quit:($$CHKDIGIT^HAD(Rest)'=CtrlNr) "" ;Groep (Tandembox,banco,...) strippen (1e char) + New Groep,DossierNr Set Groep=$E(Rest,1) Set DossierNr=$E(Rest,2,99999) @@ -963,7 +946,7 @@ Write "ProdCode: "_DossierNr,! - //New DottedProdCode,PCLen + New DottedProdCode,PCLen Set PCLen=$L(DossierNr) If PCLen<4 Do . Set DottedProdCode=DossierNr @@ -993,7 +976,7 @@ ProdNr:%Library.String %Library.String @@ -1062,7 +1045,7 @@ %Library.String @@ -1118,18 +1101,17 @@ Geeft $LB(DossierNr) terug. [later uitbreidbaar tot meerdere parameters] -1 %List Flow.Had.OrderHfd). ]]> -1 %String MONTAGE" && (..VerpakCode'="V1") + { + set ..TransferTo="MAT>PROBOX" + } ]]> Index: AXimpl/Admin/MAG/NietLeverenOorzaak/Processor.cls.xml =================================================================== diff -u --- AXimpl/Admin/MAG/NietLeverenOorzaak/Processor.cls.xml (revision 0) +++ AXimpl/Admin/MAG/NietLeverenOorzaak/Processor.cls.xml (revision 62525) @@ -0,0 +1,168 @@ + + + +Prod.Product,BL.Derde.KlantSpecifiek +TECH.RegisteredObject + + +%TimeStamp +1 + + + +AXimpl.Admin.MAG.NietLeverenOorzaak.AxOrderLijnIterator +1 + + + +AX.Uitgaand.EC.DataAX.impl.Translator + + + + +d ##class(AXimpl.Admin.MAG.NietLeverenOorzaak.Processor).%New().Process() +1 +1 +%Status +1 + + + + + + + + +:DeleteVanaf) +]]> + + + + + + + + + + + +KLNr:%String,Node:%String,ORDNr:%String + + + + +KLNr:%String,Node:%String,ORDNr:%String,OLNr:%String + + + + +KLNr:%String,Node:%String,ORDNr:%String,OLNr:%String,Rede:%String,Opmerking:%String + + + + +NLO:Register + + + + +AXInventTransId:%String +0 +]]> + + + + + Index: APPS/Halux/Component/impl/ConvertAll.cls.xml =================================================================== diff -u -r57552 -r62525 --- APPS/Halux/Component/impl/ConvertAll.cls.xml (.../ConvertAll.cls.xml) (revision 57552) +++ APPS/Halux/Component/impl/ConvertAll.cls.xml (.../ConvertAll.cls.xml) (revision 62525) @@ -54,6 +54,11 @@ AX.Uitgaand.EC.DataAX.impl.Translator + +%String +1 + + D ##class(APPS.Halux.Component.impl.ConvertAll).%New().ExportHistoriek() @@ -62,7 +67,7 @@ - + PRNr:%String,VolgNr:%Integer + + + +PRNr:%String,FabKey:%String + persistent +Prod.Product 0 VHOpslag %Library.Persistent @@ -50,6 +51,27 @@ + +%Integer + + + + + + +Standaard leveringstermijn in dagen +%Integer + + + + + + +Als een product bestaat uit een paar (bv. LI product en RE product), dan staat hier de verwijzing naar dat paar +%String + + + Datum wanneer de laatste keer de gegevens veranderd zijn. @@ -177,7 +199,7 @@ De klassificatie die BLUM gebruikt voor groepering en rangschikking van de producten. -%Integer +%String 0 0 @@ -370,6 +392,15 @@ + +1 +PRNr + + + %CacheSQLStorage ^Blum.ProductS @@ -383,6 +414,10 @@ {IdentNummer} + +"\" +32 + "\" 18 @@ -423,10 +458,18 @@ "\" 1 + +"\" +10 + "\" 5 + +"\" +31 + "\" 8 Index: PV.mac.rou =================================================================== diff -u -r54530 -r62525 --- PV.mac.rou (.../PV.mac.rou) (revision 54530) +++ PV.mac.rou (.../PV.mac.rou) (revision 62525) @@ -7,10 +7,155 @@ w $$$PRGet($$$NONAktief) w $P(^KPR(PRNr,1),"\",25) w $$KLANTPR^KPRIJS(4810,PRNr) +BackFlush + Set Device=$$OPEN^vhDEV(,"BackFlush.txt","W","T") + Use Device + Write "ToeNr KPRNr KIdentNr KKorttekst HLX MPRNr MIdentNr MKorttekst Familie Datum Tijd Aantal Kost",! + Set %J=$$%J^vhRtn1() + Kill ^HULP(%J) + Set PRNr="" + Set Cnt=0 + Set Vanaf=$$CALCDATE^vhLib.DataTypes($H,"A",-2) + Set Tot=$$CALCDATE^vhLib.DataTypes($H,"A",-0) + s PRNr=0 ;431818-1 + For Set PRNr=$O(^PRHIST(PRNr)) Quit:PRNr="" Do ;Quit:Cnt>1 + . Quit:'$d(^KPR(PRNr)) + . Set KeyHist="" + . For Set KeyHist=$O(^PRHIST(PRNr,KeyHist)) Quit:KeyHist="" Do + . . Set Rec=^PRHIST(PRNr,KeyHist) + . . Set Datum=+$P(Rec,"\") + . . Quit:DatumTot + . . Set MPRNr=$P(Rec,"\",15) + . . Quit:'MPRNr + . . Quit:$P(Rec,"\",2)>0 + . . Quit:$P(Rec,"\",4)'="H" + . . Quit:$P(Rec,"\",5)'="W" + . . Set Familie=$P($$GENTYP^HAD(MPRNr),"\") + + . . Write $P(Rec,"\",7),*9,PRNr,*9,$$$ProductGet(PRNr,$$$IdentNummer),*9,$$$ProductGet(PRNr,$$$KortTekst),*9,$S($E($$$ProductGet(PRNr,$$$LinkType),1,2)="HH":"hlx",1:"vhbe") + . . Write *9,MPRNr,*9,$$$ProductGet(MPRNr,$$$IdentNummer),*9,$$$ProductGet(MPRNr,$$$KortTekst),*9,Familie + . . Write *9,$$$ExcelDat(Datum),*9,$$$ExcelTime($P($P(Rec,"\"),",",2)),*9,$$$ExcelNum($P(Rec,"\",2)),*9,$$$ExcelNum($P(Rec,"\",2)*$$CifPPL^KPRIJS(PRNr)) + . . Write ! + . Set Cnt=Cnt+1 + Do CLOSE^vhDEV(Device) + Quit + +MWNacalcHist(Familie) + + Set %J=$$%J^vhRtn1() + Kill ^HULP(%J) + Set PRNr="" + Set Cnt=0 + Set Vanaf=$$CALCDATE^vhLib.DataTypes($H,"M",-12,"FD") + Set Tot=$$CALCDATE^vhLib.DataTypes($H,"M",-1,"LD") + ;s PRNr=1856745-1 + For Set PRNr=$O(^PRHIST(PRNr)) Quit:PRNr="" Do ;Quit:Cnt>1 + . Quit:'$d(^KPR(PRNr)) + . Quit:$$$PRGet($$$LeveranciersNr)'=$$$LevHalux + . Quit:$P($$GENTYP^HAD(PRNr),"\")'=Familie + . Set KeyHist="" + . For Set KeyHist=$O(^PRHIST(PRNr,KeyHist)) Quit:KeyHist="" Do + . . Set Rec=^PRHIST(PRNr,KeyHist) + . . Set Datum=+$P(Rec,"\") + . . Quit:DatumTot + . . ;Quit:$P(Rec,"\",5)'=Magazijn + . . Quit:$P(Rec,"\",4)'="I" + . . Do AddBS(PRNr,Datum,$P(Rec,"\",2),0,0) + . . Set Cnt=Cnt+1 + ;zw ^HULP(%J) + Do NacalcExport(Familie) + Quit +MWNacalcStat + Set Familie="LBX" + Set %J=$$%J^vhRtn1() + Kill ^HULP(%J) + Set PRNr="" + Set Cnt=0 + For Set PRNr=$O(^KSTPR(PRNr)) Quit:PRNr="" Do ;Quit:Cnt>1000 + . Quit:'$d(^KPR(PRNr)) + . Quit:$$$PRGet($$$LeveranciersNr)'=$$$LevHalux + . Quit:$P($$GENTYP^HAD(PRNr),"\")'=Familie + . Set Maand="" + . Set Maand="2018.02 " + . For Set Maand=$O(^KSTPR(PRNr,0,Maand)) Quit:Maand="" Do + . . Set IntMaand=$$INTDATE^vhLib.DataTypes(Maand,"DM4") + . . Set Aantal=$P(^KSTPR(PRNr,0,Maand),"\") + . . Set Omzet=$P(^KSTPR(PRNr,0,Maand),"\",3) + . . Set Marge=$P(^KSTPR(PRNr,0,Maand),"\",4) + . . Do AddBS(PRNr,IntMaand,Aantal,Omzet,Marge) + . . Set Cnt=Cnt+1 + Do NacalcExport(Familie) + Quit + +NacalcExport(Familie) + Set Device=$$OPEN^vhDEV(,"COGS"_Familie_".txt","W","T") + Use Device + + Write "Grp PRNr Korttekst Maand Datum Aantal Omzet Marge TotKost ExtraKost" + Set KostPl="" + For Set KostPl=$O(^HULP(%J,"KPL",KostPl)) Quit:KostPl="" Do + . Write *9,KostPl," tijd",*9,KostPl," kost" + Write *9,"TotKost+Extra",! + Set Key="" + For Set Key=$O(^HULP(%J,"D",Key)) Quit:Key="" Do + . Set lb=^HULP(%J,"D",Key) + . Set PRNr=$LI(lb,1),IntMaand=$LI(lb,2),Aantal=$LI(lb,3),Omzet=$LI(lb,4),Marge=$LI(lb,5),TotKost=$LI(lb,6),ExtraKost=$LI(lb,7) + . Set Factor=1+$S(TotKost>1:(ExtraKost/TotKost),1:0) + . Set Maand=$$CALCDATE^vhLib.DataTypes(IntMaand,"M","FD") + . Write $P($$GENTYP^HAD(PRNr),"\"),*9,PRNr,*9,$$$PRGet($$$KortTekst),*9,$$$ExcelDat(Maand),*9,$$$ExcelDat(IntMaand),*9,Aantal,*9,$$$ExcelNum(Omzet),*9,$$$ExcelNum(Marge),*9,$$$ExcelNum(TotKost),*9,$$$ExcelNum(ExtraKost) + . Set KostPl="" + . Set SumKost=0 + . For Set KostPl=$O(^HULP(%J,"KPL",KostPl)) Quit:KostPl="" Do + . . Set Tijd=$LG($G(^HULP(%J,"D",Key,KostPl)),1) + . . Set Kost=$LG($G(^HULP(%J,"D",Key,KostPl)),2) + . . Write *9,$$$ExcelNum(Tijd*Factor),*9,$$$ExcelNum(Kost*Factor) + . . Set SumKost=SumKost+(Kost*Factor) + . Write *9,$$$ExcelNum(SumKost),! + Do CLOSE^vhDEV(Device) + Quit + + +AddBS(PRNr,Datum,Aantal,Omzet,Marge) + New Key + Set Key=$Increment(^HULP(%J,"D")) + Set (Component,Vulling,Rest)=0 + Kill ^HULP(%J,"C") + Kill ^HULP(%J,"V") + Merge ^HULP(%J,"C")=^PRBS("BS",PRNr) + Do CALCC^PRBS(.Som,1,1) + ;zw ^HULP(%J) + Set BSKey="" + Set TotKost="" + Set ExtraKost="" + For Set BSKey=$o(^HULP(%J,"C",BSKey)) Quit:BSKey="" Do + . Set BSRec=^HULP(%J,"C",BSKey) + . Set BSKost=$G(^HULP(%J,"V",BSKey)) + . Set:$P(BSRec,"\",17)="Rechtzetting kostprijs BJ2018" ExtraKost=$P(BSKost,"\",1)*Aantal + . Set:$P(BSRec,"\",13)="Rechtzetting kostprijs BJ2018" ExtraKost=$P(BSKost,"\",1)*Aantal + . Quit:$P(BSRec,"\",3)'="T" + . Quit:$P(BSRec,"\",9)="" ; geen kostenplaatst + . Set KostPl=$P(BSRec,"\",9) + . Set Tijd=$P(BSRec,"\",8)*Aantal + . Set Kost=$P(BSKost,"\",1)*Aantal + . Set TotKost=TotKost+Kost + . Set lb=$G(^HULP(%J,"D",Key,KostPl)) + . Set $LI(lb,1)=$LG(lb,1)+Tijd + . Set $LI(lb,2)=$LG(lb,2)+Kost + . Set ^HULP(%J,"D",Key,KostPl)=lb + . Set:'$D(^HULP(%J,"KPL",KostPl)) ^HULP(%J,"KPL",KostPl)="" + + If $D(^HULP(%J,"D",Key))||1 Do + . Set ^HULP(%J,"D",Key)=$LB(PRNr,Datum,Aantal,Omzet,Marge,TotKost,ExtraKost) + q + +Batch2 + AXStat For MndCnt=-11:1:-1 Do @@ -26,10 +171,10 @@ Set PRNr="" For Set PRNr=$O(^KSTPR(PRNr)) Quit:PRNr="" Do . ;Quit:$P($$GENTYP^HAD(PRNr),"\")'="KAD" - .Quit:'$d(^KPR(PRNr)) + . Quit:'$d(^KPR(PRNr)) . Quit:$$$PRGet($$$LeveranciersNr)'=$$$LevHalux . Set Maand="" - . Set Maand="2018.06 " + . Set Maand="2017.06 " . For Set Maand=$O(^KSTPR(PRNr,0,Maand)) Quit:Maand="" Do . . Set Aantal=$P(^KSTPR(PRNr,0,Maand),"\") . . Set Omzet=$P(^KSTPR(PRNr,0,Maand),"\",3) Index: AX/Inkomend/PM/Schaduwprijzen/impl/Verwerken.cls.xml =================================================================== diff -u -r57431 -r62525 --- AX/Inkomend/PM/Schaduwprijzen/impl/Verwerken.cls.xml (.../Verwerken.cls.xml) (revision 57431) +++ AX/Inkomend/PM/Schaduwprijzen/impl/Verwerken.cls.xml (.../Verwerken.cls.xml) (revision 62525) @@ -35,7 +35,7 @@ -/ D ##class(AX.Inkomend.PM.Schaduwprijzen.impl.Verwerken).%New(0).Verwerk() +D ##class(AX.Inkomend.PM.Schaduwprijzen.impl.Verwerken).%New(0).Verwerk() Body - Index: AXimpl/PM/Kenmerk/AXProductIterator.cls.xml =================================================================== diff -u -r56898 -r62525 --- AXimpl/PM/Kenmerk/AXProductIterator.cls.xml (.../AXProductIterator.cls.xml) (revision 56898) +++ AXimpl/PM/Kenmerk/AXProductIterator.cls.xml (.../AXProductIterator.cls.xml) (revision 62525) @@ -38,30 +38,32 @@ ''" - _" where sl.Dataareaid='vhbe' " - _" and case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN 'KIND' WHEN 0 THEN 'BESLAG' ELSE 'MW' END ='MW'" + Set SqlStatement = "SELECT " + _" case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN sl.ITEMID WHEN 0 THEN sl.ITEMID ELSE ResProduct.DISPLAYPRODUCTNUMBER END as ProductID," + _" Kenmerk.RecID, " + _" sl.INVENTTRANSID as InventTransID, " + _" case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN 'KIND' WHEN 0 THEN 'BESLAG' ELSE 'MW' END as ProductType, " + _" Inventtable.VHProductGroup as Familie," + _" AdminProductNummer " + _" FROM SalesLine sl " + _" join InventTable " + _" on InventTable.ITEMID = sl.ITEMID and InventTable.DataAreaId = sl.DataAreaId and inventtable.PARTITION = sl.PARTITION " + _" join INVENTDIM dim " + _" on dim.DATAAREAID = sl.DATAAREAID and dim.INVENTDIMID = sl.INVENTDIMID and dim.Partition=sl.PARTITION " + _" join INVENTDIM dimbase " + _" on dimbase.DATAAREAID = dim.DATAAREAID and dimbase.Partition=dim.PARTITION " + _" and dim.ConfigID =dimbase.configid and dimbase.WMSLOCATIONID='' and dimbase.inventlocationid ='' and dimbase.inventsiteid='' " + _" and dimbase.inventbatchid=''" + _" join INVENTDIMCOMBINATION as Idc" + _" on Idc.DATAAREAID= sl.DATAAREAID and Idc.ITEMID=sl.ITEMID and Idc.INVENTDIMID=DimBase.INVENTDIMID and idc.PARTITION = sl.PARTITION " + _" join ECORESPRODUCT ResProduct" + _" on idc.DISTINCTPRODUCTVARIANT= ResProduct.RecID and ResProduct.PARTITION = sl.PARTITION " + _" join ECORESPRODUCT ResProductMaster" + _" on ResProductMaster.RecID= ResProduct.ProductMaster and ResProduct.PARTITION = sl.PARTITION " + _" left outer join ADUEcoResAttributeCombination as Kenmerk " + _" on dim.ConfigId=Kenmerk.ConfigId and sl.ITEMID=Kenmerk.ITEMID and dim.ConfigId<>'' and kenmerk.Partition=sl.Partition " + _" where sl.Dataareaid='vhbe' and sl.Partition='5637144576' " + _" and ResProductMaster.ADUCALCTECHNOLOGYBOMBOL = 2" If VanafDatum { Set SqlStatement=SqlStatement_" and sl.CREATEDDATETIME >= '"_$zd(VanafDatum,3)_"'" Index: BL/Derde/Agenda/GeoMobile.cls.xml =================================================================== diff -u -r41119 -r62525 --- BL/Derde/Agenda/GeoMobile.cls.xml (.../GeoMobile.cls.xml) (revision 41119) +++ BL/Derde/Agenda/GeoMobile.cls.xml (.../GeoMobile.cls.xml) (revision 62525) @@ -124,13 +124,13 @@ Set ^vhUSER("IGEO")="D ##class(BL.Derde.Agenda.GeoMobile).CreateLookup()" Kill ^Derde.Agenda.GeoMobileCfg("WIE") Merge ^Derde.Agenda.GeoMobileCfg("WIE")=WieIsWie - #dim GeoMobileLogPath As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("BL.Derde.Agenda.GeoMobile.LogPath") - Set Dev=$$OPEN^vhDEV(GeoMobileLogPath,"WIE IS WIE.txt","W") - Use Dev - Set Key="" - For Set Key=$O(WieIsWie(Key)) Quit:Key="" Do - . Write Key,?5,$J($P(WieIsWie(Key),"\"),4),?15,$P(WieIsWie(Key),"\",2),?50,$P(WieIsWie(Key),"\",3),! - Close:0'[Dev Dev + ;#dim GeoMobileLogPath As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("BL.Derde.Agenda.GeoMobile.LogPath") + ;Set Dev=$$OPEN^vhDEV(GeoMobileLogPath,"WIE IS WIE.txt","W") + ;Use Dev + ;Set Key="" + ;For Set Key=$O(WieIsWie(Key)) Quit:Key="" Do + ;. Write Key,?5,$J($P(WieIsWie(Key),"\"),4),?15,$P(WieIsWie(Key),"\",2),?50,$P(WieIsWie(Key),"\",3),! + ;Close:0'[Dev Dev ]]> Index: APPS/Halux/Planning/enu/Productgroep.cls.xml =================================================================== diff -u -r57446 -r62525 --- APPS/Halux/Planning/enu/Productgroep.cls.xml (.../Productgroep.cls.xml) (revision 57446) +++ APPS/Halux/Planning/enu/Productgroep.cls.xml (.../Productgroep.cls.xml) (revision 62525) @@ -6,7 +6,7 @@ %String -,TBX,LBX,TAX,DIV,MAT,KAD,ASM,VILT +,TBX,LBX,TAX,DIV,MAT,KAD,ASM,VILT,REST,SD,FRONTPLAAT,RELING,FRONT,CABLOX,HANGMAP,LBX FREE,AVENTOS,DWARSVERD,SERVODRIVE,DEKPLAAT,OMPAK Index: APPS/Halux/Planning/ResourcePitchingService.cls.xml =================================================================== diff -u -r58984 -r62525 --- APPS/Halux/Planning/ResourcePitchingService.cls.xml (.../ResourcePitchingService.cls.xml) (revision 58984) +++ APPS/Halux/Planning/ResourcePitchingService.cls.xml (.../ResourcePitchingService.cls.xml) (revision 62525) @@ -45,7 +45,7 @@ 1 Index: KPRIJSAX.mac.rou =================================================================== diff -u -r50904 -r62525 --- KPRIJSAX.mac.rou (.../KPRIJSAX.mac.rou) (revision 50904) +++ KPRIJSAX.mac.rou (.../KPRIJSAX.mac.rou) (revision 62525) @@ -8,7 +8,22 @@ #define CodexList "LRSBG" #define CodexDeelVork "0;25;50;75;100" #define CodexDeelVorkOL "0;27.27272727;45.45454545;72.72727272;100" +test + #dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New() + #dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijsViaConfig(4810, 89322, "000633233",1) + ;#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijsViaConfig(4810, 865733, "000630654",1) + #dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1) + ;D DumpObject^%apiOBJ(Result) + D DumpObject^%apiOBJ(ResultLine) + ;#dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijsViaConfig(4810, 865733, "000630654",1) + + q + + + + + KlantPrijsObject(KLNr,PRNr,NoSa,RefDat,Aantal,LevTerm,Optie) Quit $$KlantPrijsNaarKlantPrijsObject($$KlantPrijs(.KLNr,.PRNr,.NoSa,.RefDat,.Aantal,.LevTerm,.Optie)) Index: PRStockSan.mac.rou =================================================================== diff -u -r57304 -r62525 --- PRStockSan.mac.rou (.../PRStockSan.mac.rou) (revision 57304) +++ PRStockSan.mac.rou (.../PRStockSan.mac.rou) (revision 62525) @@ -2,27 +2,7 @@ #Include Prod.Product PRStockSan -EersteAankoopExport ; Stock lijst voor stock sanering - - Set Dev=0 - Set Dev=$$OPEN^vhDEV("\\qlik-prod.vanhoecke.be\d$\Qlik Sense Data Storage\2. Import\Productmgmt\","Product EersteAankoop Admin.txt","W","T") - Use Dev - Set PRNr=0 - Set Translator=##class(AX.Uitgaand.EC.DataAX.impl.Translator).%New() - Write $TR("ItemID;ProductID;KortTekst;PRNr;EersteAankoop",";",$C(9)),! - For Set PRNr=$O(^KPR(PRNr)) Quit:PRNr="" Do ;Quit:PRNr>200 - .Write Translator.GeefItemIDForAX(PRNr),*9 - .Write Translator.ZoekProductIDForAX(PRNr),*9 - .Write $$$PRGet($$$KortTekst),*9 - .Write PRNr, *9 - .Write $$$ExcelDat($$EersteAankoop(PRNr)) - .Write ! - Do CLOSE^vhDEV(Dev) - Quit -Geef - - STOCKSAN ; Stock lijst voor stock sanering Do BLDCONTR^Stat.Product.StockWaarde Set EindDat=$$CALCDATE^vhLib.DataTypes($H,"M",-1) @@ -39,7 +19,7 @@ Set Dev=$$OPEN^vhDEV(,"Stocksanering.txt","W","T") Use Dev Set PRNr=0 - Write $TR("IdentNr;KortTekst;HG;GR;SG;SortKey;LevNm;S/N;Kind6;GemWVK;GemFysSt;Rot;Telb;#Klant;JaarVkp;FysSt;TheoSt;PraktSt;WV;LevTrm;IsKS;ABC;CiffPPL;DB%;Vork%;GenType;ProductGroep;kind/moeder;mime;omzet;ppl;schaduwppl;grootvpk;kleinvpk;oms 1;oms 2;oms 3;LinkType;Uitverkoop",";",$C(9)),! + Write $TR("IdentNr;KortTekst;HG;GR;SG;SortKey;LevNm;S/N;Kind6;GemWVK;GemFysSt;Rot;Telb;#Klant;JaarVkp;FysSt;TheoSt;PraktSt;WV;LevTrm;IsKS;ABC;CiffPPL;DB%;Vork%;GenType;ProductGroep;kind/moeder;mime;omzet;ppl;schaduwppl;grootvpk;kleinvpk;oms 1;oms 2;oms 3;LinkType;Uitverkoop;EersteAankoop",";",$C(9)),! For Set PRNr=$O(^KPR(PRNr)) Quit:PRNr="" Do ;Quit:PRNr>2000 .Do FETCHPR^UTILI(PRNr,"Rec") .;If ($P(Rec(0),D,3)?4.7N)&&($P(Rec("J"),D,1)="6332")&&'$P(Rec(0),D,14) Quit ; geen afgeleide prod van HALUX en zonder stock @@ -92,10 +72,32 @@ .Write oProduct.Tekst.OmschrijvingN3,$C(9) .Write oProduct.LinkType,$C(9) .Write $$$ExcelDat(oProduct.Uitverkoop),$C(9) + .Write $$$ExcelDat($$EersteAankoop(PRNr)),$C(9) .Write ! Do CLOSE^vhDEV(Dev) Quit - + +EersteAankoopExport ; Qlik Eerste aankoopdatum van beslag en maatwerk (via component) + + Set Dev=0 + Set Dev=$$OPEN^vhDEV("\\qlik-prod.vanhoecke.be\d$\Qlik Sense Data Storage\2. Import\Productmgmt\","Product EersteAankoop Admin.txt","W","T") + Use Dev + Set PRNr=0 + Set VanafDatum=$$INTDATE^vhLib.DataTypes("01/01/2018") + Set Translator=##class(AX.Uitgaand.EC.DataAX.impl.Translator).%New() + Write $TR("ItemID;ProductID;KortTekst;PRNr;EersteAankoop",";",$C(9)),! + For Set PRNr=$O(^KPR(PRNr)) Quit:PRNr="" Do ;Quit:PRNr>200 + .Quit:'$D(^PRHIST(PRNr)) ; nooit verkocht + .Quit:+$P(^PRHIST(PRNr,$O(^PRHIST(PRNr,""),-1)),"\") + + +persistent +TECH.Persistent + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%String + + + +%Decimal + + + +%Date + + + +%TimeStamp + + + +%TimeStamp + + + +%TimeStamp + + + +%TimeStamp + + + +%String + + + +%String + + + +%Library.CacheStorage +^AXimpl.Admin.MAGBE06.RegisterD +RegisterDefaultData +^AXimpl.Admin.MAGBE06.RegisterD +^AXimpl.Admin.MAGBE06.RegisterI +^AXimpl.Admin.MAGBE06.RegisterS + + +%%CLASSNAME + + +AXInventTransID + + +AXItemID + + +AXConfigID + + +AXOrderID + + +ORDNr + + +KLNr + + +UniekOrderLijnNr + + +PRNr + + +CreatieTijdstip + + +Rede + + +Opmerking + + +VerzendDatumInitieelBevestigd + + +VerzendDatumBevestigd + + +Aantal + + +OntvangstDatumBevestigd + + +OntvangsDatumAdmin + + + + + + + Index: APPS/Halux/Component/impl/ConvertProductAbstract.cls.xml =================================================================== diff -u -r57547 -r62525 --- APPS/Halux/Component/impl/ConvertProductAbstract.cls.xml (.../ConvertProductAbstract.cls.xml) (revision 57547) +++ APPS/Halux/Component/impl/ConvertProductAbstract.cls.xml (.../ConvertProductAbstract.cls.xml) (revision 62525) @@ -172,13 +172,78 @@ Do ..VulAanCodes() Do ..VulAanBouwsteen() - - Do ..ComponentTransfer.Save() + Do ..PostProcessing() + Do:..IsGeldig() ..ComponentTransfer.Save() ;Write " ",Hoofdgroep, " ",Groep, " ",Selector,! ;Do DumpObject^%apiOBJ(..ResourceLijn) ]]> + +ONDERDELEN" + } + + If ..ComponentTransfer.TransferTo["ONDERDELEN" + { If (..VerpakCode="V1") + { + set ..ComponentTransfer.TransferTo=..ComponentTransfer.TransferTo_" V1" + } + else + { + set ..ComponentTransfer.TransferTo=..ComponentTransfer.TransferTo_" PROBOX" + } + } + + If (..ComponentTransfer.TransferTo["?NP") && ($E($$$ProductGet(..ComponentTransfer.KindProductGetObjectId(),$$$KortTekst),1,3)="HDP") + { + ; niet geldig + Set ..ComponentTransfer.TransferTo="" + } +]]> + + + + + + APPS.Halux.common.impl.BatchImpl + + +lijst van toeleveringen, 5 laatste cijfers +%String + + APPS.Halux.Planning.enu.Resourcegroep @@ -154,6 +160,9 @@ Gebruiker + +Toeleveringen + Index: APPS/Halux/Component/impl/ConvertASM.cls.xml =================================================================== diff -u -r57552 -r62525 --- APPS/Halux/Component/impl/ConvertASM.cls.xml (.../ConvertASM.cls.xml) (revision 57552) +++ APPS/Halux/Component/impl/ConvertASM.cls.xml (.../ConvertASM.cls.xml) (revision 62525) @@ -9,7 +9,16 @@ -OL ompak" + } + ELse + { + Set ..TransferTo="MAT>KLANT" + } ]]> Index: AX/Uitgaand/EC/KlantenAX/impl/ExportProductHistoriek.cls.xml =================================================================== diff -u -r50353 -r62525 --- AX/Uitgaand/EC/KlantenAX/impl/ExportProductHistoriek.cls.xml (.../ExportProductHistoriek.cls.xml) (revision 50353) +++ AX/Uitgaand/EC/KlantenAX/impl/ExportProductHistoriek.cls.xml (.../ExportProductHistoriek.cls.xml) (revision 62525) @@ -83,6 +83,7 @@ . . . . Set HistRec=^KKAAP(..KlantId,HoofdGroep,Groep,SubGroep,KortText) . . . . Set PRNr=$P(HistRec,"\",15) . . . . Quit:'..CheckProduct(PRNr) + . . . . Quit:$P(^KKAAP(..KlantId,HoofdGroep,Groep,SubGroep,KortText),"\",3)'>0 ; alleen producten die de klant gekocht en gehouden heeft . . . . Set Proxy=..BuildProxy(HistRec) . . . . Do ..Writer.Object(Proxy,"PakketRef") ]]> Index: PRHIST.mac.rou =================================================================== diff -u -r55344 -r62525 --- PRHIST.mac.rou (.../PRHIST.mac.rou) (revision 55344) +++ PRHIST.mac.rou (.../PRHIST.mac.rou) (revision 62525) @@ -29,7 +29,7 @@ If Magazijn="W" Set R=$G(^PRSTOCK("D",PRNr)),Stock=$P(R,D,5) Else Set R=^KPR(PRNr,0),Stock=$P(R,D,14) - Set Waarde=$J($P($$PRIJSGEG^KPRIJS(PRNr),D,6)*Aantal,0,2) ; omgezet van CIFPPLPR naar PRIJSGEG + Set Waarde=$J($$CifPPL^KPRIJS(PRNr)*Aantal,0,2) ; omgezet van CIFPPLPR naar PRIJSGEG If $E($G(Refer),1,2)="**" Set Refer="",Type="O" ;Optimalisatie If Type="M",+Aantal=0 Set Type="E" ; Bij manuele correctie wordt het type omgezet naar E = Telling zonder stockwijziging (meestal bij lege pallet) If Type="D",+Aantal=0 Set Type="Z" ; Bij manuele correctie en met AUTOCC flag wordt het type omgezet naar Z = Telling zonder stockwijziging (meestal bij lege pallet) @@ -276,7 +276,7 @@ .Set BONNr=$P(Rec,D,7) .Quit:'BONNr Quit:$D(^KU1(BONNr)) .If $ISVALIDNUM(BONNr,,200000,299999) Set Omschr=Omschr_" (DO)" - .Else Set FANr=$P(Rec,D,10) Set:'FANr Omschr=Omschr_" (STORNO)" + .Else Set FANr=$P(Rec,D,10) ;Set:'FANr Omschr=Omschr_" (STORNO)" Else If KLNr,$P(Rec,D,4)="I" Do .Quit:$$LEVNR^PRODUKT2(PRNr)=KLNr ; Leverancier van het produkt .If TOENr>199999,TOENr<300000 Quit @@ -430,3 +430,4 @@ ; + Index: KPRIJS.mac.rou =================================================================== diff -u -r55343 -r62525 --- KPRIJS.mac.rou (.../KPRIJS.mac.rou) (revision 55343) +++ KPRIJS.mac.rou (.../KPRIJS.mac.rou) (revision 62525) @@ -73,7 +73,7 @@ New Korting1,Korting2,CheckKAT,KlantGrOrde KLANTPR3 New R,KatProd,IsKatPr,FaMunt,Munt,MuntPar,VkpPr,KortNiv,AkpEUR,VkpEUR,LijstEUR,KlMunt,KlTyp,NetBrutP,PrijsKl,IsKsCust,IsLidVan,%LidVan,LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork - New BTWfactor,LijstPr1,VkpEURIncl,VkpPr1,VkpPrIncl,VkpEURAX,LijstEURAX,InclBTW,PriceUnit, CachePPL, CacheMinuten + New BTWfactor,LijstPr1,VkpEURIncl,VkpPr1,VkpPrIncl,VkpEURAX,LijstEURAX,InclBTW,PriceUnit,CachePPL ; Opgezet via GETCUST : KlMunt,KlTyp,NetBrutP,PrijsKl,IsKsCust,IsLidVan,%LidVan ; Opgezet via GETPROD : LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork New LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork,BusinessType,Klant,KlantID, CorFakt,KortRec @@ -90,6 +90,7 @@ Set KlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr) Set Klant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(KlantID) Set BusinessType = Klant.GeefBusinessType() + Do KKORTING, CALC If $$IsAX(KLNr,PRNr) { @@ -104,52 +105,58 @@ Set InclBTW=$LI(lb,5) } Else { Try { - New SalesPriceService, Result + New SalesPriceService, Result, ResultLine #dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New() - #dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, $S($G(SimPPL):SimPPL,1:""),.Aantal) + #dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, $select($Get(SimPPL):SimPPL, 1:""), .Aantal) + #dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1) - Set VkpEURAX = Result.Price - Set LijstEURAX = Result.GrossPrice - Set PriceUnit=+Result.PriceUnit - Set InclBTW=SalesPriceService.PrijzenInclBTW() + Set VkpEURAX = ResultLine.Price + Set LijstEURAX = ResultLine.GrossPrice + Set PriceUnit = +ResultLine.PriceUnit + Set InclBTW = Result.InclVAT + Set:$$MagInPrijsCache(PRNr) ^AXPrijsCache(KLNr,PRNr,+CachePPL,$S($G(Aantal):Aantal,1:"*"))=$LB($$GeefMinuten($H),VkpEURAX,LijstEURAX,PriceUnit,InclBTW) } Catch { New Exception Set (VkpEURAX,LijstEURAX)=99999 Set PriceUnit=1 - Set InclBTW=0 + Set InclBTW = $$$False + #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() - do ##class(vhLib.Logger).LogExceptie(Exception) + Do ##class(vhLib.Logger).LogExceptie(Exception) } } - If (VkpEURAX>0)&&(VkpEURAX'=99999) { + If (VkpEURAX>0)&&(VkpEURAX'=99999) + { Set VkpEUR=VkpEURAX Set LijstEUR=LijstEURAX - If (InclBTW) { + If InclBTW + { Set VkpEUR=+$J(VkpEUR/1.21,0,10) } Set VkpPr = VkpEUR Set LijstPr = LijstEUR - If (PriceUnit>1) { + If PriceUnit>1 + { Set VkpEUR=VkpEUR/PriceUnit Set LijstEUR=LijstEUR/PriceUnit } Set GrOrde=$Case(PriceUnit,100:"H",:"E") Set GrOrdNum=$Case(GrOrde,"H":100,:1) - - Set Korting2=0 - If +LijstEUR=0 { - Set Korting1=0 - } else { - Set Korting1=(1-(VkpEUR/LijstEUR))*100 + Set Korting2 = 0 + If (+LijstEUR = 0) { + Set Korting1 = 0 + } Else { + Set Korting1 = (1 - (VkpEUR / LijstEUR)) * 100 } - } else { + } Else { Do:(+VkpEUR>0)||(+VkpEURAX>0)&&'($P(^KPR(PRNr,1),"\",25)) ##class(vhLib.Logger).%New().Warning("Prijsberekening AX Fallback","Klant : '"_KLNr_"' Product : '"_PRNr_"' SimPPL : '"_$G(SimPPL)_"' -> Prijs : "_VkpEURAX_" -> fallback naar cache berekening '"_VkpEUR_"'") } } + Quit $$BUILD ; Build = VkpPr_D_Munt_D_GrOrde_D_LijstPr_D_Korting1_D_Korting2_D_$G(PrijsKl)_D_$G(KortNiv)_D_+$J(1/MuntPar,0,8)_D_GrOrde_1_D_GrOrdNum_D_1_D_AkpEUR_D_VkpEUR_D_LijstEUR @@ -194,16 +201,19 @@ PRODINCLBTW(PRNr,Land,KlMunt,Korting1,Korting2,NetBrutP,KlTyp,NoSa,SimPPL,KlantGrOrde,CheckKAT,BusinessType) New R + 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":$$$CKlantL,"R":$$$CKlantR,"S":$$$CKlantS,"B":$$$CKlantB,"G":$$$CKlantG,"P":$$$CKlantP,"C":$$$CKlantCExcl) + New KLNr - Quit:'$D(^KK1(KLNr)) "" - Quit $$KLANTPR(KLNr,PRNr) + Set KLNr=$Case(Codex,"L":$$$CKlantL,"R":$$$CKlantR,"S":$$$CKlantS,"B":$$$CKlantB,"G":$$$CKlantG,"P":$$$CKlantP,"C":$$$CKlantCExcl) + + Quit:'$Data(^KK1(KLNr)) "" + Quit $$KLANTPR(KLNr,PRNr) + PROD(PRNr,Korting1,Korting2,KlMunt,NetBrutP,KlTyp,NoSa,SimPPL,KlantGrOrde,CheckKAT,BusinessType) ; KlTyp 0=Industrie, 1=handel, P=prijslijst @@ -214,8 +224,6 @@ New BTWfactor,LijstPr1,VkpEURIncl,VkpPr1,VkpPrIncl If $$$CheckAXFase&&($G(Korting1)'="")&&("CPLRSBG"[Korting1) Quit $$ProdViaCodex(PRNr,Korting1) - - ; Opgezet via GETPROD : LEVNr,KatPrHan,KatPrInd,KatPrKs,GrOrde,GrOrdNum,PrMunt,CifPPL,LijstPr,Vork,%Vork Set:$Get(BusinessType)="" BusinessType = ##class(DOM.VKP.enu.BusinessType).B2B() @@ -305,51 +313,55 @@ Quit R GeefLijstPrijsInAX(PRNr,SimCifPPL,AdminLijstPr) - New Result,CachePPL,VkpEURAX, VkpEUR,LijstEURAX,PriceUnit,IncBTW,KLNr - #Dim Result as AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC + New CachePPL,VkpEURAX, VkpEUR,LijstEURAX,PriceUnit,IncBTW,KLNr + Quit:$$ProdViaAdmin(PRNr) AdminLijstPr Set KLNr=$$$CKlantL Set CachePPL=$S($G(SimPPL):SimPPL,1:$$CifPPL(PRNr)) Set CacheMinuten = $ListGet($Get(^AXPrijsCache(KLNr,PRNr,+CachePPL,"*")),1) + If (($$GeefMinuten($Horolog)-600) < CacheMinuten) { Set lb=^AXPrijsCache(KLNr,PRNr,+CachePPL,"*") Set VkpEURAX=$LI(lb,2) Set PriceUnit=$LI(lb,4) Set InclBTW=$LI(lb,5) } Else { Try { - New SalesPriceService, Result + New SalesPriceService, Result, ResultLine #dim SalesPriceService As AXimpl.Admin.VKP.SalesPriceService = ##class(AXimpl.Admin.VKP.SalesPriceService).%New() - #dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, $S($G(SimPPL):SimPPL,1:""),.Aantal) + #dim Result As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceHeaderOutputDC = SalesPriceService.GeefPrijs(KLNr, PRNr, $select($get(SimPPL):SimPPL,1:""),.Aantal) + #dim ResultLine As AXif.Dynamics.SalesPriceIn.MessageParts.ADUSalesPriceLineOutputDC = Result.Lines.GetAt(1) - Set VkpEURAX = Result.Price - Set LijstEURAX = Result.GrossPrice - Set PriceUnit=+Result.PriceUnit - Set InclBTW=SalesPriceService.PrijzenInclBTW() + Set VkpEURAX = ResultLine.Price + Set LijstEURAX = ResultLine.GrossPrice + Set PriceUnit = +ResultLine.PriceUnit + Set InclBTW = Result.InclVAT + Set:$$MagInPrijsCache(PRNr) ^AXPrijsCache(KLNr,PRNr,+CachePPL,"*")=$LB($$GeefMinuten($H),VkpEURAX,LijstEURAX,PriceUnit,InclBTW,"LP") } Catch { - New Exception - Set (VkpEURAX)=99999 Set PriceUnit=1 - Set InclBTW=0 + Set InclBTW = $$$False + #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() - do ##class(vhLib.Logger).LogExceptie(Exception) + Do ##class(vhLib.Logger).LogExceptie(Exception) } } - If (VkpEURAX>0)&&(VkpEURAX'=99999) { + If (VkpEURAX>0)&&(VkpEURAX'=99999) + { Set VkpEUR=VkpEURAX - If (InclBTW) { + If InclBTW + { Set VkpEUR=+$J(VkpEUR/1.21,0,10) } - If (PriceUnit>1) { + If PriceUnit>1 + { Set VkpEUR=VkpEUR/PriceUnit } - - } else { + } Else { Set VkpEUR=AdminLijstPr do:(+VkpEUR>0)||(+VkpEURAX>0)&&'($P(^KPR(PRNr,1),"\",25)) ##class(vhLib.Logger).%New().Warning("Prijsberekening AX Fallback","LIJSTPRIJS Klant : '"_KLNr_"' Product : '"_PRNr_"' SimPPL : '"_$G(SimPPL)_"' -> Prijs : "_VkpEURAX_" -> fallback naar cache berekening '"_$G(AdminLijstPr)_"'") } @@ -405,9 +417,14 @@ GetProdBasis Set:$G(NoSa)="" NoSa="N" Set:($G(D)="") D = "\" - Set R=^KPR(PRNr,1),KatPrHan=$P(R,D,18),KatPrInd=$P(R,D,19) - Set R=^KPR(PRNr,2),KatPrKs=$P(R,D,24) - Set R="",J=$O(^KPR(PRNr,"J")) Set:$E(J)="J" R=^KPR(PRNr,J) + Set R = ^KPR(PRNr,1) + Set KatPrHan = $Piece(R, D, 18) + Set KatPrInd = $Piece(R, D, 19) + Set R = ^KPR(PRNr, 2) + Set KatPrKs = $Piece(R, D, 24) + Set R = "" + Set J = $Order(^KPR(PRNr, "J")) + Set:$E(J)="J" R=^KPR(PRNr,J) Set LEVNr=$P(R,D),PrMunt=$P(R,D,17) Set EenhAank=$P(R,D,28),EenhAank=$S("E"[EenhAank:1,EenhAank="H":100,EenhAank="M":1000,1:0) Set PPL=$P(R,D,19),%Korting=$P(R,D,9),%Vork=$P(R,D,27),%DB=$P(R,D,24),%Cif=$P(R,D,21) @@ -426,7 +443,9 @@ Set PPL=PPL/EenhAank If FaMunt'[PrMunt S R=$$MUNT^vhRtn1(PrMunt,,11,NoSa),PPL=PPL*R Set CifPPL=PPL*(100-%Korting)/100*(100+%Cif)/100,CifPPL=$J(CifPPL,1,4) Set:'CifPPL %DB=0 - Set R=CifPPL/(100-%DB/100)*%DB/100,R=$J(R,1,4),LijstPr=CifPPL+R + Set R = CifPPL / (100 - %DB / 100) * %DB / 100 + Set R = $Justify(R,1,4) + Set LijstPr = CifPPL + R Set Vork=CifPPL+R*%Vork/100,Vork=$J(Vork,1,4) Set GrOrde=$$GRORDE^PRODUKT2(PRNr,NoSa) Set:GrOrde="" GrOrde="E" @@ -445,7 +464,7 @@ If $L($G(KlantGrOrde)) Do . Set GrOrde=KlantGrOrde . Set GrOrdNum=$S(GrOrde="M":1000,GrOrde="H":100,1:1) - + If (BusinessType = ##class(DOM.VKP.enu.BusinessType).B2B()) { Set LijstPr=LijstPr*GrOrdNum If NetBrutP Do ; Bruto @@ -458,18 +477,18 @@ Set AkpEUR=+$J(CifPPL,0,4) Set LijstEUR=+$J(LijstPr/GrOrdNum/MuntPar,0,4) Set VkpEUR=+$J(VkpPr/GrOrdNum/MuntPar,0,4) - If $G(%LidVan) S VkpEUR=+$J(VkpEUR*(100-%LidVan/100),0,4) ; De verkoopprijs wordt verlaagd met de commissie vergoeding van de aankoopgroep + If $G(%LidVan) S VkpEUR=+$J(VkpEUR*(100-%LidVan/100),0,4) ; De verkoopprijs wordt verlaagd met de commissie vergoeding van de aankoopgroep } Else { Set LijstEUR = +$J(LijstPr,0,4) // Lijstprijs excl BTW in euro, per eenheid Set LijstPr1=LijstPr*GrOrdNum Set BTWfactor = $$GETBTWFACTOR("BE", PRNr) Set VkpPr1=LijstPr1*(100-Korting1/100)*(100-Korting2/100) // Verkoopprijs excl BTW in euro - Set VkpEURIncl=$$B2CROUND(VkpPr1*BTWfactor) // Verkoopprijs incl BTW in euro + Set VkpEURIncl=$$B2CROUND(VkpPr1*BTWfactor) // Verkoopprijs incl BTW in euro Set VkpEUR=+$J(VkpEURIncl/BTWfactor/GrOrdNum,0,4) // Verkoopprijs excl BTW via terugrekenen van de inclusiefprijs, in euro, per eenheid Set VkpPrIncl=$J(VkpEURIncl*MuntPar,0,2) // Verkoopprijs incl BTW in de gevraagde munt Set VkpPr=VkpPrIncl/BTWfactor // Verkoopprijs excl BTW via terugrekenen van de inclusiefprijs, in de gevraagde munt // Niet afgerond voor maximale precisie bij opnieuw bijtellen an de BTW - Set LijstPr=$J($$ROUND(LijstPr1)*MuntPar,0,2) // Lijstprijs excl BTW volgens bestaande afronding, in de gevraagde munt + Set LijstPr=$J($$ROUND(LijstPr1)*MuntPar,0,2) // Lijstprijs excl BTW volgens bestaande afronding, in de gevraagde munt Set AkpEUR=+$J(CifPPL,0,4) // Aankoopprijs in euro excl BTW, per eenheid Set VkpEURIncl=+$J(VkpEURIncl/GrOrdNum,0,4) // Verkoopprijs incl BTW in euro, per eenheid } @@ -643,3 +662,4 @@ . Set J=$O(^KPR(PRNr,"J")),R=^(J),PPL=$P(R,D,19) . Set:+PPL=+SchaduwPPL SchaduwPPL="" Quit SchaduwPPL + Index: AXimpl/Admin/MAG/NietLeverenOorzaak/AxOrderLijnIterator.cls.xml =================================================================== diff -u --- AXimpl/Admin/MAG/NietLeverenOorzaak/AxOrderLijnIterator.cls.xml (revision 0) +++ AXimpl/Admin/MAG/NietLeverenOorzaak/AxOrderLijnIterator.cls.xml (revision 62525) @@ -0,0 +1,92 @@ + + + +TECH.RegisteredObject,TECH.Iterator + + +AXimpl.Controle.Order.Ax.AxOrderLijnConverter +1 + + + +TECH.ResultSet +1 + + + +AXimpl.SqlQueryConnection +1 + + + +%TimeStamp + + + +RefTimeStamp:%TimeStamp,SqlQueryConnection:AXimpl.SqlQueryConnection +1 +1 +%Status +1 + + + + +1 += 0 " + _" and salesLine.DATAAREAID = 'VHBE' and salesline.PARTITION = '5637144576' " + _" and salesline.REMAINSALESPHYSICAL - isnull(( select -sum(qty) from inventtrans where INVENTTRANSORIGIN.RECID = inventtrans.INVENTTRANSORIGIN and INVENTTRANS.STATUSISSUE = 3 and " + _" inventtrans.STATUSRECEIPT = 0 and inventtrans.DATAAREAID = INVENTTRANSORIGIN.DATAAREAID and inventtrans.PARTITION = INVENTTRANSORIGIN.PARTITION),0) > 0 " + _" and salesline.shippingdateconfirmed>'1900-01-01' and salesline.shippingdateconfirmed<'"_..RefTimeStamp_"'" + + Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement) +]]> + + + +%Boolean + 0) +]]> + + + +AXimpl.Controle.Order.OrderLijn + + + + +1 +1 +%Status +1 + + + + + + Index: AX/Inkomend/PM/Schaduwprijzen/impl/AXIterator.cls.xml =================================================================== diff -u -r52217 -r62525 --- AX/Inkomend/PM/Schaduwprijzen/impl/AXIterator.cls.xml (.../AXIterator.cls.xml) (revision 52217) +++ AX/Inkomend/PM/Schaduwprijzen/impl/AXIterator.cls.xml (.../AXIterator.cls.xml) (revision 62525) @@ -40,7 +40,8 @@ + +1 +'std') or (isnull(isActiveSopr,0)=0)" + _")" + _" " + _" select top 100 * from PrijzenJoined" + _" where VolgNr=1" + */ + Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement) +]]> + + %Boolean 0)