Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml =================================================================== diff -u -r71773 -r71776 --- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml (.../ProductOptiesGenerator.cls.xml) (revision 71773) +++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml (.../ProductOptiesGenerator.cls.xml) (revision 71776) @@ -51,6 +51,7 @@ #dim FscHoutCertificaat As %String = ..FscConverterNaarObjective.Converteer(Product.GeefFSCHout()) Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "FSC-claim", FscHoutCertificaat)) + Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "Vhoss-info", ..GeefVhossInfo(UitvoeringInfo))) Quit Opties ]]> @@ -117,6 +118,20 @@ Quit LijstOpties ]]> + + +UitvoeringInfo:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfo +%String + + Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml =================================================================== diff -u -r71775 -r71776 --- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml (.../Test.cls.xml) (revision 71775) +++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml (.../Test.cls.xml) (revision 71776) @@ -49,7 +49,7 @@ Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeRepositoryMock) #dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringMock, UitvoeringInfo) - Do $$$AssertEquals(Resultaat.Size, 9) + Do $$$AssertEquals(Resultaat.Size, 10) Do ..AssertOptie(Resultaat.GetAt(1), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-DNA-code", DummyDnaCode) Do ..AssertOptie(Resultaat.GetAt(2), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-PIN", DummyDnaCode) Do ..AssertOptie(Resultaat.GetAt(3), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SHORTPIN", "ode") @@ -58,7 +58,8 @@ Do ..AssertOptie(Resultaat.GetAt(6), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Korttekst", DummyKorttekst) Do ..AssertOptie(Resultaat.GetAt(7), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Langtekst", DummyLangtekst) Do ..AssertOptie(Resultaat.GetAt(8), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Dossiercode", DummyDossierCode) - Do ..AssertOptie(Resultaat.GetAt(9), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-FSC-claim", "NonApplicable") + Do ..AssertOptie(Resultaat.GetAt(9), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-FSC-claim", "NonApplicable") + Do ..AssertOptie(Resultaat.GetAt(10), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "null") Do ToeleveringMock.Verifieer() Do ProductMock.Verifieer() @@ -67,6 +68,46 @@ ]]> + + + +