Index: EWORDS2.mac.rou =================================================================== diff -u -r2992 -r3040 --- EWORDS2.mac.rou (.../EWORDS2.mac.rou) (revision 2992) +++ EWORDS2.mac.rou (.../EWORDS2.mac.rou) (revision 3040) @@ -41,7 +41,7 @@ ...Set AutoCons=AutoCons+1 Set:Qty<0 CredCnt=CredCnt+1 ..Else Do ; Doorgeven aan WMS ...Do BLDOL(KLNr,CONSNr,ORDNr,OLUNr,Qty,BOQty,BOLwk) - ..Do WachtendOpPicking(ORDNr,OLUNr,CONSNr) + ..Do:Qty'<0 WachtendOpPicking(ORDNr,OLUNr,CONSNr) .Lock -^KOD(KLNr,"F",ORDNr) Set $P(^ORDW("D",CONSNr),D,6)=$S(CredCnt=OLCnt:"C",CredCnt:"G",1:"F") Set $P(^ORDW("D",CONSNr),D,25)=$G(QU(1)) ; opslaan wie bon effectief heeft doorgestuurd Index: EWORDST.mac.rou =================================================================== diff -u -r2992 -r3040 --- EWORDST.mac.rou (.../EWORDST.mac.rou) (revision 2992) +++ EWORDST.mac.rou (.../EWORDST.mac.rou) (revision 3040) @@ -564,12 +564,12 @@ Quit ; REMLINE(CONSNr,ORDNr,OLUNr) - New R,OLNr,KLNr,MPRNr,KPRNr,Aantal,StockUpd + New R,OLNr,KLNr,MPRNr,KPRNr,Aantal,OrdAant,StockUpd Kill ^ORDW("IO",ORDNr,OLUNr) If $P(^ORDW("D",CONSNr,"D",ORDNr,OLUNr),D,2)'="B" Do .Set KLNr=$P(^ORDW("D",CONSNr),D,1) - .Set OLNr=^ORD("IU",ORDNr,OLUNr),R=^KOD(KLNr,"F",ORDNr,OLNr) - .Do PickingAnnulatie^EWORDS2(ORDNr,OLUNr,CONSNr) + .Set OLNr=^ORD("IU",ORDNr,OLUNr),R=^KOD(KLNr,"F",ORDNr,OLNr),OrdAant=$P(R,D,3) + .Do:OrdAant'<0 PickingAnnulatie^EWORDS2(ORDNr,OLUNr,CONSNr) .Set StockUpd=$P(R,D,14)'["S" Set:StockUpd StockUpd=$P(R,D,14)'["Z" .If $P(R,D,2),'$$MAGHANDEL^PRODUKT2($P(R,D,2)) Set StockUpd=0 .Quit:'StockUpd Index: EWBON.mac.rou =================================================================== diff -u -r2992 -r3040 --- EWBON.mac.rou (.../EWBON.mac.rou) (revision 2992) +++ EWBON.mac.rou (.../EWBON.mac.rou) (revision 3040) @@ -162,7 +162,7 @@ ;Do REMLINE^EWORDST(CONSNr,ORDNr,OLUNr) Do ADDRES(CONSNr,ORDNr,OLUNr) Do KWNODE^FLOWORD(KLNr,ORDNr,OLNr) - Do ProductLijnOpBon^EWORDS2(ORDNr,OLUNr,CONSNr) + Do:OrdAant'<0 ProductLijnOpBon^EWORDS2(ORDNr,OLUNr,CONSNr) Kill ^KOD(KLNr,"F",ORDNr,OLNr) ; Copieren van tekst- en manuele lijnen na een productlijn For Set OLNr=$O(^KOD(KLNr,"F",ORDNr,OLNr)) Quit:OLNr="" Do Quit:PRNr