Index: APPS/Verpakking/DoosService.cls.xml =================================================================== diff -u -r68501 -r68511 --- APPS/Verpakking/DoosService.cls.xml (.../DoosService.cls.xml) (revision 68501) +++ APPS/Verpakking/DoosService.cls.xml (.../DoosService.cls.xml) (revision 68511) @@ -45,7 +45,7 @@ Set ..Optimizer = $$$Inject(Optimizer, ##class(APPS.Verpakking.Optimizer).%New()) Set ..SnijDoosService = $$$Inject(SnijDoosService, ##class(WS.APPS.Verpakking.SnijDoosService).%New()) Set ..SnijRequestMaker = $$$Inject(SnijRequestMaker, ##class(WS.APPS.Verpakking.Service.MaakSnijRequest).%New()) - Set ..Logger = ##class(vhLib.Logger).%New(..%ClassName(1)) + Set ..Logger = ##class(vhLib.Logger).%New("VH doos service") Quit $$$OK ]]> Index: APPS/Verpakking/DoosAanvuller.cls.xml =================================================================== diff -u -r68405 -r68511 --- APPS/Verpakking/DoosAanvuller.cls.xml (.../DoosAanvuller.cls.xml) (revision 68405) +++ APPS/Verpakking/DoosAanvuller.cls.xml (.../DoosAanvuller.cls.xml) (revision 68511) @@ -60,6 +60,7 @@ Set Param.Value = BasisDoos.K1 Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "K2" Set Param.Value = BasisDoos.K2 Do BasisDoos.Params.Insert(Param) @@ -76,6 +77,7 @@ Set Param.Value = BasisDoos.K1 Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "K2" Set Param.Value = BasisDoos.K2 Do BasisDoos.Params.Insert(Param) @@ -99,6 +101,7 @@ Set Param.Value = BasisDoos.K1 Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "K2" Set Param.Value = BasisDoos.K2 Do BasisDoos.Params.Insert(Param) @@ -117,6 +120,7 @@ Set Param.Value = BasisDoos.K1 Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "K2" Set Param.Value = BasisDoos.K2 Do BasisDoos.Params.Insert(Param) @@ -133,10 +137,12 @@ Set Param.Value = 1 Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "K1" Set Param.Value = BasisDoos.K1 Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "K2" Set Param.Value = BasisDoos.K2 Do BasisDoos.Params.Insert(Param) @@ -147,6 +153,7 @@ Set BasisDoos.Height = Params("LOHOOGTE") Set BasisDoos.Width = Params("LOBREEDTE") + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "T" Set Param.Value = $Select($D(Params("LOCP")): Params("LOCP"), 1: BasisDoos.T) Do BasisDoos.Params.Insert(Param) @@ -156,6 +163,7 @@ Set BasisDoos.Height = Params("ZIJHOOGTE") Set BasisDoos.Width = Params("BREEDTE") + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "T" Set Param.Value = $Select($D(Params("BREEDTECP")): Params("BREEDTECP"), 1: BasisDoos.T) Do BasisDoos.Params.Insert(Param) @@ -179,14 +187,17 @@ Set Param.Value = $Select($D(Params("RUGHOOGTE")): Params("RUGHOOGTE"), 1:0) Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "T" Set Param.Value = 25 Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "K" Set Param.Value = 110 Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "OVERHANGSIZE" Set Param.Value = Params("RUGHOOGTE") - Params("ZIJHOOGTE") Do BasisDoos.Params.Insert(Param) @@ -242,10 +253,12 @@ Set Param.Value = $Select($D(Params("K1")): Params("K1"), 1: BasisDoos.K1) Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "K2" //Flap rechts deel 2 Set Param.Value = $Select($D(Params("K2")): Params("K2"), 1: BasisDoos.K2) Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() Set Param.Key = "K3" //Flap links Set Param.Value = $Select($D(Params("K3")): Params("K3"), 1: BasisDoos.K3) Do BasisDoos.Params.Insert(Param) @@ -275,24 +288,44 @@ Set Param.Key = "Fold3" //Afstand van tweede vouw tot derde vouw, indien nul dan afsnijden Set Param.Value = 0 Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "Fold4" //Afstand van derde vouw tot vierde vouw, indien nul dan afsnijden Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "Fold5" //Afstand van vierde vouw tot vijfde vouw, indien nul dan afsnijden Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "Fold6" //Afstand van vijfde vouw tot zesde vouw, indien nul dan afsnijden Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "Fold7" //Afstand van zesde vouw tot zevende vouw, indien nul dan afsnijden Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "Fold8" //Afstand van zevende vouw tot achtste vouw, indien nul dan afsnijden Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "Fold9" //Afstand van achtste vouw tot negende vouw, indien nul dan afsnijden Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "Fold10" //Afstand van negende vouw tot tiende vouw, indien nul dan afsnijden Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "Fold11" //Afstand van tiende vouw tot elfde vouw, indien nul dan afsnijden Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "Fold12" //Afstand van elfde vouw tot twaalfde vouw, indien nul dan afsnijden Do BasisDoos.Params.Insert(Param) + Set Param = ##class(APPS.Verpakking.Doos.Param).%New() + Set Param.Value = 0 Set Param.Key = "NBR" //Aantal scheidingen naast elkaar Set Param.Value = 1 Do BasisDoos.Params.Insert(Param)