Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml
===================================================================
diff -u -r35747 -r35749
--- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml (.../Test.cls.xml) (revision 35747)
+++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml (.../Test.cls.xml) (revision 35749)
@@ -22,6 +22,21 @@
#dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet)
Do $$$AssertEquals(cubeiqrequest.packages.Count(),1)
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).id,"DHL.package.1")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).packageid,"DHL.package.1")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).length,"700")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).width,"300")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).height,"163")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).weight,"15.00")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).turnable,"False")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).sideupok,"False")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).endupok,"True")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).bottomonly,"False")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).toponly,"False")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).colour,"#255#0#0")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).deletewithsolution,"True")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).packagetype,"Box")
+ Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).stackcode,"")
]]>
@@ -33,6 +48,12 @@
#dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet)
Do $$$AssertEquals(cubeiqrequest.packagestoload.Count(),1)
+ Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).id,"DHL.packagetoload.1")
+ Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).solutionid,"DHL.stapelaar.Solution")
+ Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).auto,"1")
+ Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).packageid,"DHL.package.1")
+ Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).quantity,"2")
+ Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).batch,"#0#100#0")
]]>
Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml
===================================================================
diff -u -r35747 -r35749
--- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 35747)
+++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 35749)
@@ -20,12 +20,10 @@
while CollisOpPalletIterator.HasNext()
{
#dim ColliOpPallet As APPS.TRANSP.Stapeling.dto.ColliOpPallet = CollisOpPalletIterator.Next()
- #dim cubeiqPackage As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.package = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.package).%New()
- Do Requestcubeiq.packages.Insert(cubeiqPackage)
+
+ Do Requestcubeiq.packages.Insert(..MaakPackage(ColliOpPallet))
+ Do Requestcubeiq.packagestoload.Insert(..MaakPackageToLoad(ColliOpPallet))
- #dim cubeiqPackageToLoad As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.packagetoload = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.packagetoload).%New()
- Do Requestcubeiq.packagestoload.Insert(cubeiqPackageToLoad)
-
#dim Orientation As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.orientation = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.orientation).%New()
Do Requestcubeiq.orientations.Insert(Orientation)
@@ -35,6 +33,47 @@
]]>
+
+ColliOpPallet:APPS.TRANSP.Stapeling.dto.ColliOpPallet
+1
+APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.package
+
+
+
+
+ColliOpPallet:APPS.TRANSP.Stapeling.dto.ColliOpPallet
+1
+APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.packagetoload
+
+
+
1
APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.setting
Index: APPS/TRANSP/Stapeling/dto/ColliOpPallet.cls.xml
===================================================================
diff -u -r35739 -r35749
--- APPS/TRANSP/Stapeling/dto/ColliOpPallet.cls.xml (.../ColliOpPallet.cls.xml) (revision 35739)
+++ APPS/TRANSP/Stapeling/dto/ColliOpPallet.cls.xml (.../ColliOpPallet.cls.xml) (revision 35749)
@@ -8,7 +8,7 @@
TECH.String
-
+
TECH.Decimal
@@ -37,6 +37,9 @@
Afmeting
+
+GewichtInKg
+
Index: vhTest/Utils/APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml
===================================================================
diff -u -r35739 -r35749
--- vhTest/Utils/APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml (.../CollisOpPallet.cls.xml) (revision 35739)
+++ vhTest/Utils/APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml (.../CollisOpPallet.cls.xml) (revision 35749)
@@ -11,7 +11,7 @@
#dim ColliOpPallet As APPS.TRANSP.Stapeling.dto.ColliOpPallet = ##class(APPS.TRANSP.Stapeling.dto.ColliOpPallet).%New()
Set ColliOpPallet.Aantal = 2
- Set ColliOpPallet.Gewicht = 15 // KG
+ Set ColliOpPallet.GewichtInKg = 15 // KG
Set ColliOpPallet.ProductID = 1
Set ColliOpPallet.Afmeting = ##class(APPS.TRANSP.Stapeling.dto.Afmeting).%New(163,300,700)
Do CollisOpPallet.Insert(ColliOpPallet)
Index: vhTest/Fake/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml
===================================================================
diff -u -r35744 -r35749
--- vhTest/Fake/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 35744)
+++ vhTest/Fake/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml (.../RequestComposer.cls.xml) (revision 35749)
@@ -37,6 +37,13 @@
+
+
+ColliOpPallet:APPS.TRANSP.Stapeling.dto.ColliOpPallet
+APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.package
+
+