Index: KTWL1.mac.rou =================================================================== diff -u -r3013 -r3289 --- KTWL1.mac.rou (.../KTWL1.mac.rou) (revision 3013) +++ KTWL1.mac.rou (.../KTWL1.mac.rou) (revision 3289) @@ -18,7 +18,9 @@ R0F S FP=$P(R,D,9)*100+($P(R,D,10)*1) I FP W @F,$J("",R6),@F,K R0Z K R,R0,R2,R3,R4,R5,R6,R7 Q ;V4 03.10.84 ; -1 G 30:"WL"'[SWLPA +1 New PAOld + Set PAOld=PA + G 30:"WL"'[SWLPA S K=$G(AutoInp) I K="" S R="K\23\54\LEVERT \C1\5" D R0 G YZ:K="," I K="-" G 3^KTWL:'$G(ScrolToe),YZ I "?"'[K D VALDATE^vhDTyp(K,"DW",$H-7) G 1:'%TC S:K?.N&($P(%EXT,"/",2)<%WK) $P(%EXT,"/")=$$EXTDATE^vhDTyp($$CALCDATE^vhDTyp(,"J","+1"),"J") S K=%EXT @@ -33,11 +35,8 @@ 314 S FP=2264 W @F,@F2,PA," ",UMC,"/",USP 32 S UA=$P(U2,D,3) G 35:"WA"'[SWLPA S FP=2354 W @F,@F2,"AANTAL : ",UA 33 S R="K\24\54\AANTAL \\6\\""-,""[K!(K?.N&(K>0))\\" D R0 G 30:K="-"&(SWLPA="W"),YZ:K="-",YZ:K="," I K S UA=K -35 S @Q15=UI_D_LC_D_UJ_D_UA_D_UA_D_ULT_D_($P(U2,D,27)'="")_D,UR=$P(U2,D,27),UUZ=$P($P(U2,D,28),";") - I UA'=$P(U2,D,3) D - .S X=@("^"_Q_"PR(PR,0)") - .S X=$P(X,D,1,16)_D_($P($P(X,D,17),"#",1)+UA-$P(U2,D,3))_"#"_$S(UR:$P($P(X,D,17),"#",2),1:($P($P(X,D,17),"#",2)+UA-$P(U2,D,3)))_"#"_$S(UR:($P($P(X,D,17),"#",3)+UA-$P(U2,D,3)),1:$P($P(X,D,17),"#",3))_D_$P(X,D,18,99) - .S @("^"_Q_"PR(PR,0)")=X +35 S UR=$P(U2,D,27),UUZ=$P($P(U2,D,28),";") + D KWNODE^FLOWTOE(LC,TR,UVN) 351 G 36:'UR S KC=$P(@("^"_Q_"O1(UR,""F"")"),D,1),X=@("^"_Q_"OD(KC,""F"",UR,1)") S UOD=$TR($$EXTDATE^vhDTyp($$INTDATE^vhDTyp($P(X,D,2)),"DS"),D,"") 354 L (@("^"_Q_"TO(LC,TR)"),@("^"_Q_"OD(KC,""F"",UR)")):2 E S FP=2403+F60 W @F,@F2,@F4,"ORDER ",UR," IS IN GEBRUIK [] = OK ",@F5 R K G 354 @@ -67,7 +66,21 @@ 362 S X=^(UVN),X=$P(X,D,1)_D_ULT_D_($P(X,D,3)+1)_D_$P(X,D,4,99),^(UVN)=X 37 S X=@("^"_Q_UGL_"(LC,TR,1)"),UN=$J(PA*UA/$P("1\100\1000",D,$F("EHM",USP)-1),0,2),UBE=$J($P(U2,D,16)/$P(U2,D,3)*UA,0,2),UK="" S:PK1 UK=$J(PK1,4,1) S:PK2 UK=UK_" "_$J(PK2,4,1) 38 S:ULT'=$P(U2,D,25) $P(U2,D,24)="G" + + S R=U2 + S U2=$P(U2,D,1,2)_D_UA_D_$P(U2,D,4,6)_D_PK1_"#"_PK2_D_$P(U2,D,8)_D_UN_D_UN_D_$P(U2,D,11,15)_D_UBE_D_$P(U2,D,17,24)_D_ULT_D_U26_D_$P(U2,D,27,28)_D_ULTA_D_$P(U2,D,30,99),^(UVN)=U2 + D SWNODE^FLOWTOE(LC,TR,UVN) + + New ToeleveringID,ToeleveringLijnID,LeverancierID,WijzigingTypes + Set ToeleveringID=TR,ToeleveringLijnID=UVN,LeverancierID=LC + + Set WijzigingTypes = ##class(DOM.AKP.impl.ProductToelevLijnWijzigingTypes).%New() + Do:$P(R,D,3)'=UA WijzigingTypes.Insert(##class(DOM.AKP.enu.ProductToeleveringLijnWijzigingType).Aantal()) + Do:PAOld'=PA WijzigingTypes.Insert(##class(DOM.AKP.enu.ProductToeleveringLijnWijzigingType).Prijs()) + Do:$P(R,D,25)'=ULT WijzigingTypes.Insert(##class(DOM.AKP.enu.ProductToeleveringLijnWijzigingType).Leverdatum()) + If (WijzigingTypes.Count() > 0) { Do ProductToeleveringLijnWijzigingen^FLOWTOE2(LeverancierID, ToeleveringID, ToeleveringLijnID, WijzigingTypes) } + I LC=6332,"WL"[SWLPA D MODBATCH(TR,$P(U2,D,15)) 39 K UEP,USP I '$G(ScrolToe) D S1 G 3^KTWL ;