Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml =================================================================== diff -u -r74213 -r74214 --- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml (.../ProductOptiesGenerator.cls.xml) (revision 74213) +++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml (.../ProductOptiesGenerator.cls.xml) (revision 74214) @@ -59,6 +59,7 @@ #dim SequentieNummerLade As %Integer = UitvoeringInfo.SequentieNummerLade #dim TOBSynchroLinkageLength As %Integer = ..GeefHalffabItemLengteInfo(UitvoeringInfo, "TiponBlumotionSynchronisatieStang") #dim SideStabiliserLength As %Integer = ..GeefHalffabItemLengteInfo(UitvoeringInfo, "Zijstabilisering") + #dim DesignElementFrontLength As %Integer = ..GeefHalffabItemLengteInfo(UitvoeringInfo, "InschuifElementVoor") #dim Product As DOM.PM.MaatwerkProduct = ..ProductApi.GeefProduct(UitvoeringInfo.ProductID) @@ -81,6 +82,10 @@ Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "SideStabiliserLength", SideStabiliserLength)) } + If $$$Not(DesignElementFrontLength = 0) { + Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "DesignElementFrontLength", DesignElementFrontLength)) + } + Quit Opties ]]> Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator.cls.xml =================================================================== diff -u -r74213 -r74214 --- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator.cls.xml (.../OptieGenerator.cls.xml) (revision 74213) +++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator.cls.xml (.../OptieGenerator.cls.xml) (revision 74214) @@ -147,6 +147,14 @@ } } + If (##class(TECH.StringUtils).Equals(RolNaam, "InschuifElementVoor") && (HuidigeMesFase >= 2)) { + If HalffabItem.%Extends(##class(DOM.PM.Maatwerk.Calc.HF.BewerktHalffabItem).%ClassName(1)) { + Set RolNaam = "DesignElementFront.Processed" + } Else { + Set RolNaam = "DesignElementFront.Standard" + } + } + Quit RolNaam ]]> Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml =================================================================== diff -u -r74213 -r74214 --- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml (.../Test.cls.xml) (revision 74213) +++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml (.../Test.cls.xml) (revision 74214) @@ -87,8 +87,10 @@ Set HalffabItemsBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New() Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "TiponBlumotionSynchronisatieStang").DanReturn($$$True) Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "Zijstabilisering").DanReturn($$$True) + Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "InschuifElementVoor").DanReturn($$$True) Do HalffabItemsBoomMock.VerwachtMethodCall("GeefHalffabItem", "TiponBlumotionSynchronisatieStang").DanReturn(##class(DOM.PM.Maatwerk.Calc.HF.BewerktHalffabItem).%New("", "Dummy", "")) Do HalffabItemsBoomMock.VerwachtMethodCall("GeefHalffabItem", "Zijstabilisering").DanReturn(##class(DOM.PM.Maatwerk.Calc.HF.BewerktHalffabItem).%New("", "Dummy", "")) + Do HalffabItemsBoomMock.VerwachtMethodCall("GeefHalffabItem", "InschuifElementVoor").DanReturn(##class(DOM.PM.Maatwerk.Calc.HF.BewerktHalffabItem).%New("", "Dummy", "")) Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom", "").DanReturn(HalffabItemsBoomMock) Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New() @@ -104,7 +106,7 @@ Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock, IngegevenKenmerkenSpaceStepHelperMock, , HoutCertificaatServiceMock) #dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringStub, ..UitvoeringInfo) - Do $$$AssertEquals(Resultaat.Size, 11) + Do $$$AssertEquals(Resultaat.Size, 12) Do ..AssertOptie(Resultaat.GetAt(1), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-PIN", ..#DummyDnaCode) Do ..AssertOptie(Resultaat.GetAt(2), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SHORTPIN", "ode") Do ..AssertOptie(Resultaat.GetAt(3), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Inventtransid", ..#DummyInventTransId) @@ -115,7 +117,8 @@ Do ..AssertOptie(Resultaat.GetAt(8), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-FSC-claim", "null") Do ..AssertOptie(Resultaat.GetAt(9), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "null") Do ..AssertOptie(Resultaat.GetAt(10), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-TOBSynchroLinkageLength", "null") - Do ..AssertOptie(Resultaat.GetAt(11), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SideStabiliserLength", "null") + Do ..AssertOptie(Resultaat.GetAt(11), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SideStabiliserLength", "null") + Do ..AssertOptie(Resultaat.GetAt(12), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DesignElementFrontLength", "null") Do ProductMock.Verifieer() Do ProductApiMock.Verifieer() @@ -138,6 +141,7 @@ Set HalffabItemsBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New() Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "TiponBlumotionSynchronisatieStang").DanReturn($$$False) Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "Zijstabilisering").DanReturn($$$False) + Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "InschuifElementVoor").DanReturn($$$False) Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom", "").DanReturn(HalffabItemsBoomMock) Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New() @@ -169,6 +173,7 @@ Set HalffabItemsBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New() Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "TiponBlumotionSynchronisatieStang").DanReturn($$$False) Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "Zijstabilisering").DanReturn($$$False) + Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "InschuifElementVoor").DanReturn($$$False) Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom", "").DanReturn(HalffabItemsBoomMock) Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New() @@ -206,6 +211,7 @@ Set HalffabItemsBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New() Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "TiponBlumotionSynchronisatieStang").DanReturn($$$False) Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "Zijstabilisering").DanReturn($$$False) + Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "InschuifElementVoor").DanReturn($$$False) Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom", "").DanReturn(HalffabItemsBoomMock) Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()