Index: BL/PR/GA/TandemBox.cls.xml =================================================================== diff -u -r45627 -r46430 --- BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 45627) +++ BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 46430) @@ -833,6 +833,10 @@ // Sifonlade Type2 is steeds verlaagd tot M-hoogte. Set SPBinHoogte="M" } + ElseIf Klasse="SY3" { + // Sifonlade Type3 is steeds verlaagd tot M-hoogte. + Set SPBinHoogte="M" + } ElseIf DC?1(1"S",1"F",1"MA",1"MT") { If ( LadeCode = "MS2" ) Set SPBinHoogte="M" Else If ( LadeCode = "BS2" ) Set SPBinHoogte="B" @@ -1449,7 +1453,7 @@ #define SPZkOpMaat(%v) (%v?1(1"M",1"SI".E)) // Aantal uitsparingen bij Sifonlade of spoelbaklade - If KLAS?1(1"SY",1"SY2") Do + If ##class(TECH.StringUtils).Equals(KLAS,"SY","SY2","SY3") Do . Set BT="SYQTY" . Set BTVal=..SpoelbakUitsparingen(LC,SPZK,KLAS) . Do bwvAddToDataItem(BT,BTVal) @@ -1468,7 +1472,7 @@ . Set SPZLI=$G(Product.LookUp("PL","SPZLI")) . Set SPZRE=$G(Product.LookUp("PL","SPZRE")) . Set SPZMI=$G(Product.LookUp("PL","SPRUGMID")) - . d WL^vhDBG("Dubbele sifon : "_SPZLI_"+"_SPBR1_"+"_SPZMI_"+"_SPBR2_"+"_SPZRE_"="_(SPZLI+SPBR1+SPZMI+SPBR2+SPZRE)_" IB="_IB) + . ;d WL^vhDBG("Dubbele sifon : "_SPZLI_"+"_SPBR1_"+"_SPZMI_"+"_SPBR2_"+"_SPZRE_"="_(SPZLI+SPBR1+SPZMI+SPBR2+SPZRE)_" IB="_IB) . Set scSPBR=$S(SPZLI+SPBR1+SPZMI+SPBR2+SPZRE=IB:$$$OK, 1:$$$ERROR($$$GeneralError,"Afmetingen dubbele sifonlade incorrect")) . If $$$ISERR(scSPBR) Set X=YYY ; Calculation must trigger an ERROR @@ -1492,8 +1496,10 @@ . . Do bwvAddToDataItem("SPZRE",SPZRE) . Do Product.BuildLookUp($LB("PL")) + #dim IsNieuweSifonlade As %Boolean = ##class(TECH.StringUtils).Equals(KLAS,"SY2","SY3") + // SifonLade of Spoelbak zijstukkken op maat, spoelbakBreedte berekenen indien nog niet gekend - If (KLAS'="SY2")&&($L(SPZK))&&($G(SifonQty)<2) Do + If ($$$Not(IsNieuweSifonlade))&&($L(SPZK))&&($G(SifonQty)<2) Do . Set SPZLI=$G(Product.LookUp("PL","SPZLI")) . Set SPBR=$G(Product.LookUp("PL","SPBR")) . Set SPZRE=$G(Product.LookUp("PL","SPZRE")) @@ -1510,7 +1516,7 @@ . Do bwvAddToDataItem("SPZLI",SPZLI) . Do bwvAddToDataItem("SPBR",SPBR) . Do bwvAddToDataItem("SPZRE",SPZRE) - Else If (KLAS="SY2")&&($L(SPZK))&&($G(SifonQty)<2) Do + Else If (IsNieuweSifonlade)&&($L(SPZK))&&($G(SifonQty)<2) Do . // Nieuwe SifonLade (type 2), spoelbakBreedte controleren op correcte afmetingen . Set SPZLI=$G(Product.LookUp("PL","SPZLI")) . Set SPBR=$G(Product.LookUp("PL","SPBR1")) @@ -1527,7 +1533,7 @@ . Set BTVal="B" . Do bwvAddToDataItem(BT,BTVal) - If KLAS?1(1"SP2",1"SY2") Do + If ##class(TECH.StringUtils).Equals(KLAS,"SP2","SY2","SY3") Do . Set RSTL=$G(Product.LookUp("PL","RSTL")) . Set BinnenZijwandVolgtRSTL=0 ; conditioneel, afhankelijk van de UI (bvb Antaro BS2) . If ($L(RSTL))&&(BinnenZijwandVolgtRSTL) Do