Index: FLOWORD5.mac.rou =================================================================== diff -u -r1269 -r3298 --- FLOWORD5.mac.rou (.../FLOWORD5.mac.rou) (revision 1269) +++ FLOWORD5.mac.rou (.../FLOWORD5.mac.rou) (revision 3298) @@ -124,8 +124,8 @@ . Set KLNr=$P(^KO1(ORDNr,"F"),D) . Set GetOrd=$$GETORD^FLOWKLAS(ORDNr),UserName=$$USERNAME^vhUSER($P(GetOrd,"#"),1) Set:UserName="" UserName=$P(GetOrd,"#") . Set From=$ZUTIL(110)_"@VANHOECKE.BE" - . Set To=$$USERNAME^vhUSER($$MailTo^vhUSER("PVH;STM;DGU;NBR"),"@",1) - . Set Subject="Terugname maatwerk" + . Set To=$$USERNAME^vhUSER($$MailTo^vhUSER("PVH;STM;DGU;NBR;CW"),"@",1) + . Set Subject="Terugname maatwerk"_" - "_$P(^KKL(^KK1(KLNr),0),D,2)_" - order "_$$EXTNUM^vhDTyp(ORDNr,0,".",0) . Set Body="Order : "_$$EXTNUM^vhDTyp(ORDNr,0,".",0)_" - "_$P(^KKL(^KK1(KLNr),0),D,2)_$C(13)_$C(10) . Set Body=Body_"Ingave: "_UserName_" "_$$FMTDT^vhDTyp($P(GetOrd,"#",2))_$C(13)_$C(10) . Do:$D(^KlachtI("O",ORDNr)) @@ -145,9 +145,11 @@ . . . Set Incident=Incident_$C(13)_$C(10)_"Subtype : "_$$FETCHPOP^vhScherm("KLACHT","SUBTYPE",SubType,"O") . . . Set Incident=Incident_$C(13)_$C(10)_"Productgroep: "_$$FETCHPOP^vhScherm("PRODUKT","PRODUKTGROEP",ProdGroep,"O") . . . If $O(sFL("B","")) Do + . . . . Do DocDatum(.sFL,.Elementen) . . . . Set Elementen=$C(13)_$C(10)_"Elementen : " . . . . For I=1:1 Set Element=$G(sFL("B",I)) Quit:Element="" Do . . . . . Set R=$$CONVELEM^KLACHT2(Element) + . . . . . If $L($P(Element,"#")),$L($P(Element,"#",2)),$L($G(Elementen($P(Element,"#"),$P(Element,"#",2)))) Set R=R_" - "_Elementen($P(Element,"#"),$P(Element,"#",2)) . . . . . Set Incident=Incident_Elementen_R,Elementen=$C(13)_$C(10)_$J("",14) . . . Set R=$$ONOM^KLACHT(KlachtId,,2) Set:$L(R) Incident=Incident_$C(13)_$C(10)_"Omschrijving: "_R . . Set:$L(Incident) Body=Body_$C(13)_$C(10)_"Incident"_Incident @@ -162,6 +164,35 @@ . Else Set Result=$$SendMiniMail^vhLib(From,To,Subject,Body) Quit ; + ; Bepaal alle datums +DocDatum(sFL,Elementen) + New I,Element,Type,DocNum + For I=1:1 Set Element=$G(sFL("B",I)) Quit:Element="" Do + . Set Type=$P(Element,"#"),DocNum=$P(Element,"#",2) + . Set Elementen(Type,DocNum)="" + Set Type="" + For Set Type=$O(Elementen(Type)) Quit:Type="" Do + . Set DocNum="" + . For Set DocNum=$O(Elementen(Type,DocNum)) Quit:DocNum="" Do Quit:$L(Elementen(Type,DocNum)) + . . Set FANr="" + . . For Set FANr=$O(Elementen("F",FANr)) Quit:FANr="" Set Elementen(Type,DocNum)=$$GeefDocDatum(FANr,Type,DocNum) Quit:$L(Elementen(Type,DocNum)) + Quit + ; + ; Bepaal de datum van een document via het FANr +GeefDocDatum(FANr,Type,DocNum) + New Datum,BONNr,BLNr,Rec + Set Datum="" + If Type="F" Set Datum=$P($G(^KFA("F",DocNum,0,0)),D,6) + If Type="B" Set Datum=$P($G(^KFA("F",FANr,"U"_DocNum,1)),D,2) + Do:Type="O" + . Set BONNr="U" + . For Set BONNr=$O(^KFA("F",FANr,BONNr)) Quit:$E(BONNr)'="U" Do + . . Set BLNr=100 + . . For Set BLNr=$O(^KFA("F",FANr,BONNr,BLNr)) Quit:'BLNr Do Quit:$L(Datum) + . . . Set Rec=^KFA("F",FANr,BONNr,BLNr) + . . . If $P(Rec,D,17)="KF5",$P($P(Rec,D,5)," - ")=DocNum Set Datum=$P($P(Rec,D,5)," - ",2) + Quit Datum + ; ; Is dit een terugname van NIET-STOCK producten? ISTERUGNNietStock(ORDNr) New R,KLNr,IsTerugn,IsNietStock,OLNr,PRNr