Index: HADOPV.mac.rou =================================================================== diff -u -r3134 -r3551 --- HADOPV.mac.rou (.../HADOPV.mac.rou) (revision 3134) +++ HADOPV.mac.rou (.../HADOPV.mac.rou) (revision 3551) @@ -249,20 +249,33 @@ . . Quit:ProdDueOut>$$CALCDATE^vhDTyp($H,"A",5) . . Set sFL("O")=(ProdDueOut-$H)_$S(+$P(ProdDueOut,",",2)<(13*3600):"V",1:"N") - If DispMode="OG" Do - .If $P(Rec,D)="DV"!($P(Rec,D)="BA")!($P(Rec,D)="PR") Do ; Diverse,Banco of profielen - ..;Set KT="Diverse" - .Else Do - ..New Prof,Vul,hoogte,Breedte,MinVrGl,VulOms - ..Set Prof=$P(sFL("G"),D,2) - ..Set Vul=$P(sFL("G"),D,10) - ..Set:Vul="" Vul=" " - ..Set Hoogte=$P(sFL("G"),D,8) - ..Set Breedte=$P(sFL("G"),D,9) - ..If ('$Data(^RES("HAD","PI","PROFIEL","D",Prof))) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Geen data voor "_$Name(^RES("HAD","PI","PROFIEL","D",Prof)))) - ..Set MinVrGl=$P(^RES("HAD","PI","PROFIEL","D",Prof),"`",3)*2 - ..Set VulOms=$S(MinVrGl!(Vul=" "):$P($G(^RES("HAD","PI","VULLING","D",Vul)),"`",2),1:"**FOUT**") - ..Set KT=Vul_$J(Hoogte-MinVrGl,4,0)_"x"_$J(Breedte-MinVrGl,4,0)_$S($L(VulOms):"-"_VulOms,1:"") + If DispMode="OG" + { + If $P(Rec,D)="DV"!($P(Rec,D)="BA")!($P(Rec,D)="PR") ; Diverse,Banco of profielen + { + ;Set KT="Diverse" + } + Else + { + New Prof,Vul,hoogte,Breedte,MinVrGl,VulOms + If (sFL("G") = "") + { + Set KT = "Generisch product" + } + Else + { + Set Prof=$P(sFL("G"),D,2) + Set Vul=$P(sFL("G"),D,10) + Set:Vul="" Vul=" " + Set Hoogte=$P(sFL("G"),D,8) + Set Breedte=$P(sFL("G"),D,9) + If ('$Data(^RES("HAD","PI","PROFIEL","D",Prof))) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Geen data voor "_$Name(^RES("HAD","PI","PROFIEL","D",Prof)))) + Set MinVrGl=$P(^RES("HAD","PI","PROFIEL","D",Prof),"`",3)*2 + Set VulOms=$S(MinVrGl!(Vul=" "):$P($G(^RES("HAD","PI","VULLING","D",Vul)),"`",2),1:"**FOUT**") + Set KT=Vul_$J(Hoogte-MinVrGl,4,0)_"x"_$J(Breedte-MinVrGl,4,0)_$S($L(VulOms):"-"_VulOms,1:"") + } + } + } Set sFL(2)=KLNm_D_KT Quit