Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml =================================================================== diff -u -r36132 -r36344 --- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 36132) +++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 36344) @@ -194,7 +194,7 @@ Set Container.containertype="Rectangular" Set Container.depth="1200.00" Set Container.width="800.00" - Set Container.height="2200.00" + Set Container.height="2070.00" Set Container.maxweight="1200.00" Set Container.settingsid="Default" Set Container.backtofront="False" @@ -223,7 +223,7 @@ Set Container.containertype="Rectangular" Set Container.depth="1500.00" Set Container.width="800.00" - Set Container.height="2200.00" + Set Container.height="2070.00" Set Container.maxweight="1200.00" Set Container.settingsid="Default" Set Container.backtofront="False" Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml =================================================================== diff -u -r36132 -r36344 --- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml (.../Test.cls.xml) (revision 36132) +++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml (.../Test.cls.xml) (revision 36344) @@ -164,7 +164,7 @@ Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).containertype,"Rectangular") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).depth,"1200.00") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).width,"800.00") - Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).height,"2200.00") + Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).height,"2070.00") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).maxweight,"1200.00") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).settingsid,"Default") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).backtofront,"False") @@ -193,7 +193,7 @@ Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).containertype,"Rectangular") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).depth,"1500.00") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).width,"800.00") - Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).height,"2200.00") + Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).height,"2070.00") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).maxweight,"1200.00") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).settingsid,"Default") Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).backtofront,"False") Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bereken/Test.cls.xml =================================================================== diff -u -r36219 -r36344 --- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bereken/Test.cls.xml (.../Test.cls.xml) (revision 36219) +++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bereken/Test.cls.xml (.../Test.cls.xml) (revision 36344) @@ -24,8 +24,8 @@ do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) - do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) - do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) + do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) + do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "")) Index: APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml =================================================================== diff -u -r36340 -r36344 --- APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml (.../StapelingBepaler.cls.xml) (revision 36340) +++ APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml (.../StapelingBepaler.cls.xml) (revision 36344) @@ -3,6 +3,11 @@ TECH.RegisteredObject,TECH.Mockable + +%Integer +130 + + APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestComposer 1 @@ -46,7 +51,7 @@ #dim Pallet As APPS.TRANSP.OfferteService.dto.Pallet = ##class(APPS.TRANSP.OfferteService.dto.Pallet).%New() #dim PalletData As APPS.TRANSP.Offerte.impl.DHL.Data.Pallet = PallettenIterator.Next() Set Pallet.Gewicht = (PalletData.GewichtInKG) - Set Pallet.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(PalletData.Afmeting.Hoogte,PalletData.Afmeting.Breedte, PalletData.Afmeting.Lengte) + Set Pallet.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(PalletData.Afmeting.Hoogte + ..#PalletHoogte,PalletData.Afmeting.Breedte, PalletData.Afmeting.Lengte) Do Palletten.Insert(Pallet) } Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bepaal/Test.cls.xml =================================================================== diff -u -r36002 -r36344 --- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bepaal/Test.cls.xml (.../Test.cls.xml) (revision 36002) +++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bepaal/Test.cls.xml (.../Test.cls.xml) (revision 36344) @@ -16,8 +16,8 @@ Do $$$AssertEquals(Palletten.Count(),1) #dim Pallet As APPS.TRANSP.OfferteService.dto.Pallet = Palletten.GetAt(1) - Do $$$AssertEquals(Pallet.Gewicht,100000) - Do $$$AssertEquals(Pallet.Afmeting.Hoogte,90) + Do $$$AssertEquals(Pallet.Gewicht,100.000) + Do $$$AssertEquals(Pallet.Afmeting.Hoogte,220) Do $$$AssertEquals(Pallet.Afmeting.Breedte,80) Do $$$AssertEquals(Pallet.Afmeting.Lengte,70) ]]>