Index: FLOWORD6.mac.rou =================================================================== diff -u -r29059 -r33262 --- FLOWORD6.mac.rou (.../FLOWORD6.mac.rou) (revision 29059) +++ FLOWORD6.mac.rou (.../FLOWORD6.mac.rou) (revision 33262) @@ -15,8 +15,7 @@ Set $P(R,D,25)=LevWk Set $P(R,D,54)= "" /// 54. Receptietijdstip gekoppelde toeleveringslijn op leeg zetten Set OLUNr=$P(R,D,15) - Set OLUNr=OLUNr\10*10+9 - Set OLUNr=$O(^ORD("IU",ORDNr,OLUNr),-1)+1 + Set OLUNr=$$BerekenVolgendOLUNr(ORDNr,OLUNr) Set $P(R,D,15)=OLUNr Set:$L($P(R,D,35)) $P(R,D,35)=$$SPLITNR(KLNr,ORDNr,OLNr) Set OLNr=^KOD(KLNr,"F",ORDNr,0),^KOD(KLNr,"F",ORDNr,0)=OLNr+1 @@ -50,6 +49,12 @@ Do MODAANT(KLNr,ORDNr,ModOLNr,ModAant) Quit ; +BerekenVolgendOLUNr(ORDNr,OLUNr) + Set OLUNr=OLUNr\10*10+9 + Set OLUNr=$O(^ORD("IU",ORDNr,OLUNr),-1)+1 + ;If $D(^ORD("IU",ORDNr,OLUNr)) Do ThrowException + Quit OLUNr + ; MODAANT(KLNr,ORDNr,OLNr,Aantal,LevWk) New R,OldAant,TOENr,TLNr Set LevWk=$G(LevWk) Set:'$G(KLNr) KLNr=$P(^KO1(ORDNr,"F"),D)