Index: BL/EC/DynaPlan.cls.xml =================================================================== diff -u -r1074 -r1373 --- BL/EC/DynaPlan.cls.xml (.../DynaPlan.cls.xml) (revision 1074) +++ BL/EC/DynaPlan.cls.xml (.../DynaPlan.cls.xml) (revision 1373) @@ -459,20 +459,35 @@ . Set pxTBXLade.LC = $G(..ltTBXLadeCodes(Index)) // Bepaal BoxSide - Set RLAantal = $G(arTBXKenm("RL","#"),1) - If ( ( pxTBXLade.DC = "S" ) || ( pxTBXLade.DC = "I" ) ) && ( pxTBXLade.LC?1(1"N",1"M",1"K",1"MS2",1"M/Z",1"K/Z") ) Set pxTBXLade.BS = "ZR" - Else If ( pxTBXLade.DC = "S" ) && ( pxTBXLade.LC?1(1"B",1"BS2",1"B/Z",1"C",1"C/Z",1"D",1"D/Z") ) && ( RLAantal = 1 ) && ( '$D(arTBXKenm("LA","BSD")) ) Set pxTBXLade.BS = "ER" - Else If ( pxTBXLade.DC = "S" ) && ( pxTBXLade.LC?1(1"D",1"DS2",1"D/Z") ) && ( RLAantal = 2 ) Set pxTBXLade.BS = "DR" - Else If ( pxTBXLade.DC = "S" ) && ( pxTBXLade.LC?1(1"D",1"DS2",1"D/Z") ) && ( RLAantal = 1 ) && ( $D(arTBXKenm("LA","BSD")) ) Set pxTBXLade.BS = "BS" - Else If ( pxTBXLade.DC = "I" ) && ( pxTBXLade.LC?1(1"D",1"DS2",1"DL/Z") ) && ( $D(arTBXKenm("LA","BXK")) ) Set pxTBXLade.BS = "CAP" - Else If ( pxTBXLade.DC = "I" ) && ( pxTBXLade.LC?1(1"D",1"DS2",1"C",1"DL/Z",1"CL/Z") ) && ( $D(arTBXKenm("LA","BXKV")) ) Set pxTBXLade.BS = "COV" + set RLAantal = $G(arTBXKenm("RL","#"),1) + if ( ( pxTBXLade.DC = "S" ) || ( pxTBXLade.DC = "I" ) ) && ( pxTBXLade.LC?1(1"N",1"M",1"K",1"MS2",1"M/Z",1"K/Z") ) { + set pxTBXLade.BS = "ZR" + } + elseif ( pxTBXLade.DC = "S" ) && ( pxTBXLade.LC?1(1"B",1"BS2",1"B/Z",1"C",1"C/Z",1"D",1"D/Z",1"DS2") ) && ( RLAantal = 1 ) { + if ( $data(arTBXKenm("BSD")) ) { Set pxTBXLade.BS = "BD" } + elseif ( $data(arTBXKenm("BSG")) ) { Set pxTBXLade.BS = "BG" } + elseif ( $data(arTBXKenm("BSE")) ) { Set pxTBXLade.BS = "BG" } ; Boxside glas ipv enkelwandige boxside + else { Set pxTBXLade.BS = "ER" } + } + elseif ( pxTBXLade.DC = "S" ) && ( pxTBXLade.LC?1(1"D",1"D/Z",1"DS2") ) && ( RLAantal = 2 ) { + set pxTBXLade.BS = "DR" + } + elseif ( pxTBXLade.DC = "I" ) && ( pxTBXLade.LC?1(1"D",1"DL",1"DL/Z",1"DLS2") ) && ( $D(arTBXKenm("BXK")) ) { + set pxTBXLade.BS = "CAP" + } + elseif ( pxTBXLade.DC = "I" ) && ( pxTBXLade.LC?1(1"D",1"C",1"DL",1"DL/Z",1"CL",1"CL/Z",1"DLS2") ) && ( $D(arTBXKenm("BXKA")) ) { + set pxTBXLade.BS = "COV" + } + ;D WLIP^vhDBG(195,"Info : "_pxTBXLade.DC_"-"_pxTBXLade.LC_"-") + ;D WLIP^vhDBG(195,$$ArrayToText^vhLib("arTBXKenm",.arTBXKenm)) + // Bepaal Binnengreep Set FGOpties = $G(arTBXKenm("FRONTGRP","Opties")) If ( pxTBXLade.LT = "L" ) Set pxTBXLade.BGRP = "X" Else If ( pxTBXLade.LT = "B" ) Do - . If ( pxTBXLade = "I" ) && ( pxTBXLade.LC?1(1"DL/Z",1"CL/Z") ) Do + . If ( pxTBXLade.DC = "I" ) && ( pxTBXLade.LC?1(1"DL/Z",1"CL/Z") ) Do . . If ( '$D(arTBXKenm("FRONTGRP","Opties") ) ) && ( '$D(arTBXKenm("FRONTRL","Opties") ) ) Set pxTBXLade.BGRP="R" . . Else If ( '$D(arTBXKenm("FRONTGRP","Opties") ) ) && ( $D(arTBXKenm("FRONTRL","Opties") )) Set pxTBXLade.BGRP="V" . . Else If ( $LF(FGOpties,"RG") || $LF(FGOpties,"G") ) Set pxTBXLade.BGRP="RG" @@ -854,6 +869,7 @@ Set Body= ##class(%GlobalCharacterStream).%New() + if $D(..arXMLData(-1)) { Do Body.WriteLine("Volgende artikelen zijn niet gekend in het systeem of kunnen niet aan één korttekst gekoppeld worden
") Do Body.CopyFrom($$ArrayToHTMLTable^vhLib(.Data))