Index: APPS/TRANSP/Stapeling/dto/Pallet.cls.xml =================================================================== diff -u -r36002 -r36388 --- APPS/TRANSP/Stapeling/dto/Pallet.cls.xml (.../Pallet.cls.xml) (revision 36002) +++ APPS/TRANSP/Stapeling/dto/Pallet.cls.xml (.../Pallet.cls.xml) (revision 36388) @@ -5,7 +5,7 @@ %Library.SerialObject -APPS.TRANSP.Stapeling.dto.Afmeting +APPS.TRANSP.dto.Afmeting @@ -17,8 +17,6 @@ PalletState ^APPS.TRANSP.Stapeli5C9B.PalletS -listnode - Afmeting Index: vhUnitTest/APPS/VKP/OfferteService/impl/NaarBerekenInputConverter/Test.cls.xml =================================================================== diff -u -r33484 -r36388 --- vhUnitTest/APPS/VKP/OfferteService/impl/NaarBerekenInputConverter/Test.cls.xml (.../Test.cls.xml) (revision 33484) +++ vhUnitTest/APPS/VKP/OfferteService/impl/NaarBerekenInputConverter/Test.cls.xml (.../Test.cls.xml) (revision 36388) @@ -43,7 +43,7 @@ 1 APPS.VKP.Offerte.dto.VerpakkingList -APPS.TRANSP.OfferteService.dto.Afmeting +APPS.TRANSP.dto.Afmeting @@ -51,8 +51,6 @@ TeverzendenItemState ^APPS.TRANSF34F.TeverzendenA5E1S -listnode - ProductID Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler/Test.cls.xml =================================================================== diff -u -r36370 -r36388 --- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler/Test.cls.xml (.../Test.cls.xml) (revision 36370) +++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefBepaler/Test.cls.xml (.../Test.cls.xml) (revision 36388) @@ -11,7 +11,7 @@ #dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Er is een ongeldig gewicht ingevoerd.") do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings)) - #dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0) + #dim Afmeting As APPS.TRANSP.dto.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(0,0,0) #dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",0) ]]> @@ -22,7 +22,7 @@ #dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New() #dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository) - #dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0,0,0) + #dim Afmeting As APPS.TRANSP.dto.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(0,0,0) #dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",90.000) Do $$$AssertEquals(Tarief, 35.25) @@ -119,7 +119,7 @@ #dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Er is een ongeldig gewicht ingevoerd.") do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings)) - #dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(0, 0, 0) + #dim Afmeting As APPS.TRANSP.dto.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(0, 0, 0) #dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",0) ]]> @@ -130,7 +130,7 @@ #dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New() #dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository) - #dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(500, 500, 500) + #dim Afmeting As APPS.TRANSP.dto.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(500, 500, 500) #dim FactureerbaarGewichtInKg As %Decimal = TariefBepaler.BepaalFactureerbaarGewichtInKg(Afmeting,0) @@ -143,7 +143,7 @@ #dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New() #dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository) - #dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(1000, 1000, 1000) + #dim Afmeting As APPS.TRANSP.dto.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(1000, 1000, 1000) #dim FactureerbaarGewichtInKg As %Decimal = TariefBepaler.BepaalFactureerbaarGewichtInKg(Afmeting,0) @@ -159,7 +159,7 @@ #dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Voor gewichten groter dan 2500 Kg zijn de tarieven op aanvraag.") do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings)) - #dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(10000, 10000, 10000) + #dim Afmeting As APPS.TRANSP.dto.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(10000, 10000, 10000) #dim FactureerbaarGewichtInKg As %Decimal = TariefBepaler.BepaalFactureerbaarGewichtInKg(Afmeting,0) #dim Tarief As %Decimal = TariefBepaler.GeefTarief("DE","54122",FactureerbaarGewichtInKg) @@ -171,7 +171,7 @@ #dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New() #dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository) - #dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(500, 500, 500) + #dim Afmeting As APPS.TRANSP.dto.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(500, 500, 500) #dim FactureerbaarGewichtInKg As %Decimal = TariefBepaler.BepaalFactureerbaarGewichtInKg(Afmeting,190.000) Do $$$AssertEquals(FactureerbaarGewichtInKg, 190) @@ -183,7 +183,7 @@ #dim TariefRepository As vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New() #dim TariefBepaler As APPS.TRANSP.Offerte.impl.DHL.TariefBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New(TariefRepository) - #dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(1000, 1000, 1000) + #dim Afmeting As APPS.TRANSP.dto.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(1000, 1000, 1000) #dim FactureerbaarGewichtInKg As %Decimal = TariefBepaler.BepaalFactureerbaarGewichtInKg(Afmeting,100.000) Do $$$AssertEquals(FactureerbaarGewichtInKg, 330) Index: WS/EC/Unishop/InternationaleZending/Service.cls.xml =================================================================== diff -u -r36370 -r36388 --- WS/EC/Unishop/InternationaleZending/Service.cls.xml (.../Service.cls.xml) (revision 36370) +++ WS/EC/Unishop/InternationaleZending/Service.cls.xml (.../Service.cls.xml) (revision 36388) @@ -101,7 +101,7 @@ Set ColliOpPallet.Aantal = Verpakking.Aantal Set ColliOpPallet.GewichtInKg = (Verpakking.Gewicht / 1000) Set ColliOpPallet.ProductID = Verpakking.ProductID - Set ColliOpPallet.Afmeting = ##class(APPS.TRANSP.Stapeling.dto.Afmeting).%New(Verpakking.Afmeting.Hoogte,Verpakking.Afmeting.Breedte,Verpakking.Afmeting.Lengte) + Set ColliOpPallet.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(Verpakking.Afmeting.Hoogte,Verpakking.Afmeting.Breedte,Verpakking.Afmeting.Lengte) Do CollisOpPallet.Collis.Insert(ColliOpPallet) } Quit CollisOpPallet Index: APPS/TRANSP/Offerte/impl/DHL/StapelingBewaarder.cls.xml =================================================================== diff -u -r36093 -r36388 --- APPS/TRANSP/Offerte/impl/DHL/StapelingBewaarder.cls.xml (.../StapelingBewaarder.cls.xml) (revision 36093) +++ APPS/TRANSP/Offerte/impl/DHL/StapelingBewaarder.cls.xml (.../StapelingBewaarder.cls.xml) (revision 36388) @@ -55,7 +55,7 @@ #dim StapelingResultaatPallet As APPS.TRANSP.Stapeling.dto.Pallet = StapelingResultaatIterator.Next() #dim StapelingPallet As APPS.TRANSP.Offerte.impl.DHL.Data.Pallet = ##class(APPS.TRANSP.Offerte.impl.DHL.Data.Pallet).%New() Set StapelingPallet.GewichtInKG = StapelingResultaatPallet.GewichtInKG - Set StapelingPallet.Afmeting = ##class(APPS.TRANSP.Offerte.impl.DHL.Data.Afmeting).%New() + Set StapelingPallet.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New() Set StapelingPallet.Afmeting.Breedte = StapelingResultaatPallet.Afmeting.Breedte Set StapelingPallet.Afmeting.Hoogte = StapelingResultaatPallet.Afmeting.Hoogte Set StapelingPallet.Afmeting.Lengte = StapelingResultaatPallet.Afmeting.Lengte Index: APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml =================================================================== diff -u -r36370 -r36388 --- APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml (.../TariefBepaler.cls.xml) (revision 36370) +++ APPS/TRANSP/Offerte/impl/DHL/TariefBepaler.cls.xml (.../TariefBepaler.cls.xml) (revision 36388) @@ -41,7 +41,7 @@ -Dimensies:APPS.TRANSP.OfferteService.dto.Afmeting,GewichtInKg:%Integer +Dimensies:APPS.TRANSP.dto.Afmeting,GewichtInKg:%Integer %Integer 1 - + 1 APPS.VKP.Offerte.dto.VerpakkingList Index: APPS/TRANSP/Offerte/impl/DHL/Data/Pallet.cls.xml =================================================================== diff -u -r36002 -r36388 --- APPS/TRANSP/Offerte/impl/DHL/Data/Pallet.cls.xml (.../Pallet.cls.xml) (revision 36002) +++ APPS/TRANSP/Offerte/impl/DHL/Data/Pallet.cls.xml (.../Pallet.cls.xml) (revision 36388) @@ -5,7 +5,7 @@ %Library.SerialObject -APPS.TRANSP.Stapeling.dto.Afmeting +APPS.TRANSP.dto.Afmeting @@ -17,8 +17,6 @@ PalletState ^APPS.TRANSP.Offerte938E.PalletS -listnode - Afmeting Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete3.cls.xml =================================================================== diff -u -r33887 -r36388 --- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete3.cls.xml (.../TestEnquete3.cls.xml) (revision 33887) +++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete3.cls.xml (.../TestEnquete3.cls.xml) (revision 36388) @@ -47,7 +47,7 @@ ]]> - + 1 APPS.VKP.Offerte.dto.VerpakkingList VerpakteAfmeting:APPS.Halux.common.impl.VerpakteAfmeting="" -APPS.TRANSP.OfferteService.dto.Afmeting +APPS.TRANSP.dto.Afmeting Index: vhTest/Dummy/APPS/TRANSP/OfferteService/dto/BerekenInput.cls.xml =================================================================== diff -u -r33619 -r36388 --- vhTest/Dummy/APPS/TRANSP/OfferteService/dto/BerekenInput.cls.xml (.../BerekenInput.cls.xml) (revision 33619) +++ vhTest/Dummy/APPS/TRANSP/OfferteService/dto/BerekenInput.cls.xml (.../BerekenInput.cls.xml) (revision 36388) @@ -23,7 +23,7 @@ Set TeverzendItem.WaardeGoederen = Item * 10 Set TeverzendItem.Gewicht = Item * 5 Set TeverzendItem.Aantal = 1 - Set TeverzendItem.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(Item * 500, Item * 10, Item * 100 ) + Set TeverzendItem.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(Item * 500, Item * 10, Item * 100 ) Do BerekenInput.TeVerzendenItems.Insert(TeverzendItem) } Index: vhTest/Utils/APPS/TRANSP/Stapeling/dto/StapelingResultaat.cls.xml =================================================================== diff -u -r36002 -r36388 --- vhTest/Utils/APPS/TRANSP/Stapeling/dto/StapelingResultaat.cls.xml (.../StapelingResultaat.cls.xml) (revision 36002) +++ vhTest/Utils/APPS/TRANSP/Stapeling/dto/StapelingResultaat.cls.xml (.../StapelingResultaat.cls.xml) (revision 36388) @@ -11,7 +11,7 @@ Set StapelingResultaat.Referentie = "DummyReferentie" #dim Pallet As APPS.TRANSP.Stapeling.dto.Pallet = ##class(APPS.TRANSP.Stapeling.dto.Pallet).%New() Set Pallet.GewichtInKG = 100 - Set Pallet.Afmeting = ##class(APPS.TRANSP.Stapeling.dto.Afmeting).%New(90,80,70) + Set Pallet.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(90,80,70) Do StapelingResultaat.Palletten.Insert(Pallet) Quit StapelingResultaat ]]> Index: APPS/TRANSP/Stapeling/dto/ColliOpPallet.cls.xml =================================================================== diff -u -r35749 -r36388 --- APPS/TRANSP/Stapeling/dto/ColliOpPallet.cls.xml (.../ColliOpPallet.cls.xml) (revision 35749) +++ APPS/TRANSP/Stapeling/dto/ColliOpPallet.cls.xml (.../ColliOpPallet.cls.xml) (revision 36388) @@ -17,7 +17,7 @@ -APPS.TRANSP.Stapeling.dto.Afmeting +APPS.TRANSP.dto.Afmeting Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete4.cls.xml =================================================================== diff -u -r33887 -r36388 --- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete4.cls.xml (.../TestEnquete4.cls.xml) (revision 33887) +++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete4.cls.xml (.../TestEnquete4.cls.xml) (revision 36388) @@ -4,7 +4,7 @@ 1 vhUnitTest.TestCase - + 1 APPS.VKP.Offerte.dto.VerpakkingList Index: APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml =================================================================== diff -u -r36358 -r36388 --- APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml (.../StapelingBepaler.cls.xml) (revision 36358) +++ APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml (.../StapelingBepaler.cls.xml) (revision 36388) @@ -51,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.GewichtInKG = (PalletData.GewichtInKG) - Set Pallet.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(PalletData.Afmeting.Hoogte + ..#PalletHoogte,PalletData.Afmeting.Breedte, PalletData.Afmeting.Lengte) + Set Pallet.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(PalletData.Afmeting.Hoogte + ..#PalletHoogte,PalletData.Afmeting.Breedte, PalletData.Afmeting.Lengte) Do Palletten.Insert(Pallet) } Index: vhUnitTest/APPS/VKP/impl/OfferteService/GeefProductVerpakkingDetails/Test.cls.xml =================================================================== diff -u -r34477 -r36388 --- vhUnitTest/APPS/VKP/impl/OfferteService/GeefProductVerpakkingDetails/Test.cls.xml (.../Test.cls.xml) (revision 34477) +++ vhUnitTest/APPS/VKP/impl/OfferteService/GeefProductVerpakkingDetails/Test.cls.xml (.../Test.cls.xml) (revision 36388) @@ -107,10 +107,10 @@ -Verpakking:APPS.TRANSP.OfferteService.dto.Afmeting,MaatwerkLijnNummer:%Integer=1 +Verpakking:APPS.TRANSP.dto.Afmeting,MaatwerkLijnNummer:%Integer=1 1 Index: APPS/TRANSP/dto/Afmeting.cls.xml =================================================================== diff -u --- APPS/TRANSP/dto/Afmeting.cls.xml (revision 0) +++ APPS/TRANSP/dto/Afmeting.cls.xml (revision 36388) @@ -0,0 +1,55 @@ + + + +serial +%Library.SerialObject + + +1 + + + +http://www.vanhoecke.be/ict + + + +Afmeting + + + +1 + + + +%Decimal + + + + +%Decimal + + + + +%Decimal + + + + +Hoogte:TECH.Decimal=0,Breedte:TECH.Decimal=0,Lengte:TECH.Decimal=0 +1 +1 +%Status +1 + + + + + + Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler.cls.xml =================================================================== diff -u -r36358 -r36388 --- vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler.cls.xml (.../PallettenBepaler.cls.xml) (revision 36358) +++ vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler.cls.xml (.../PallettenBepaler.cls.xml) (revision 36388) @@ -26,7 +26,7 @@ { #dim Pallet As APPS.TRANSP.OfferteService.dto.Pallet = ##class(APPS.TRANSP.OfferteService.dto.Pallet).%New() Set Pallet.GewichtInKG = 100 - Set Pallet.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(1,1,1) + Set Pallet.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(1,1,1) Do Palletten.Insert(Pallet) } Quit Palletten Index: zTryout/KCA/UPS/OfferteBerekenaar/Test.cls.xml =================================================================== diff -u -r34829 -r36388 --- zTryout/KCA/UPS/OfferteBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 34829) +++ zTryout/KCA/UPS/OfferteBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 36388) @@ -79,7 +79,7 @@ Set TeverzendItem.WaardeGoederen = Item * 10 Set TeverzendItem.Gewicht = Item * 5000 Set TeverzendItem.Aantal = 1 - Set TeverzendItem.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(Item * 5, Item * 10, Item * 10 ) + Set TeverzendItem.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(Item * 5, Item * 10, Item * 10 ) Do BerekenInput.TeVerzendenItems.Insert(TeverzendItem) } ]]> Index: APPS/VKP/Offerte/dto/Verpakking.cls.xml =================================================================== diff -u -r33019 -r36388 --- APPS/VKP/Offerte/dto/Verpakking.cls.xml (.../Verpakking.cls.xml) (revision 33019) +++ APPS/VKP/Offerte/dto/Verpakking.cls.xml (.../Verpakking.cls.xml) (revision 36388) @@ -4,7 +4,7 @@ TECH.DataTransferObject -APPS.TRANSP.OfferteService.dto.Afmeting +APPS.TRANSP.dto.Afmeting @@ -24,7 +24,7 @@ -Afmeting:APPS.TRANSP.OfferteService.dto.Afmeting="",Gewicht:TECH.Decimal="",WaardeGoederen:TECH.Decimal="",ProductID:%String="",Aantal:TECH.Integer="" +Afmeting:APPS.TRANSP.dto.Afmeting="",Gewicht:TECH.Decimal="",WaardeGoederen:TECH.Decimal="",ProductID:%String="",Aantal:TECH.Integer="" 1 1 %Status Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete1.cls.xml =================================================================== diff -u -r35223 -r36388 --- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete1.cls.xml (.../TestEnquete1.cls.xml) (revision 35223) +++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/TestEnquete1.cls.xml (.../TestEnquete1.cls.xml) (revision 36388) @@ -23,7 +23,7 @@ TECH.DataTransferObject -APPS.TRANSP.OfferteService.dto.Afmeting +APPS.TRANSP.dto.Afmeting FishEye: Tag 36388 refers to a dead (removed) revision in file `APPS/TRANSP/Offerte/impl/DHL/Data/Afmeting.cls.xml'. FishEye: No comparison available. Pass `N' to diff?