Index: EWORDSW.mac.rou =================================================================== diff -u -r71990 -r73186 --- EWORDSW.mac.rou (.../EWORDSW.mac.rou) (revision 71990) +++ EWORDSW.mac.rou (.../EWORDSW.mac.rou) (revision 73186) @@ -34,12 +34,49 @@ . Set ^ORDW("D",CONSNr)=Rec Set ^ORDW("D",CONSNr,"S","V") ="W" Quit - + +CLEARONEOBJT(CONSNr) + If $G(CONSNr)="" Do + .Read "CONSOLIDATIE NR : ",CONSNr + Quit:CONSNr'?6N + Quit:'$D(^ORDW("D",CONSNr)) + Set Rec=^ORDW("D",CONSNr) + ;if $P(Rec,D,20)'="W" Write "Status staat niet op 'W', niet doorgestuurd" + ;Quit:$P(Rec,D,20)'="W" + 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=^ORDW("D",CONSNr,"D",ORDNr,OLUNr) + . . ;Quit:$P(Rec,D,8)'="V" + . . Set SOLNr="" + . . For Set SOLNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SOLNr)) Quit:SOLNr="" Do + . . . Set Rec=^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SOLNr) + . . . Quit:$P(Rec,D,13)'="V" + . . . Set $P(Rec,D,2)="" + . . . Set $P(Rec,D,4)="" + . . . Set ^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SOLNr)=Rec + . . Set Rec=^ORDW("D",CONSNr,"D",ORDNr,OLUNr) + . . ;Set $P(Rec,D,2)="" + . . ;Set $P(Rec,D,3)="" + . . ;Set $P(Rec,D,5)="" + . . Set ^ORDW("D",CONSNr,"D",ORDNr,OLUNr)=Rec + . Set Rec=^ORDW("D",CONSNr) + . ;Set $P(Rec,D,20)="" + . ;Set $P(Rec,D,21)="" + . Set ^ORDW("D",CONSNr)=Rec + ;Kill ^ORDW("D",CONSNr,"S","V") + Do SEND(CONSNr) + Quit + CLEARONE(CONSNr) If $G(CONSNr)="" Do .Read "CONSOLIDATIE NR : ",CONSNr Quit:CONSNr'?6N Quit:'$D(^ORDW("D",CONSNr)) + Set Rec=^ORDW("D",CONSNr) + if $P(Rec,D,20)'="W" Write "Status staat niet op 'W', niet doorgestuurd" + Quit:$P(Rec,D,20)'="W" Set ORDNr="" For Set ORDNr=$O(^ORDW("D",CONSNr,"D",ORDNr)) Quit:ORDNr="" Do . Set OLUNr="" @@ -420,6 +457,7 @@ Kill C Set ORDRec=^KOD(KLNr,"F",ORDNr,1) Set ConsRec=^ORDW("D",CONSNr) + Do ##class(Tools.Wlip).%New(207).String($G(ConsRec)) Set C("CONSNR")=CONSNr Set C("KLNR")=KLNr Set KLId=^KK1(KLNr)