Index: KF0A.mac.rou
===================================================================
diff -u -r734 -r921
--- KF0A.mac.rou (.../KF0A.mac.rou) (revision 734)
+++ KF0A.mac.rou (.../KF0A.mac.rou) (revision 921)
@@ -30,7 +30,9 @@
I $L(K) Do G 29:ULT=""
.S:K?.N&($P(%EXT,"/",2)<%WK) $P(%EXT,"/")=$$EXTDATE^vhDTyp($$CALCDATE^vhDTyp(,"J","+1"),"J")
.S ULT=%EXT
- .Quit:UTYP="C" Quit:UTYP="A" Quit:$$DIFFDATE^vhDTyp(ULTTemp,%EXT,"DW")/7'>10
+ .Quit:UTYP="C" Quit:UTYP="A"
+ .If ##Class(DOM.CRM.impl.KlantVerlofPeriode).IsVerlofDag(KC,%INT) Set:'$$^vhTXTPOP("FLOW","KLVERLOF","",%EXT,$P(^KKL(^KK1(KC),0),D,2)) ULT="" Quit ; Verlof klant
+ .Quit:$$DIFFDATE^vhDTyp(ULTTemp,%EXT,"DW")/7'>10
.Quit:$$^vhTXTPOP("FLOWORD","PLUS10WEKEN","",%EXT,$$DIFFDATE^vhDTyp(ULTTemp,%EXT,"DW")/7,ULTTemp) ; Ingegeven leverweek is meer dan 10 weken te ver
.Set ULT=""
31 I UTYP="C" D G 29:K="-",47:K="," I $L(K) S ULTE=K
@@ -170,6 +172,12 @@
Set $P(R,D,13)=LIJNNr-100,TLUNr=$$UNIEKLNR^FLOWTOE(LEVNr,TOENr),$P(R,D,15)=TLUNr
Set ^KTO(LEVNr,TOENr,LIJNNr)=R
Do SWNODE^FLOWTOE(LEVNr,TOENr,LIJNNr)
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TOENr)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
Set B(127)=TOENr,B(128)=LIJNNr
Quit KLevWeek
;
Index: Default_pra.prj.xml
===================================================================
diff -u
--- Default_pra.prj.xml (revision 0)
+++ Default_pra.prj.xml (revision 921)
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
Index: Default__system.prj.xml
===================================================================
diff -u
--- Default__system.prj.xml (revision 0)
+++ Default__system.prj.xml (revision 921)
@@ -0,0 +1,292 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: KF0.mac.rou
===================================================================
diff -u -r734 -r921
--- KF0.mac.rou (.../KF0.mac.rou) (revision 734)
+++ KF0.mac.rou (.../KF0.mac.rou) (revision 921)
@@ -63,7 +63,7 @@
.X R
.S PR=K S:K=PROld!'K K="-"
S R=$P(^KPR(PR,0),D,23)
- I R="K" S R=$P(^KPR(PR,0),D),R=$$^vhTXTPOP("FLOWORD","VERKKIND","",R) G YZ:'R
+ I R="K",KC'=$$$KlantHalux S R=$P(^KPR(PR,0),D),R=$$^vhTXTPOP("FLOWORD","VERKKIND","",R) G YZ:'R
I $E(R)="H",KC'=$$$KlantHalux S R=$P(^KPR(PR,0),D),R=$$^vhTXTPOP("FLOWORD","VERKHALFFABR","",R) G YZ:'R
I '$L($G(EDIORDNr)) S R=##Class(CHUI.Derde.Kennis.Kennis).KlantProductUnRead(KC,PR,$LB($$$adOrderVerwerkingIngave),1,"ORD",ORDNr) G YZ:R="ANNULEER"
G 11:UTYP="C"!(UTYP="A")
Index: FaxMail2.mac.rou
===================================================================
diff -u -r734 -r921
--- FaxMail2.mac.rou (.../FaxMail2.mac.rou) (revision 734)
+++ FaxMail2.mac.rou (.../FaxMail2.mac.rou) (revision 921)
@@ -142,7 +142,12 @@
Merge Data=DefData ; De default data copieren
Merge DocNum=ORDNr,Data("DocNum")=ORDNr,OPData=Data
Set R=^KO1(ORDNr,"F"),KLNr=$P(R,D),R=^KOD(KLNr,"F",ORDNr,1),OrdRef=$P(R,D,3),(MailTav,Tav,DefFax)=$P($P(R,D,9),"#"),FaxNrOrEmail=$P(R,D,10)
- Set TextId=$G(TextId) Set:TextId="" TextId=$$TSELECT^DCFAX()
+ Set TextId=$G(TextId)
+ Do:TextId=""
+ . New IsConsument,VerzendWijze
+ . Set IsConsument=$P(^KKL(^KK1(KLNr),1),D,11)="Consument"
+ . Set VerzendWijze=$P($P($$DEFAULT^KLVERZW(,KLNr,ORDNr),"`"),";")
+ . Set TextId=$$TSELECT^DCFAX()
Do:$L(TextId)
. Do INIT^FaxMail("N"),FaxINIT^FaxMail(),KlINIT^FaxMail(KLNr,.Data)
. Set Taal=Data("Taal")
Index: FLOWHALUX.mac.rou
===================================================================
diff -u -r734 -r921
--- FLOWHALUX.mac.rou (.../FLOWHALUX.mac.rou) (revision 734)
+++ FLOWHALUX.mac.rou (.../FLOWHALUX.mac.rou) (revision 921)
@@ -190,6 +190,10 @@
. . Do KWNODE^FLOWTOE(LEVNr,TOENr,TLNr)
. . Set $P(ToeRec,D,25)=ProductieWeek,^KTO(LEVNr,TOENr,TLNr)=ToeRec
. . Do SWNODE^FLOWTOE(LEVNr,TOENr,TLNr)
+ . . Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TOENr)
+ . . Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ . . Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ . . Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
. Kill ProdKey,Modify
Do:$G(ViaToelevering) WL^PROC
Quit
Index: Default_JCL.prj.xml
===================================================================
diff -u
--- Default_JCL.prj.xml (revision 0)
+++ Default_JCL.prj.xml (revision 921)
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: EWORDS.mac.rou
===================================================================
diff -u -r734 -r921
--- EWORDS.mac.rou (.../EWORDS.mac.rou) (revision 734)
+++ EWORDS.mac.rou (.../EWORDS.mac.rou) (revision 921)
@@ -471,7 +471,7 @@
.Set:Ok Ok=$$CHKMUNT(%J,KLNr,$G(NoAsk))
.;Do:Ok VERZABX^EWORDS4(%J,KLNr,0) ; blijkbaar niet meer nodig om controle op gewicht uit te voeren.
.;If Ok,'$G(NoAsk) Do AnderTransport^EWORDS5(%J)
- .If Ok Do AnderTransport^EWORDS5(%J,KLNr) ; altijd uitvoeren niet afhankelijk van NoAsk param
+ .If Ok,KLNr'=$$$KlantHalux Do AnderTransport^EWORDS5(%J,KLNr) ; altijd uitvoeren niet afhankelijk van NoAsk param, niet voor Halux.
.If Ok Set Ok=$G(NoAsk) Set:'Ok Ok=$$^vhTXTPOP("EWORDS","SAVE")
.Quit:'Ok
.Set CONSNr=$$GETNUM^FLOW("KUL","KU1") ; Tijdelijk
Index: FLOW3.mac.rou
===================================================================
diff -u -r734 -r921
--- FLOW3.mac.rou (.../FLOW3.mac.rou) (revision 734)
+++ FLOW3.mac.rou (.../FLOW3.mac.rou) (revision 921)
@@ -5,7 +5,7 @@
; Berekenen van de leverdag
; lbExtraBtns $LB($LB(Key,Omschrijving))
GetLeverDag(KLNr,PRNr,VroegsteLevering,BackGround,lbSelected,Titel,lbExtraBtns,ValDate,NoOther)
- New zb,VroegstePick,lbDatums,LeverDatum,LeverDatums,Huidig
+ New zb,VroegstePick,lbDatums,LeverDatum,LeverDatums,Huidig,ORef,domVerlof,Verlof
Set (VroegsteLevering,Huidig)=$G(VroegsteLevering),lbExtraBtns=$G(lbExtraBtns),ValDate=$G(ValDate,$H)
Set:VroegsteLevering<$H VroegsteLevering=$H
If $G(PRNr) Do
@@ -14,8 +14,11 @@
Set lbDatums=blLeveringsTermijn.GetLeverDatums(VroegsteLevering,3)
If $G(BackGround) Set LeverDatum=$LI(lbDatums)
Else Do
+ . Set ORef=##Class(Derde.Klant.Klant).%OpenId(KLNr)
+ . Set domVerlof=##Class(DOM.CRM.impl.KlantVerlofPeriode).%New(ORef)
+ . Do domVerlof.Fetch(.Verlof)
. Set lbSelected=$G(lbSelected)
- . Do MergeDatums(lbDatums,lbSelected,.LeverDatums,.lbExtraBtns,Huidig,.NoOther)
+ . Do MergeDatums(lbDatums,lbSelected,.LeverDatums,.lbExtraBtns,Huidig,.NoOther,.Verlof)
. Set Titel=$G(Titel,$$SHOW^KLVERZW(,,,blVerzendWijze.VerzendWijze))
. Set CallBack("S")="F`CBSelect^FLOW3"
. Set LeverDatum=$$WILD^vhPOPUP("C;C","-1O",Titel,.LeverDatums,VroegsteLevering,.CallBack)
@@ -30,6 +33,7 @@
. . . If '%TC Set LeverDatum=VroegsteLevering Quit
. . . Do:LeverDatum
. . . . If '$$ISARBDAG^vhRtn2(%INT),'$$^vhTXTPOP("FLOW","NOARBDAG","",%EXT) Set LeverDatum=VroegsteLevering,%TC=0
+ . . . . Else If ##Class(DOM.CRM.impl.KlantVerlofPeriode).IsVerlofDag(KLNr,%INT),'$$^vhTXTPOP("FLOW","KLVERLOF","",%EXT,$P(^KKL(^KK1(KLNr),0),D,2)) Set LeverDatum=VroegsteLevering,%TC=0
. . . . Else Set LeverDatum=%INT
Quit LeverDatum
@@ -46,7 +50,7 @@
Quit $$GetLeverDag(KLNr,.PRNr,.DefLeverDag,.BackGround,lbSelected)
; Alle leverdatums in een tabel gieten
-MergeDatums(lbDatums,lbSelected,LeverDatums,lbExtraBtns,Huidig,NoOther)
+MergeDatums(lbDatums,lbSelected,LeverDatums,lbExtraBtns,Huidig,NoOther,Verlof)
New I,R,Datum,Datums,Selected,Status,Count
Set lbExtraBtns=$G(lbExtraBtns)
For I=1:1:$LL(lbDatums) Set Datums($LI(lbDatums,I))=""
@@ -61,11 +65,19 @@
. If Datum=$G(Huidig) Set Selected(Datum)=""
. Else If '$D(Datums(Datum)),$O(Datums(Datum),-1)="" Set Selected(Datum)="I"
. Else Set Selected(Datum)="U"
+ For Count=1:1 Set R=$G(Verlof(Count)) Quit:R="" Do
+ . Set VerlofVan=$P(R,D,2),VerlofTot=$P(R,D,3)
+ . If $O(Datums(""))>VerlofTot Quit
+ . If $O(Datums(""),-1)$P(UD,D,2) Set UL=UL+1
.If Show Do NIEUWV^PROC3(TLLNr)
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TLNr)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
Quit
;
; Insert produkt
@@ -187,6 +193,12 @@
.Do REMOVE^vhLock("^KOD(KLNr,""F"",ORDNr)")
Do REMOVE^vhLock("^KPR(OPRNr)")
Do REMOVE^vhLock("^KPR(NPRNr)")
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TLNr)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
Quit
;
GWNODE(LEVNr,TLNr,TLLNr)
Index: DCORD.mac.rou
===================================================================
diff -u -r734 -r921
--- DCORD.mac.rou (.../DCORD.mac.rou) (revision 734)
+++ DCORD.mac.rou (.../DCORD.mac.rou) (revision 921)
@@ -259,7 +259,7 @@
VOORWPROXY(KLNr,ORDNr,Cache,Taal) ; Cache als .local doorgeven --> wordt opgevuld met teksten
#define KLRec(%i) ^KKL(KLID,%i)
New KLID,Rec,R,i,Land,FactKLNr
- New LeverVw,BetVw,PctKontKrt,TKontKrt,Rembours,VoorBet
+ New LeverVw,BetVw,PctKontKrt,TKontKrt,Rembours,VoorBet,IsConsument
Set KLID=^KK1(KLNr)
Set:($G(Taal)="") Taal=$P(^KKL(KLID,0),"\",9) Set:(Taal="") Taal="N"
Set Land=$$LAND^vhRtn1($P(^KKL(KLID,0),"\",8))
@@ -277,6 +277,7 @@
Set R=$$BETVW^KLANT(BetVw,PctKontKrt,TKontKrt,Rembours,VoorBet,Taal)
For i=1:1:$L(R,"#") Set Cache("BETALINGSVOORWAARDE",i)=$P(R,"#",i)
; Memo
+ Set IsConsument=$P($$$KLRec(1),"\",11)="Consument"
Do MEMOPROXY^DCALG("O",Taal,.Cache)
Quit
;
Index: EWPAL.mac.rou
===================================================================
diff -u -r734 -r921
--- EWPAL.mac.rou (.../EWPAL.mac.rou) (revision 734)
+++ EWPAL.mac.rou (.../EWPAL.mac.rou) (revision 921)
@@ -20,11 +20,8 @@
. Write !,$P($G(^KPR(FromPRNr,0),$G(^KPRO(FromPRNr,0),"*ONBEKEND* "_FromPRNr)),D),"->",$P($G(^KPR(ToPRNr,0),$G(^KPRO(ToPRNr,0),"*ONBEKEND* "_ToPRNr)),D)
. Do
. . New (FromPRNr,ToPRNr,QU)
- . . // [??]
- . . zn "HALUX"
. . Set Result=##class(BL.MB.UGLYPicking.Opslag).ChangeProductInEWMS(FromPRNr,ToPRNr,QU)
. . Write !," ",$LG(Result,2),!
- . . zn "ADMIN1"
Read !,"Einde (Druk op ENTER)",K
Quit
Index: EWTOE.mac.rou
===================================================================
diff -u -r734 -r921
--- EWTOE.mac.rou (.../EWTOE.mac.rou) (revision 734)
+++ EWTOE.mac.rou (.../EWTOE.mac.rou) (revision 921)
@@ -166,7 +166,11 @@
Set ^KSPW(PRNr,LevTW,R)=AantWMS_D_$J(CifPPL*AantWMS,0,Decimals)_D_LevTB_D_LevTA_D_$E(LevTW,3,4)_"/"_$E(LevTW,5,6)_D_''ORDNr_D
Do REMOVE^vhLock("^KSPW(PRNr)"),COPY(TOENr,TLNr,Rec,AantWMS)
Do ##class(Flow.Toelevering).RecuPak(PRNr,AantWMS,TOENr,TLUNr,HistRef,.BLKLNr,.BLFactuurNr,.BLFactuurDatum)
- If 'AantBo Do KILL(TOENr,TLNr)
+ If 'AantBo Do
+ . Do KILL(TOENr,TLNr)
+ . Set ToeleveringDeletedEventData = ##class(TECH.Events.ToeleveringDeletedEventData).%New(TOENr)
+ . Set ToeleveringDeletedEvent = ##class(TECH.Events.ToeleveringDeletedEvent).%New(ToeleveringDeletedEventData)
+ . Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringDeletedEvent)
If AantBo Do
.Set Rec=^KTO(LEVNr,TOENr,TLNr) Set:'$P(Rec,D,23) $P(Rec,D,23)=$P(Rec,D,3)
.Set $P(Rec,D,9)=$J(($P(Rec,D,9)/$P(Rec,D,3)*AantBo),0,2)
@@ -175,6 +179,10 @@
.Set $P(Rec,D,3)=AantBo,$P(Rec,D,15)=$P(Rec,D,15)+1
.Set ^KTO(LEVNr,TOENr,TLNr)=Rec
.Do SWNODE^FLOWTOE(LEVNr,TOENr,TLNr)
+ . Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TOENr)
+ . Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ . Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ . Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
.If ORDNr Do
..Quit:'$D(^KO1(ORDNr,"F"))
..Set KLNr=$P(^KO1(ORDNr,"F"),D)
@@ -501,7 +509,7 @@
While (rset.Next(.sc)){
Set QueueItem = ##class(DS.PPS.TBX.Queue).%OpenId(rset.Data("ID"))
Do QueueItem.ZetFinished()
- Set LadeGerecepteerdEventData = ##class(TECH.Events.LadeGerecepteerdEventData).%New(QueueItem.TOENr,QueueItem.TLUNr,QueueItem.Product.ProductNr,QueueItem.BatchID)
+ Set LadeGerecepteerdEventData = ##class(TECH.Events.LadeGerecepteerdEventData).%New(QueueItem.TOENr,QueueItem.TLUNr,QueueItem.Product.ProductNr,QueueItem.BatchID,QueueItem.Sequence)
Set LadeGerecepteerdEvent = ##class(TECH.Events.LadeGerecepteerdEvent).%New(LadeGerecepteerdEventData)
Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(LadeGerecepteerdEvent)
}
Index: EWBON4.mac.rou
===================================================================
diff -u -r734 -r921
--- EWBON4.mac.rou (.../EWBON4.mac.rou) (revision 734)
+++ EWBON4.mac.rou (.../EWBON4.mac.rou) (revision 921)
@@ -47,7 +47,7 @@
CALCGEW(MPRNr)
New R,PrGew,MGewicht,KGewicht,KPRNr,Aantal
Set (MGewicht,KGewicht)=0
- Set R=^KPR(MPRNr,1),PrGew=$P(R,D,13),MGewicht=MGewicht+(PrGew/1000)
+ Set R=$G(^KPR(MPRNr,1)),PrGew=$P(R,D,13),MGewicht=MGewicht+(PrGew/1000)
If $D(^PRLINK("D",MPRNr)) Do
.Set KPRNr=0
.For Set KPRNr=$O(^PRLINK("D",MPRNr,KPRNr)) Quit:KPRNr="" Do
Index: JBL_Product_AMF.prj.xml
===================================================================
diff -u
--- JBL_Product_AMF.prj.xml (revision 0)
+++ JBL_Product_AMF.prj.xml (revision 921)
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: DCTOE.mac.rou
===================================================================
diff -u -r734 -r921
--- DCTOE.mac.rou (.../DCTOE.mac.rou) (revision 734)
+++ DCTOE.mac.rou (.../DCTOE.mac.rou) (revision 921)
@@ -1,5 +1,6 @@
DCTOE ;AFDRUKKEN TOELEVERINGEN [ 01/17/2002 4:18 PM ]
#Include BL.Derde.Kennis
+ #include BL.Derde.LevSpecifiek
;
; Het afdrukken van een toelevering kan met volgende oproep
; --> Do PRINT^DCTOE(TOENr,,,,SelPrint)
@@ -19,7 +20,7 @@
;
PASTEB(R,AddBlank)
New NewPage
- Set NewPage="Do FOOTER^"_$ZN_","_$S(LEVNr=6332:"HTITEL",1:"TITEL")_"^"_$ZN_",HEADER^"_$ZN
+ Set NewPage="Do FOOTER^"_$ZN_","_$S(LEVNr=$$$LevHalux:"HTITEL",1:"TITEL")_"^"_$ZN_",HEADER^"_$ZN
Do PASTEB^DCALG(R,NewPage,$G(AddBlank))
Quit
;
@@ -63,8 +64,12 @@
Do PASTE(PCount,LCount,T,3,"","")
Set T=$$TXT("Aant")
Do PASTE(PCount,LCount,T,"",56,"")
- Set T=$S(LEVNr=6332:"",1:$$TXT("Prijs")_" "_ToeMunt)
- Do PASTE(PCount,LCount,T,"",69,"")
+ If LEVNr=$$$LevHalux Do
+ . Set T=$$TXT("BarCode")
+ . Do PASTE(PCount,LCount,T,60,"","")
+ Else Do
+ . Set T=$$TXT("Prijs")_" "_ToeMunt
+ . Do PASTE(PCount,LCount,T,"",69,"")
Set T=$$TXT("LevWk")
Do PASTE(PCount,LCount,T,"",77,"")
If $D(L("B","S")) Do CACHE(L("B","S"))
@@ -142,7 +147,7 @@
If LEVNr=6092!(LEVNr=6428) Do
.Set T=T_"/"_KLNr Set:LevAdr T=T_"."_$C(64+LevAdr)
.Set:$L(OrdRef) T=T_"/"_OrdRef
- ;If LEVNr=6332,$E(ToeRef,1,6)="KOMM. " Set T=T_"/"_$E(ToeRef,7,99)
+ ;If LEVNr=$$$LevHalux,$E(ToeRef,1,6)="KOMM. " Set T=T_"/"_$E(ToeRef,7,99)
Set T=$E(T,1,35)
Do PASTE(PCount,Blank-3,T,2,"","B")
Do VHPD^DCALG(PCount,.Blank,.VH)
@@ -211,7 +216,7 @@
;
; Afdruk afsluiting (laatste blad)
LFOOTER
- Do CACHE($S($LL(lbKenAnk):L("A","L"),LEVNr=6332:L("A","H"),1:L("A","L")))
+ Do CACHE($S($LL(lbKenAnk):L("A","L"),LEVNr=$$$LevHalux:L("A","H"),1:L("A","L")))
Quit
;
; Afdruk van de voorwaarden
@@ -271,8 +276,8 @@
;
; Afdruk van de kennisankers - via proxy objects
KENANKPROXY(LEVNr,TOENr,Cache) ; Cache als .local doorgeven --> wordt opgevuld met teksten
- New i,R,KLNr,lbKenAnk,KenAnk,KennisObject,Msg,Wrap,Lijn
- Do:LEVNr=6332 ; Enkel Halux
+ New i,R,KLNr,lbKenAnk,KenAnk,KennisObject,Msg,Wrap,Lijn,varErrStr
+ Do:LEVNr=$$$LevHalux ; Enkel Halux
. Set R=^KTO(LEVNr,TOENr,1),KLNr=$P(R,"\",8)
. Set lbKenAnk=##Class(BL.Derde.Kennis.Kennis).GetIDsToPopup(KLNr,.varErrStr,$LB($$$adWerkbon,$$$adpGetAll($$$adProductie)),,"PRINT",,,1)
. Quit:'$LL(lbKenAnk) ; Geen kennisankers
@@ -293,7 +298,7 @@
; Afdruk van de kennisankers
KENANK(lbKenAnk)
New I,R,KenAnk,Msg,Wrap,Lijn
- Do CACHE($S(LEVNr=6332:L("V","F"),1:L("V","B")))
+ Do CACHE($S(LEVNr=$$$LevHalux:L("V","F"),1:L("V","B")))
Set BCount=0
For I=$LL(lbKenAnk):-1:1 Do
. Set KenAnk=($LI(lbKenAnk,I))
@@ -323,7 +328,7 @@
; Opbouwen local C en afdrukken van de toelevering
PRINT(TOENr,Sessie,Init,MetFax,SelPrint)
New LEVNr,LevInd,Taal,ToelTyp
- New C,PCount,LCount,lbKenAnk,KLNr
+ New C,PCount,LCount,lbKenAnk,KLNr,varErrStr
If $$IsTBX1239EDI(TOENr) Do PRINT^DCTBX(TOENr,$G(Init),$G(SelPrint)) Quit
Set SelPrint=$G(SelPrint)
If 0'[SelPrint Do SELPRINT^DCPRINT(SelPrint) Quit:'$D(Print)
@@ -332,13 +337,13 @@
Set R=^KTO1(TOENr),LEVNr=$P(R,D)
If LEVNr=5005,$D(^BLBeri("Z",TOENr)) Set BLBeri=1
Set R=^KTO(LEVNr,TOENr,1),ToeMunt=$$MUNT^vhRtn1($P(R,D,18),1)
- Do:LEVNr=6332
+ Do:LEVNr=$$$LevHalux
.Set KLNr=$P(R,D,8)
.Set lbKenAnk=##Class(BL.Derde.Kennis.Kennis).GetIDsToPopup(KLNr,.varErrStr,$LB($$$adWerkbon,$$$adpGetAll($$$adProductie)),,"PRINT",,,1)
Set LevInd=^KL1(LEVNr),R=^KLE(LevInd,0),Taal=$P(R,D,9) If Taal="" Set Taal="N"
Do PRINT^LOG("TO",TOENr,$S($G(MetFax):"F",1:"P"))
- Do @$S(LEVNr=6332:"HTITEL",1:"FTITEL"),HEADER,BODY,VOORW:LEVNr'=6332,KENANK(lbKenAnk):$LL(lbKenAnk),LFOOTER,PPRINT
- Do:LEVNr=6332 PrintToelevering^HADTBXPrep(TOENr,Print("DEV"))
+ Do @$S(LEVNr=$$$LevHalux:"HTITEL",1:"FTITEL"),HEADER,BODY,VOORW:LEVNr'=$$$LevHalux,KENANK(lbKenAnk):$LL(lbKenAnk),LFOOTER,PPRINT
+ Do:LEVNr=$$$LevHalux PrintToelevering^HADTBXPrep(TOENr,Print("DEV"))
Set:$G(MetFax) Data("Pages")=$G(Data("Pages"))+PCount
If 0'[SelPrint Do CLOSE^vhPRINTER Kill ^KTOB(TOENr)
Quit
@@ -347,7 +352,7 @@
IsTBX1239EDI(TOENr)
New R,Ok,LEVNr,KLNr,ORDNr,TLNr,PRNr
Set Ok=0,R=^KTO1(TOENr),LEVNr=$P(R,D)
- Do:LEVNr=6332
+ Do:LEVNr=$$$LevHalux
. Set R=^KTO(LEVNr,TOENr,1),ORDNr=$P(R,D,7),KLNr=$P(R,D,8)
. Quit:KLNr'=1239 Quit:'ORDNr
. Set R=$G(^KOD(KLNr,"F",ORDNr,1))
@@ -382,6 +387,7 @@
TArt ;Artikel\Article\Artikel\Article
TAant ;Aantal\Quant.\Menge\Quant.
TPrijs ;Prijs\Prix\Preis\Price
+TBarCode ;Barcode\Barcode\Barcode\Barcode
TLevWk ;Week\Sem.\Woche\Week
TLevVw ;Leveringsvoorwaarde\Conditions de livraison\Lieferbedingung\Betalingsvoorwaarde
TBetVw ;Betalingsvoorwaarde\Conditions de paiement\Zahlungsbedingung\Betalingsvoorwaarde
Index: KFCOLA.mac.rou
===================================================================
diff -u -r734 -r921
--- KFCOLA.mac.rou (.../KFCOLA.mac.rou) (revision 734)
+++ KFCOLA.mac.rou (.../KFCOLA.mac.rou) (revision 921)
@@ -49,6 +49,10 @@
.S $P(X,D,25)=$$EXTDATE^vhDTyp($$INTDATE^vhDTyp(ULT,"DW")-7,"DW")
.S $P(X,D,28)=@("^"_Q_"OD(KC,US,UR,0)"),@("^"_Q_"TO(LC,TR,TUZS)")=X
.D SWNODE^FLOWTOE(LC,TR,TUZS)
+ .Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TR)
+ .Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ .Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ .Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
S X=@("^"_Q_UGL_"(KC,US,UR,1)"),UN=$J(UEP/AFE*UA,1,2)
S:KKN UEP=$P(U2,D,6),UN=$J(UEP*(100-PK1)/100*(100-PK2)/100*UA/AFE,1,2) S UBE=$J(UEP/AFE*UA,1,2),UK="" S:PK1 UK=$J(PK1,4,1) S:PK2 UK=UK_" "_$J(PK2,4,1)
S U2=$P(U2,D,1,2)_D_UA_D_$P(U2,D,4,8)_D_UN_D_UN_D_$P(U2,D,11,14)_D_D_UBE_D_$P(U2,D,17,24)_D_ULT_D_$P(U2,D,26,27)_D_TUZS_D_D_$P(U2,D,30,99)
Index: JBL_JavaAmf.prj.xml
===================================================================
diff -u
--- JBL_JavaAmf.prj.xml (revision 0)
+++ JBL_JavaAmf.prj.xml (revision 921)
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
Index: KFCOLCD.mac.rou
===================================================================
diff -u -r734 -r921
--- KFCOLCD.mac.rou (.../KFCOLCD.mac.rou) (revision 734)
+++ KFCOLCD.mac.rou (.../KFCOLCD.mac.rou) (revision 921)
@@ -85,6 +85,10 @@
..S $P(X,D,25)=$$EXTDATE^vhDTyp(ULTS-7,"DW")
..S $P(X,D,27)=URS,$P(X,D,28)=@("^"_Q_"OD(KC,US,URS,0)"),@("^"_Q_"TO(LC,TR,TUZS)")=X
..D SWNODE^FLOWTOE(LC,TR,TUZS)
+ ..Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TR)
+ ..Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ ..Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ ..Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
..S X=@("^"_Q_"TO(LC,TR,TUZS)"),Qty2=$P(X,D,3),TLUNr2=$P(X,D,15)
..Quit:'$$CHKALG^DEFAULTS(LC,"KFCOLC","MARKSPLT","HADOPV")
..D MARKSPLT^HADOPV(TR,TLUNr,QtyNew+Qty2,QtyNew,TR,TLUNr2,Qty2)
Index: KFCOLC.mac.rou
===================================================================
diff -u -r734 -r921
--- KFCOLC.mac.rou (.../KFCOLC.mac.rou) (revision 734)
+++ KFCOLC.mac.rou (.../KFCOLC.mac.rou) (revision 921)
@@ -81,6 +81,10 @@
..S $P(X,D,25)=$$EXTDATE^vhDTyp($$INTDATE^vhDTyp(ULTS,"DW")-7,"DW")
..S $P(X,D,27)=URS,$P(X,D,28)=@("^"_Q_"OD(KC,US,URS,0)"),@("^"_Q_"TO(LC,TR,TUZS)")=X
..D SWNODE^FLOWTOE(LC,TR,TUZS)
+ ..Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TR)
+ ..Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ ..Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ ..Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
..S X=@("^"_Q_"TO(LC,TR,TUZS)"),Qty2=$P(X,D,3),TLUNr2=$P(X,D,15)
..Quit:'$$CHKALG^DEFAULTS(LC,"KFCOLC","MARKSPLT","HADOPV")
..D MARKSPLT^HADOPV(TR,TLUNr,QtyNew+Qty2,QtyNew,TR,TLUNr2,Qty2)
Index: KFSO.mac.rou
===================================================================
diff -u -r734 -r921
--- KFSO.mac.rou (.../KFSO.mac.rou) (revision 734)
+++ KFSO.mac.rou (.../KFSO.mac.rou) (revision 921)
@@ -61,7 +61,8 @@
30 G 31:UUZ'=-1 S @("^"_Q_"TO($P(LEV,D),TR,0)")=UZ,$P(^(1),D,18)=UMC
S (@("^"_Q_"TO1(TR)"),@("^"_Q_"TOB(TR)"))=$P(LEV,D)_D,@("^"_Q_"TO2($P(LEV,D),TR)")=""
I $D(@("^"_Q_"TO(0,2)")) S TRLC=TR
-300 S:LEV=5005 ^BLBeri("Z",TR)=LEV_D L @("^"_Q_UGL_"(KC,US,UR)") G 15
+300 S:LEV=5005 ^BLBeri("Z",TR)=LEV_D L @("^"_Q_UGL_"(KC,US,UR)")
+ G 15
31 S Z=@("^"_Q_"HULP($J,LEV,VerpakkingsType,UUZ)") I $L($P(Z,D,2)) S $P(Z,D,13)=UZ-100
S:$P(Z,D,17)="KTO11" $P(Z,D,15)=$$UNIEKLNR^FLOWTOE($P(LEV,D),TR)
S @("^"_Q_"TO($P(LEV,D),TR,UZ)")=Z G 29:'$L($P(Z,D,2))
Index: KF2A.mac.rou
===================================================================
diff -u -r734 -r921
--- KF2A.mac.rou (.../KF2A.mac.rou) (revision 734)
+++ KF2A.mac.rou (.../KF2A.mac.rou) (revision 921)
@@ -89,6 +89,12 @@
D KWNODE^FLOWTOE(LC,TR,TUZ)
356 S X=@("^"_Q_"TO(LC,TR,TUZ)"),^(TUZ)=$P(X,D,1,2)_D_UA_D_$P(X,D,4,8)_D_($J($P(X,D,9)/$P(X,D,3)*UA,0,2))_D_($J($P(X,D,10)/$P(X,D,3)*UA,0,2))_D_$P(X,D,11,15)_D_($J($P(X,D,16)/$P(X,D,3)*UA,0,2))_D_$P(X,D,17,99)
D SWNODE^FLOWTOE(LC,TR,TUZ)
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TR)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
I $D(@("^"_Q_"TO(0,3)")) S TRLC=TR D @^(3)
36 G 362:'TR!(ULT=$P(U2,D,25)) S:'$D(LC) LC=$P(@("^"_Q_"TO1(TR)"),D,1)
360 I '$D(@("^"_Q_"TOK(LC,TR,TUZ)")) S X=$P(@("^"_Q_"TO(LC,TR,TUZ)"),D,25),@("^"_Q_"TOK(LC,TR,TUZ)")=X_D_X_D_0_D_UR_D_UVN_D
Index: KFAFRA.mac.rou
===================================================================
diff -u -r734 -r921
--- KFAFRA.mac.rou (.../KFAFRA.mac.rou) (revision 734)
+++ KFAFRA.mac.rou (.../KFAFRA.mac.rou) (revision 921)
@@ -53,6 +53,10 @@
.S $P(X,D,3)=UA,$P(X,D,25)=$$EXTDATE^vhDTyp($$INTDATE^vhDTyp(ULT,"DW")-7,"DW")
.S $P(X,D,28)=@("^"_Q_"OD(KC,US,UR,0)"),@("^"_Q_"TO(LC,TR,TUZS)")=X
.D SWNODE^FLOWTOE(LC,TR,TUZS)
+ .Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TR)
+ .Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ .Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ .Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
S X=@("^"_Q_UGL_"(KC,US,UR,1)"),UN=$J(UEP/AFE*UA,1,2)
S:KKN UEP=$P(U2,D,6),UN=$J(UEP*(100-PK1)/100*(100-PK2)/100*UA/AFE,1,2) S UBE=$J(UEP/AFE*UA,1,2),UK="" S:PK1 UK=$J(PK1,4,1) S:PK2 UK=UK_" "_$J(PK2,4,1)
S U2=$P(U2,D,1,2)_D_UA_D_$P(U2,D,4,8)_D_UN_D_UN_D_$P(U2,D,11,15)_D_UBE_D_$P(U2,D,17,24)_D_ULT_D_$P(U2,D,26,27)_D_TUZS_D_D_$P(U2,D,30,99)
Index: JBL_Web_OL_ZoekProductGroepInhoud.prj.xml
===================================================================
diff -u
--- JBL_Web_OL_ZoekProductGroepInhoud.prj.xml (revision 0)
+++ JBL_Web_OL_ZoekProductGroepInhoud.prj.xml (revision 921)
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: KFAFRCD.mac.rou
===================================================================
diff -u -r734 -r921
--- KFAFRCD.mac.rou (.../KFAFRCD.mac.rou) (revision 734)
+++ KFAFRCD.mac.rou (.../KFAFRCD.mac.rou) (revision 921)
@@ -68,6 +68,10 @@
..S $P(X,D,3)=UAS,$P(X,D,25)=$$EXTDATE^vhDTyp($$INTDATE^vhDTyp(ULTS,"DW")-7,"DW")
..S $P(X,D,27)=URS,$P(X,D,28)=@("^"_Q_"OD(KC,US,URS,0)"),@("^"_Q_"TO(LC,TR,TUZS)")=X
..D SWNODE^FLOWTOE(LC,TR,TUZS)
+ ..Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TR)
+ ..Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ ..Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ ..Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
.S X=@("^"_Q_UGL_"(KC,US,UR,1)"),UN=$J(UEP/AFE*UA,1,2)
.S:KKN UEP=$P(U2,D,6),UN=$J(UEP*(100-PK1)/100*(100-PK2)/100*UA/AFE,1,2) S UBE=$J(UEP/AFE*UA,1,2),UK="" S:PK1 UK=$J(PK1,4,1) S:PK2 UK=UK_" "_$J(PK2,4,1)
37 .S U2=$P(U2,D,1,2)_D_UA_D_$P(U2,D,4,8)_D_UN_D_UN_D_$P(U2,D,11,15)_D_UBE_D_$P(U2,D,17,99),^(UVN)=U2
Index: EWORDS5.mac.rou
===================================================================
diff -u -r734 -r921
--- EWORDS5.mac.rou (.../EWORDS5.mac.rou) (revision 734)
+++ EWORDS5.mac.rou (.../EWORDS5.mac.rou) (revision 921)
@@ -80,16 +80,7 @@
// checken of klant Schachermayer --> verzendwijze moet DI1 zijn
Quit:((KLNr=$$$KlantSchachermayerAU)||(KLNr=$$$KlantSchachermayerNL))&&(VerzW'="DI1")&&('$$^vhTXTPOP("SYSTEM","JANEEN","","!!! Opgelet verzendwijze niet "_"DI1"_" toch doorgaan"))
- If '$D(^HULP(%J,KLNr,"M")),VerzW'=$P($G(^HULP(%J,KLNr,"V")),D) Do
- . Do MODVERZW^EWORDS(VerzW) ; Verzendwijze wijzigen
- . ;New VroegsteLeverdagGeregistreerd,LaatstePicking
- .
- . ;Set VroegsteLeverdagGeregistreerd = $$VroegsteLeverdagGeregistreerd^FLOWORD4(ORDNr,KLNr)
- . ;Do SetVerzendDatum^EWORDS(KLNr,ORDNr,VroegsteLeverdagGeregistreerd) ; Verzenddatum wijzigen
- . ;Set LaatstePicking = blLeveringsTermijn.GetLaatstePickingsTijdstip(VroegsteLeverdagGeregistreerd)
- . ;Do SetDueOutTime^EWORDS(KLNr,ORDNr,LaatstePicking)
- . ;If '$L($G(Kriteria("O","DAG"))) Set Kriteria("O","DAG")=LaatstePicking
- . ;Do DISPLAY^vhScherm("EWORDSH",,,,"VERZWIJZE;GERAAPT;VERZZONE;VERZDATUM",1)
+ If '$D(^HULP(%J,KLNr,"M")),VerzW'=$P($G(^HULP(%J,KLNr,"V")),D) Do MODVERZW^EWORDS(VerzW)
If $$CUMORD^EWORDS3(.Ref) Do
. If 'Marked,$$CHKLINK(ORDNr) Set AskLink=$$ASKLINK(ORDNr) If AskLink'=ORDNr Do:AskLink'="A" SERIE("LINK",ORDNr,"L") Quit
@@ -518,6 +509,7 @@
; Zijn er andere transporten voor die klant op die dag
AnderTransport(%J,KLNr)
New %SC,zb,R,VerzW,VerzZ,Datum,CONSNr,CONSVerzW,DueOutTime,VerzWijzen,Klant,sFL,ExitLoop
+ Quit:KLNr=$$$KlantHalux
Set R=$G(^HULP(%J,KLNr,"V")) Set:R="" R=$G(^HULP(%J,"V","V"))
Set VerzW=$P($P(R,D),"`"),Datum=$P(R,D,2),(CONSNr,VerzWijzen)=""
If $G(LinkORDNr),$D(^HULP(%J,"LinkORDNr",LinkORDNr)) Do
Index: FLOWTOE6.mac.rou
===================================================================
diff -u -r734 -r921
--- FLOWTOE6.mac.rou (.../FLOWTOE6.mac.rou) (revision 734)
+++ FLOWTOE6.mac.rou (.../FLOWTOE6.mac.rou) (revision 921)
@@ -13,6 +13,12 @@
Set TLNr=^KTO(LEVNr,TOENr,0),^KTO(LEVNr,TOENr,0)=TLNr+1
Set $P(R,D,13)=TLNr-100,^KTO(LEVNr,TOENr,TLNr)=R,ORDNr=$P(R,D,27),(OLNr,ModOLNr)=$P(R,D,28)
Do SWNODE^FLOWTOE(LEVNr,TOENr,TLNr)
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TOENr)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
If ORDNr Do
.Set KLNr=$P(^KO1(ORDNr,"F"),D),R=^KOD(KLNr,"F",ORDNr,OLNr),Aantal=$P(R,D,3)
.For I=9,10,16 Set:Aantal $P(R,D,I)=$P(R,D,I)/Aantal Set $P(R,D,I)=$J($P(R,D,I)*BOQty,0,2)
@@ -50,7 +56,11 @@
.Do SWNODE^FLOWTOE(LEVNr,TOENr,TLNr)
Else Do
.Kill ^KTO(LEVNr,TOENr,TLNr)
- .Do CHKDEL^FLOWTOE(TOENr)
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TOENr)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+ If 'Aantal Do CHKDEL^FLOWTOE(TOENr)
Do:ORDNr MODOAANT(,ORDNr,OLNr,Aantal)
Quit
;
@@ -76,6 +86,12 @@
Set R=^KTO(LEVNr,TOENr,TLNr),$P(R,D,25)=LevWk,^KTO(LEVNr,TOENr,TLNr)=R
Set ORDNr=$P(R,D,27),OLNr=$P(R,D,28)
Do SWNODE^FLOWTOE(LEVNr,TOENr,TLNr)
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TOENr)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
If $L(ModOrd),ORDNr,OLNr Do
.Do:ModOrd
..Set KLNr=$P(^KO1(ORDNr,"F"),D)
Index: JBL_Optibox.prj.xml
===================================================================
diff -u
--- JBL_Optibox.prj.xml (revision 0)
+++ JBL_Optibox.prj.xml (revision 921)
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: EWORDS2.mac.rou
===================================================================
diff -u -r734 -r921
--- EWORDS2.mac.rou (.../EWORDS2.mac.rou) (revision 734)
+++ EWORDS2.mac.rou (.../EWORDS2.mac.rou) (revision 921)
@@ -60,7 +60,7 @@
BLDAOL(KLNr,CONSNr,ORDNr,OLUNr,Qty)
; Terugnames, zonder WMS en manueel krijgen onmiddellijk status afgewerkt.
- New OLNr,OLRec,PRNr,KPRNr,ZndSt
+ New OLNr,OLRec,PRNr,KPRNr,ZndSt,LinkPRNr
Set OLNr=^ORD("IU",ORDNr,OLUNr)
Set OLRec=^KOD(KLNr,"F",ORDNr,OLNr)
Set PRNr=$P(OLRec,D,2)
@@ -85,7 +85,7 @@
Quit
SingleKind(MPRNr) ; SOPR producten
- NEw BSKey,Cnt,BSRec
+ NEw BSKey,Cnt,BSRec,LinkPRNr
Set BSKey=""
Set Cnt=0
For Set BSKey=$O(^PRBS("BS",MPRNr,BSKey)) Quit:BSKey="" Do
@@ -112,7 +112,7 @@
BLDOL(KLNr,CONSNr,ORDNr,OLUNr,Qty,BOQty,BOLwk)
; Verwerken van een orderlijn met eventuele opslitsing in verschillende kindproducten
- New OLNr,OLRec,PRNr,KPRNr,ManOpsl,ManChk
+ New OLNr,OLRec,PRNr,KPRNr,ManOpsl,ManChk,LinkPRNr
Set OLNr=^ORD("IU",ORDNr,OLUNr) ; Misschien veranderd door BACKORD, daarom terug ophalen
Set OLRec=^KOD(KLNr,"F",ORDNr,OLNr)
Set PRNr=$P(OLRec,D,2)
Index: KBKAL2.mac.rou
===================================================================
diff -u -r734 -r921
--- KBKAL2.mac.rou (.../KBKAL2.mac.rou) (revision 734)
+++ KBKAL2.mac.rou (.../KBKAL2.mac.rou) (revision 921)
@@ -18,7 +18,7 @@
S1 S K=K($P(X,U,2)) I $L($P(X,U,3)) X "S K="_$P(X,U,3)
S1Z Q
;
-S2 S (K,R)=$$TRIMN^vhRtn1(K)
+S2 S (K,R)=$$TRIMIDENT^vhRtn1(K) ;[IDENT] CW
Q
;
S3 S (K,R)=$$UPTRIMAN^vhRtn1(K)
Index: FLOWTOER.mac.rou
===================================================================
diff -u -r734 -r921
--- FLOWTOER.mac.rou (.../FLOWTOER.mac.rou) (revision 734)
+++ FLOWTOER.mac.rou (.../FLOWTOER.mac.rou) (revision 921)
@@ -286,6 +286,12 @@
..Set Rec=^KTO(LEVNr,TOENr,TLLNr)
..New r Set r=$P(Rec,D,28),$P(r,";")=OLNr,$P(Rec,D,28)=r
..Set ^KTO(LEVNr,TOENr,TLLNr)=Rec
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TOENr)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
If ORDNr Do REMOVE^vhLock("^KOD(KLNr,""F"",ORDNr)")
Do REMOVE^vhLock("^KPR(PRNr)")
Quit
Index: INKORTBAAR.mac.rou
===================================================================
diff -u
--- INKORTBAAR.mac.rou (revision 0)
+++ INKORTBAAR.mac.rou (revision 921)
@@ -0,0 +1,33 @@
+#include %Prod.Product
+
+INKORTBAAR ;Produkt creatie voor zaagsnedes
+
+GENERATE(Ref,GenPRNr,Params,FromPRNr)
+ New %SC,%SelProd,sFL,IngekortPRNr,KLNr,LEVNr,Taal,KortTxt,PR,LT,InbouwBreedte,OLProductInTeKorten,Factory,Product
+ Set Ref=$G(Ref),(GenPRNr,PR)=$G(GenPRNr),Params=$G(Params),FromPRNr=$G(FromPRNr),InbouwBreedte=""
+ Set:Params="K" KLNr=Ref Set:Params="L" LEVNr=Ref,IsStock=1
+ If Params="",GenPRNr Do
+ . Set R=$O(^KPR(GenPRNr,"J"))
+ . Quit:$E(R)'="J"
+ . Set R=^KPR(GenPRNr,R),LEVNr=$P(R,D)
+ Set Taal=$G(KT)
+ Do NIEUW^vhScherm("INKORTBAAR",,,,,,3)
+ If %SC Do
+ . Set OLProductInTeKorten = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(FromPRNr)
+ . Set Factory = ##class(APPS.PM.Maatwerk.OLM.OrgaluxOpMaatFactory).%New()
+ . Set Product = Factory.GeefOrgaluxOpMaat(OLProductInTeKorten, InbouwBreedte)
+ . Set IngekortPRNr = Product.GeefPRNr()
+ Quit $G(IngekortPRNr)
+
+ ; Basisproduct selecteren
+FROMPRNR(FromPRNr)
+ New R,X,IsInkortbaar
+ If '$G(FromPRNr) Do
+ . Do STORE^vhTERMINA()
+ . For Set FromPRNr=$$SELECT^PRODUKT6("KL",837,,"Basisprodukt : ") Quit:'FromPRNr Do Quit:IsInkortbaar
+ . . Set IsInkortbaar=##Class(APPS.PM.OL.impl.OrgaluxProduct).IsInkortbaar(FromPRNr)
+ . . If 'IsInkortbaar Do WARN^vhTXTPOP("Product """_$P(^KPR(FromPRNr,0),D)_""" is niet inkortbaar!","")
+ . Do REFRESH^vhTERMINA()
+ Quit FromPRNr
+ ;
+
\ No newline at end of file
Index: FLOWTOE3.mac.rou
===================================================================
diff -u -r734 -r921
--- FLOWTOE3.mac.rou (.../FLOWTOE3.mac.rou) (revision 734)
+++ FLOWTOE3.mac.rou (.../FLOWTOE3.mac.rou) (revision 921)
@@ -107,6 +107,17 @@
Set ^KTO(LEVNr,ToToe,ToLijn)=R
Quit:'PRNr
Do SWNODE^FLOWTOE(LEVNr,ToToe,ToLijn)
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(FromToe)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(ToToe)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
If ORDNr,OLNr Do
.Set KLNr=$P(^KO1(ORDNr,"F"),D)
.For Do ADD^vhLock("^KOD(KLNr,""F"",ORDNr)") Quit:%TC Do LDISP^vhLock("^KOD(KLNr,""F"",ORDNr)","Order "_ORDNr)
@@ -232,6 +243,10 @@
If Extern,$O(^KTO(LEVNr,TLNr,100))="" Do
.Set ABNr=$P(^KTO(LEVNr,TLNr,1),D,10)
.Kill ^KTO1(TLNr),^KTOB(TLNr),^KTO2(LEVNr,TLNr),^KTO(LEVNr,TLNr),^BLBeri("Z",TLNr)
+ .// Genereren van een deleted event voor de toelevering, gebeurt wanneer het order wordt verwijderd
+ .Set ToeleveringDeletedEventData = ##class(TECH.Events.ToeleveringDeletedEventData).%New(TLNr)
+ .Set ToeleveringDeletedEvent = ##class(TECH.Events.ToeleveringDeletedEvent).%New(ToeleveringDeletedEventData)
+ .Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringDeletedEvent)
.Do KILLAB(LEVNr,TLNr,ABNr)
Do REMOVE^vhLock("^KTO(LEVNr,TLNr,TLLNr)")
Quit
Index: HADTBXPrep.mac.rou
===================================================================
diff -u -r734 -r921
--- HADTBXPrep.mac.rou (.../HADTBXPrep.mac.rou) (revision 734)
+++ HADTBXPrep.mac.rou (.../HADTBXPrep.mac.rou) (revision 921)
@@ -251,18 +251,17 @@
Set API = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
Set Tandembox = API.GeefProduct(MPRNr)
-
- If ($IsObject(Tandembox) && Tandembox.%Extends("DOM.PM.TBXProduct.TBXLade"))
+ If ($IsObject(Tandembox) && Tandembox.%Extends("DOM.PM.TBXProduct.TBXLade")) Do
. If '$D(PRBS("PRAKLI.001")) Do ; Er zijn geen separate afdekkappen, dus toevoegen
. . ;Toevoegen AFDEKKAP ZAA.xxx
. . If '$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",MPRNr,"NMAK")) Do ; Niet meeleveren afdekkap
- . . . If (Tandembox.GeefZijkantDesign() = ##class(DOM.PM.enu.TBXZijkantDesign).A())
+ . . . If (Tandembox.GeefZijkantDesign() = ##class(DOM.PM.enu.TBXZijkantDesign).A()) Do
. . . . Set Kleur=$LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",MPRNr,"KL")) ; Kleur lade
. . . . Set HPRNr=$CASE(Kleur,"SW":472015,"BZ":471997,"IN":472252,:478609)
. . . . Set BSRec=HPRNr_"\2\H" ; ZAA 532 en ZAA5329 (inox)
. . . . Set $P(BSRec,D,19)="LOS"
. . . . Set PRBS("PRAKLI.001")=BSRec
- . . . Else If (Tandembox.GeefZijkantDesign() = ##class(DOM.PM.enu.TBXZijkantDesign).F())
+ . . . Else If (Tandembox.GeefZijkantDesign() = ##class(DOM.PM.enu.TBXZijkantDesign).F()) Do
. . . . Set BSRec="74660\2\H" ; ZAA 330C
. . . . Set $P(BSRec,D,19)="LOS"
. . . . Set PRBS("PRAKLI.001")=BSRec
@@ -282,6 +281,7 @@
. . . Set BSRec="126100\2\H" ;T54.3300
. . . Set $P(BSRec,D,19)="LOS"
. . . Set PRBS("PRXPOSK.001")=BSRec
+
Quit
BuildPRBSCacheOld(MPRNr,PRBS) ;old PV 24/11/2009
@@ -355,22 +355,8 @@
bepaalHoeveelheid(TandemBox,BSKey,BouwsteenHoeveelheid)
Set Hoeveelheid = BouwsteenHoeveelheid
- If (BSKey["PRRL.")
+ If (BSKey["PRBXKG.")||(BSKey["PRBXKGSTRK.")
{
- If (TandemBox.GeefReling().GeefVerpakking() = ##class(DOM.PM.enu.Verpakking).V1())
- {
- Set Hoeveelheid = Hoeveelheid * 2
- }
- }
- ElseIf (BSKey["PRRLADAPT.")
- {
- If TandemBox.BevatTussenReling() && (TandemBox.GeefTussenReling().GeefVerpakking() = ##class(DOM.PM.enu.Verpakking).V1())
- {
- Set Hoeveelheid = Hoeveelheid * 2
- }
- }
- ElseIf (BSKey["PRBXKG.")||(BSKey["PRBXKGSTRK.")
- {
// Voor boxkapglas is de hoeveelheid te picken glazen altijd 2, onafhankelijk van wat in de bouwsteen staat
Set Hoeveelheid = 2
}
Index: KFAFRC.mac.rou
===================================================================
diff -u -r734 -r921
--- KFAFRC.mac.rou (.../KFAFRC.mac.rou) (revision 734)
+++ KFAFRC.mac.rou (.../KFAFRC.mac.rou) (revision 921)
@@ -65,6 +65,10 @@
..S $P(X,D,3)=UAS,$P(X,D,25)=$$EXTDATE^vhDTyp($$INTDATE^vhDTyp(ULTS,"DW")-7,"DW")
..S $P(X,D,27)=URS,$P(X,D,28)=@("^"_Q_"OD(KC,US,URS,0)"),@("^"_Q_"TO(LC,TR,TUZS)")=X
..D SWNODE^FLOWTOE(LC,TR,TUZS)
+ ..Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TR)
+ ..Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ ..Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ ..Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
.S X=@("^"_Q_UGL_"(KC,US,UR,1)"),UN=$J(UEP/AFE*UA,1,2)
.S:KKN UEP=$P(U2,D,6),UN=$J(UEP*(100-PK1)/100*(100-PK2)/100*UA/AFE,1,2) S UBE=$J(UEP/AFE*UA,1,2),UK="" S:PK1 UK=$J(PK1,4,1) S:PK2 UK=UK_" "_$J(PK2,4,1)
37 .S U2=$P(U2,D,1,2)_D_UA_D_$P(U2,D,4,8)_D_UN_D_UN_D_$P(U2,D,11,15)_D_UBE_D_$P(U2,D,17,99),^(UVN)=U2
Index: KF0AD.mac.rou
===================================================================
diff -u -r734 -r921
--- KF0AD.mac.rou (.../KF0AD.mac.rou) (revision 734)
+++ KF0AD.mac.rou (.../KF0AD.mac.rou) (revision 921)
@@ -33,6 +33,7 @@
I $L(K) Do I ULT="" S ULT=ULTTemp G 29
.S ULTTemp=ULT,ULT=%INT
.Quit:UTYP="C" Quit:UTYP="A"
+ .If ##Class(DOM.CRM.impl.KlantVerlofPeriode).IsVerlofDag(KC,%INT) Set:'$$^vhTXTPOP("FLOW","KLVERLOF","",%EXT,$P(^KKL(^KK1(KC),0),D,2)) ULT="" Quit ; Verlof klant
.Quit:$$DIFFDATE^vhDTyp($$EXTDATE^vhDTyp(DefLeverDag),%EXT,"DK")\7'>10
.Quit:$$^vhTXTPOP("FLOWORD","PLUS10WEKENPD","",%EXT,$J($$DIFFDATE^vhDTyp($$EXTDATE^vhDTyp(DefLeverDag),%EXT,"DK")\7+.5,0,0),$$EXTDATE^vhDTyp(DefLeverDag)) ; Ingegeven leverweek is meer dan 10 weken te ver
.Set ULT=""
@@ -175,6 +176,12 @@
Set $P(R,D,13)=LIJNNr-100,TLUNr=$$UNIEKLNR^FLOWTOE(LEVNr,TOENr),$P(R,D,15)=TLUNr
Set ^KTO(LEVNr,TOENr,LIJNNr)=R
Do SWNODE^FLOWTOE(LEVNr,TOENr,LIJNNr)
+
+ Set Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(TOENr)
+ Set ToeleveringModifiedEventData = ##class(TECH.Events.ToeleveringModifiedEventData).%New(Toelevering)
+ Set ToeleveringModifiedEvent = ##class(TECH.Events.ToeleveringModifiedEvent).%New(ToeleveringModifiedEventData)
+ Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(ToeleveringModifiedEvent)
+
Set B(127)=TOENr,B(128)=LIJNNr
Quit KLevWeek
;