Index: EWTOE.mac.rou
===================================================================
diff -u -r921 -r948
--- EWTOE.mac.rou	(.../EWTOE.mac.rou)	(revision 921)
+++ EWTOE.mac.rou	(.../EWTOE.mac.rou)	(revision 948)
@@ -40,9 +40,12 @@
  Else  Do
  .If LEVNr=6332 Do
  ..Set R=^KTO(LEVNr,TOENr,1),KLNr=$P(R,D,8),ORDNr=$P(R,D,7)
- ..Quit:'KLNr
- ..Quit:$$IsVoorVandaagOfMorgen^EWORDS6(ORDNr)'=1
+ ..Quit:'KLNr  Quit:'ORDNr
+ ..Set ^cw("EWTOE","TOENR",ORDNr)=KLNr
+ ..If $$GetPickDatum^EWORDS6(ORDNr)'<$H Quit:$$IsVoorVandaagOfMorgen^EWORDS6(ORDNr)'=1
+ ..Set ^cw("EWTOE","TOENR",ORDNr,"VVM")=""
  ..Quit:$$CheckAutoSend^EWORDS6(ORDNr)
+ ..Set ^cw("EWTOE","TOENR",ORDNr,"CAS")=""
  ..Set R=^KOD(KLNr,"F",ORDNr,1),BelDat=$P(R,D,36)
  ..Set:'BelDat BelDat=$$LEVERDATUM^KLVERZW($$DEFAULT^KLVERZW(,,ORDNr))
  ..Set Text(1)="Volgend order is klaar:~",Text(2)="~"_ORDNr_" - "_$P(^KKL(^KK1(KLNr),0),D,2)
@@ -51,6 +54,7 @@
  ..If $L(R) Set R=^RES("EWTOE","PI","HALUX","D",R,"N"),Text(4)="~~"_R
  ..Set Link(1)="KL\"_KLNr_"\R\O",Link(2)="ORD\"_ORDNr_"\R"
  ..Set MailId=$$SYSTEM^vhMAIL("","Order","Halux","HALORDOK",.Text,.Link,"U","A")
+ ..Set ^cw("EWTOE","TOENR",ORDNr,"MAIL")=MailId
  .Set TLUNr=""
  .For  Set TLUNr=$O(^RCP("D",RCPNr,"D",TOENr,TLUNr)) Quit:TLUNr=""  Do TLUNR(RCPNr,TOENr,TLUNr,,,NoAsk)
  .Do CHKDEL^FLOWTOE(TOENr)
@@ -166,11 +170,7 @@
  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
- . 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 KILL(TOENr,TLNr)
  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)
@@ -179,10 +179,6 @@
  .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)
@@ -488,14 +484,18 @@
  .....Do MARKTBXFINISHED(TOENr,TLUNr,Aantal,BOAantal)
  .....Do CHKDEL^FLOWTOE(TOENr)
  .....If $G(KLNr),ORDNr,LEVNr=6332,'$D(^KTO1(TOENr)) Do
- ......Quit:$$IsVoorVandaagOfMorgen^EWORDS6(ORDNr)'=1
+ ......Set ^cw("EWTOE","UPRCP",ORDNr)=KLNr
+ ......If $$GetPickDatum^EWORDS6(ORDNr)'<$H Quit:$$IsVoorVandaagOfMorgen^EWORDS6(ORDNr)'=1
+ ......Set ^cw("EWTOE","UPRCP",ORDNr,"VVM")=""
  ......Quit:$$CheckAutoSend^EWORDS6(ORDNr)
+ ......Set ^cw("EWTOE","UPRCP",ORDNr,"CAS")=""
  ......Set Text(1)="Volgend order is klaar:~",Text(2)="~"_ORDNr_" - "_$P(^KKL(^KK1(KLNr),0),D,2)
  ......Set R=^KOD(KLNr,"F",ORDNr,1),BelDat=$P(R,D,36)
  ......Set:'BelDat BelDat=$$LEVERDATUM^KLVERZW($$DEFAULT^KLVERZW(,,ORDNr))
  ......Set Text(3)="~VZW: "_$$SHOW^KLVERZW(,,ORDNr)_" - LEV.DATUM: "_$$EXTDATE^vhDTyp(BelDat)_" - Halux "_$$HALUXTYP^FLOWCHK("O",ORDNr)
  ......Set Link(1)="KL\"_KLNr_"\R\O",Link(2)="ORD\"_ORDNr_"\R"
  ......Set MailId=$$SYSTEM^vhMAIL("","Order","Halux","HALORDOK",.Text,.Link,"U","A")
+ ......Set ^cw("EWTOE","UPRCP",ORDNr,"MAIL")=MailId
  ....Else  Do ERROR^EWLOG($T(UPAANTNOK)) Xecute "Set C(""ERROR"")="_$P($T(UPAANTNOK),";",2,99)
  ...Else  Do ERROR^EWLOG($T(UPRODNOK)) Xecute "Set C(""ERROR"")="_$P($T(UPRODNOK),";",2,99)
  ..Else  Do ERROR^EWLOG($T(UPROD))