Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/PalletSpecifications.cls.xml =================================================================== diff -u --- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/PalletSpecifications.cls.xml (revision 0) +++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/PalletSpecifications.cls.xml (revision 36346) @@ -0,0 +1,66 @@ + + + +TECH.RegisteredObject + + +1 +APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container + + + + +1 +APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container + + + + + + Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier.cls.xml =================================================================== diff -u -r36093 -r36346 --- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier.cls.xml (.../ResponseNotifier.cls.xml) (revision 36093) +++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier.cls.xml (.../ResponseNotifier.cls.xml) (revision 36346) @@ -48,15 +48,30 @@ { #dim LoadedContainer As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Response.loadedcontainer = LoadedContainersIterator.Next() #dim Pallet As APPS.TRANSP.Stapeling.dto.Pallet = ##class(APPS.TRANSP.Stapeling.dto.Pallet).%New() + #dim PalletSpecificaties As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container = ..GeefPalletSpecificaties(LoadedContainer.containerid) Set Pallet.GewichtInKG = LoadedContainer.totalweight Set Pallet.Afmeting.Hoogte = LoadedContainer.maxheight - Set Pallet.Afmeting.Lengte = LoadedContainer.maxlength - Set Pallet.Afmeting.Breedte = LoadedContainer.maxwidth + Set Pallet.Afmeting.Lengte = PalletSpecificaties.depth + Set Pallet.Afmeting.Breedte = PalletSpecificaties.width Do StapelaarResultaat.Palletten.Insert(Pallet) } Quit StapelaarResultaat ]]> + + +ContainerId:%String +1 +APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container + + Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier/Test.cls.xml =================================================================== diff -u -r36002 -r36346 --- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier/Test.cls.xml (.../Test.cls.xml) (revision 36002) +++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier/Test.cls.xml (.../Test.cls.xml) (revision 36346) @@ -38,8 +38,8 @@ #dim StapelingResultaat As APPS.TRANSP.Stapeling.dto.StapelingResultaat = Events.GetAt(1).Data.GeefStapelingResultaat() do $$$AssertEquals(StapelingResultaat.Referentie,"Referentie") do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).GewichtInKG,100) - do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).Afmeting.Breedte,70) - do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).Afmeting.Lengte,80) + do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).Afmeting.Breedte,"800.00") + do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).Afmeting.Lengte,"1500.00") do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).Afmeting.Hoogte,90) } ]]> Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml =================================================================== diff -u -r36344 -r36346 --- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 36344) +++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 36346) @@ -62,11 +62,11 @@ #dim PalletFormat As APPS.TRANSP.Stapeling.enu.PalletFormaat = PalletFormatenIterator.Next() If PalletFormat = ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).EuroPallet() { - Do Result.Insert(..GeefEuroPallet()) + Do Result.Insert(##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.PalletSpecifications).GeefEuroPallet()) } If PalletFormat = ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).WegwerpPallet() { - Do Result.Insert(..GeefWegwerpPallet()) + Do Result.Insert(##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.PalletSpecifications).GeefWegwerpPallet()) } } Quit Result @@ -182,64 +182,6 @@ ]]> - -1 -APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container - - - - -1 -APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container - - - Referentie:%String 1