Index: FLOWHALUX.mac.rou =================================================================== diff -u -r65995 -r68994 --- FLOWHALUX.mac.rou (.../FLOWHALUX.mac.rou) (revision 65995) +++ FLOWHALUX.mac.rou (.../FLOWHALUX.mac.rou) (revision 68994) @@ -26,7 +26,8 @@ SetDueOutProductieTOELEV(TOENr,Forced) New LevNr,VroegsteDueOut Set LevNr=$P(^KTO1(TOENr),D) - Quit:LevNr'=$$$LevHalux + Set ToeleveringsService = ##class(DOM.AKP.impl.ToeleveringService).%New() + Quit:((LevNr'=$$$LevHalux) && '(LevNr=$$$LevVanHoecke && ToeleveringsService.BevatToeleveringRevegoProducten(TOENr))) Quit:'$G(Forced)&&($P(^KTO(LevNr,TOENr,1),D,19)) ; reeds ingevuld Set VroegsteDueOut=$$GetDueOutProductieTOELEV(LevNr,TOENr) Do PutDueOutProductieTOELEV(LevNr,TOENr,VroegsteDueOut) @@ -53,7 +54,8 @@ Set DateComparator = ##class(TECH.Comparator.DateComparator).%New() Set CurrentDate = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate() - Quit:LevNr'=$$$LevHalux "" + Set ToeleveringsService = ##class(DOM.AKP.impl.ToeleveringService).%New() + Quit:((LevNr'=$$$LevHalux) && '(LevNr=$$$LevVanHoecke && ToeleveringsService.BevatToeleveringRevegoProducten(TOENr))) "" Set VroegsteDueOut="" Set TLNr=100 For Set TLNr=$O(^KTO(LevNr,TOENr,TLNr)) Quit:TLNr="" Do