Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml =================================================================== diff -u -r35962 -r36132 --- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml (.../Test.cls.xml) (revision 35962) +++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml (.../Test.cls.xml) (revision 36132) @@ -49,7 +49,7 @@ Do $$$AssertEquals(cubeiqrequest.packagestoload.Count(),1) Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).id,"Packagetoload.1") - Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).solutionid,"Stapelaar.Solution") + Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).solutionid,"Referentie") Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).auto,"1") Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).packageid,"Package.1") Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).quantity,"2") @@ -216,7 +216,7 @@ #dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet) Do $$$AssertEquals(cubeiqrequest.solutions.id, "Referentie") - Do $$$AssertEquals(cubeiqrequest.solutions.solutionid, "Stapelaar.Solution") + Do $$$AssertEquals(cubeiqrequest.solutions.solutionid, "Referentie") Do $$$AssertContains(cubeiqrequest.solutions.date, ..GeefHuidigeDatum()) Do $$$AssertEquals(cubeiqrequest.solutions.stage, "1") ]]> @@ -230,14 +230,14 @@ #dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet) Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).id, "Stapelaar.EuroPallet") - Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).solutionid, "Stapelaar.Solution") + Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).solutionid, "Referentie") Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).auto, "0") Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).containerid, "Stapelaar.EuroPallet") Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).containernum, "1") Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).sequence, "1") Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).id, "Stapelaar.WegwerpPallet") - Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).solutionid, "Stapelaar.Solution") + Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).solutionid, "Referentie") Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).auto, "0") Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).containerid, "Stapelaar.WegwerpPallet") Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).containernum, "2") Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml =================================================================== diff -u -r35962 -r36132 --- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 35962) +++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 36132) @@ -32,15 +32,15 @@ Set Requestcubeiq.containers = ..VoegToePalletFormaten(CollisOpPallet.Settings.PalletFormaten) Set Requestcubeiq.solutions = ..GeefSolution(CollisOpPallet.Referentie) - Set Requestcubeiq.containerstoload = ..GeefContainersToLoad() + Set Requestcubeiq.containerstoload = ..GeefContainersToLoad(CollisOpPallet.Referentie) #dim CollisOpPalletIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CollisOpPallet.Collis) while CollisOpPalletIterator.HasNext() { #dim ColliOpPallet As APPS.TRANSP.Stapeling.dto.ColliOpPallet = CollisOpPalletIterator.Next() Do Requestcubeiq.packages.Insert(..MaakPackage(ColliOpPallet)) - Do Requestcubeiq.packagestoload.Insert(..MaakPackageToLoad(ColliOpPallet)) + Do Requestcubeiq.packagestoload.Insert(..MaakPackageToLoad(ColliOpPallet, CollisOpPallet.Referentie)) Set Requestcubeiq.orientations = ..MaakOrientations(ColliOpPallet) } @@ -99,13 +99,13 @@ -ColliOpPallet:APPS.TRANSP.Stapeling.dto.ColliOpPallet +ColliOpPallet:APPS.TRANSP.Stapeling.dto.ColliOpPallet,Referentie:%String 1 APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.packagetoload +Referentie:%String 1 %ListOfObjects