Index: APPS/PM/Maatwerk/impl/VhConfig/Converter/EncowayNaarDom/LbxKenmerken.cls.xml =================================================================== diff -u -r73919 -r74080 --- APPS/PM/Maatwerk/impl/VhConfig/Converter/EncowayNaarDom/LbxKenmerken.cls.xml (.../LbxKenmerken.cls.xml) (revision 73919) +++ APPS/PM/Maatwerk/impl/VhConfig/Converter/EncowayNaarDom/LbxKenmerken.cls.xml (.../LbxKenmerken.cls.xml) (revision 74080) @@ -50,7 +50,7 @@ Set LbxKenmerken.MeenemerSet = $Select(VhConfig.Characteristics.GetAt("LatchSet") = "No": ##class(DOM.PM.enu.LBXMeenemerSet).Zonder(), 1: ##class(DOM.PM.enu.LBXMeenemerSet).VolledigeSet()) Set LbxKenmerken.OpvullijstKleur = VhConfig.Characteristics.GetAt("DistanceTrimColour") Set LbxKenmerken.RugHoogte = VhConfig.Characteristics.GetAt("BackHeight") - Set LbxKenmerken.RugWandMateriaal = VhConfig.Characteristics.GetAt("BackSideMaterial") + Set LbxKenmerken.RugWandMateriaal = $Select(VhConfig.Characteristics.GetAt("BackSideMaterial") = "Steel": ##class(DOM.PM.enu.LBXRugWandMateriaal).Staal(), "Wood": ##class(DOM.PM.enu.LBXRugWandMateriaal).Hout(), 1: VhConfig.Characteristics.GetAt("BackSideMaterial")) Set LbxKenmerken.Klasse = VhConfig.Characteristics.GetAt("Application") Set LbxKenmerken.VerpakkingType = VhConfig.Characteristics.GetAt("TypeOfPackaging") Set LbxKenmerken.ZijWandType = VhConfig.Characteristics.GetAt("SideType") @@ -72,12 +72,15 @@ Set UitsparingData.RugDeelX = VhConfig.Characteristics.GetAt("CutOutData.LeftX.Width") Set UitsparingData.RugDeelY = VhConfig.Characteristics.GetAt("CutOutData.RightY.Width") - #dim Z1Vorm As %String = $Select(VhConfig.Characteristics.GetAt("CutOutData.CapZ1.Shape") = "Square": "Recht", 1: VhConfig.Characteristics.GetAt("CutOutData.CapZ1.Shape")) - Set UitsparingData.UitsparingZ1 = "SY_" _ Z1Vorm _ "_" _ VhConfig.Characteristics.GetAt("CutOutData.CapZ1.Height") _ "_D" _ VhConfig.Characteristics.GetAt("CutOutData.CapZ1.Depth") _ "_B" _VhConfig.Characteristics.GetAt("CutOutData.CapZ1.Width") - - #dim Z2Vorm As %String = $Select(VhConfig.Characteristics.GetAt("CutOutData.CapZ2.Shape") = "Square": "Recht", 1: VhConfig.Characteristics.GetAt("CutOutData.CapZ2.Shape")) - Set UitsparingData.UitsparingZ2 = "SY_" _ Z2Vorm _ "_" _ VhConfig.Characteristics.GetAt("CutOutData.CapZ2.Height") _ "_D" _ VhConfig.Characteristics.GetAt("CutOutData.CapZ2.Depth") _ "_B" _VhConfig.Characteristics.GetAt("CutOutData.CapZ2.Width") - + If (LbxKenmerken.Klasse = "SY") { + #dim Z1Vorm As %String = $Select(VhConfig.Characteristics.GetAt("CutOutData.CapZ1.Shape") = "Square": "Recht", 1: VhConfig.Characteristics.GetAt("CutOutData.CapZ1.Shape")) + Set UitsparingData.UitsparingZ1 = "SY_" _ Z1Vorm _ "_" _ VhConfig.Characteristics.GetAt("BackHeight") _ "_D" _ VhConfig.Characteristics.GetAt("CutOutData.CapZ1.Depth") _ "_B" _VhConfig.Characteristics.GetAt("CutOutData.CapZ1.Width") + + If (AantalUitsparing = ##class(DOM.PM.enu.AantalUitsparingen).Dubbel()) { + #dim Z2Vorm As %String = $Select(VhConfig.Characteristics.GetAt("CutOutData.CapZ2.Shape") = "Square": "Recht", 1: VhConfig.Characteristics.GetAt("CutOutData.CapZ2.Shape")) + Set UitsparingData.UitsparingZ2 = "SY_" _ Z2Vorm _ "_" _ VhConfig.Characteristics.GetAt("BackHeight") _ "_D" _ VhConfig.Characteristics.GetAt("CutOutData.CapZ2.Depth") _ "_B" _VhConfig.Characteristics.GetAt("CutOutData.CapZ2.Width") + } + } Set LbxKenmerken.UitsparingData = UitsparingData ]]> Index: vhUnitTest/APPS/PM/Maatwerk/impl/VhConfig/Converter/EncowayNaarDom/LbxKenmerken/Converteer/Test.cls.xml =================================================================== diff -u -r73919 -r74080 --- vhUnitTest/APPS/PM/Maatwerk/impl/VhConfig/Converter/EncowayNaarDom/LbxKenmerken/Converteer/Test.cls.xml (.../Test.cls.xml) (revision 73919) +++ vhUnitTest/APPS/PM/Maatwerk/impl/VhConfig/Converter/EncowayNaarDom/LbxKenmerken/Converteer/Test.cls.xml (.../Test.cls.xml) (revision 74080) @@ -181,11 +181,11 @@ Set Kenmerken = ..GeefKenmerkenArray("CutOutData.RightY.Width", 52) Do ..AssertUitsparingData(Kenmerken, "RugDeelY", 52) - Set Kenmerken = ..GeefKenmerkenArray("CutOutData.CapZ1.Shape", "Square", "CutOutData.CapZ1.Height", 500, "CutOutData.CapZ1.Depth", 501, "CutOutData.CapZ1.Width", 502) - Do ..AssertUitsparingData(Kenmerken, "UitsparingZ1", "SY_Recht_500_D501_B502") + Set Kenmerken = ..GeefKenmerkenArray("CutOutData.CapZ1.Shape", "Square", "BackHeight", "M", "CutOutData.CapZ1.Depth", 501, "CutOutData.CapZ1.Width", 502, "Application", "SY") + Do ..AssertUitsparingData(Kenmerken, "UitsparingZ1", "SY_Recht_M_D501_B502") - Set Kenmerken = ..GeefKenmerkenArray("CutOutData.CapZ2.Shape", "Square", "CutOutData.CapZ2.Height", 503, "CutOutData.CapZ2.Depth", 504, "CutOutData.CapZ2.Width", 504) - Do ..AssertUitsparingData(Kenmerken, "UitsparingZ2", "SY_Recht_503_D504_B504") + Set Kenmerken = ..GeefKenmerkenArray("CutOutData.CapZ2.Shape", "Square", "BackHeight", "M", "CutOutData.CapZ2.Depth", 504, "CutOutData.CapZ2.Width", 504, "Application", "SY", "NumberOfSiphonCaps", "2") + Do ..AssertUitsparingData(Kenmerken, "UitsparingZ2", "SY_Recht_M_D504_B504") ]]>