Index: APPS/Verpakking/DoosService.cls.xml =================================================================== diff -u -r69851 -r69952 --- APPS/Verpakking/DoosService.cls.xml (.../DoosService.cls.xml) (revision 69851) +++ APPS/Verpakking/DoosService.cls.xml (.../DoosService.cls.xml) (revision 69952) @@ -88,7 +88,7 @@ While ResultSetLink.Next() { Set BoxDataID = ResultSetLink.Data("ID") Set BoxData = ##class(DS.Prod.OptiBox.BoxData).%OpenId(BoxDataID) - #dim SubAantal As %Integer = $Select(BoxData.Aantal = "Aantal": Aantal, BoxData.Aantal = "-1": 1, 1:BoxData.Aantal) + #dim SubAantal As %Integer = $Select(BoxData.Aantal = "Aantal": Aantal, 1:BoxData.Aantal) Do ..GeefDoos(ProductGroep, BoxData.Meta.Name, MachineID, (Aantal * SubAantal), "", ProductId, Prioriteit, BaseRef, CallBack, BoxDataID) } Do ResultSetLink.Close() @@ -104,6 +104,10 @@ #dim MachineTechnologie As APPS.Verpakking.enu.MachineTechnologie = ..GeefMachineTechnologie(MachineID) #dim Doos As APPS.Verpakking.Doos = ..DoosFactory.MaakDoos(ProductGroep, ReceptNaam) Do ..DoosAanvuller.VulAanBasisInformatieDoos(.Doos, .Params, ProductGroep, Prioriteit, MachineTechnologie, BoxDataID) //SnijdataID toevoegen voor overdozen? + + If ($$$Not(MachineID = ##class(APPS.Verpakking.enu.MachineID).VH()) && (ProductGroep = "PR")) { + Set Doos.LogoPrint = "TBX DRAWER" + } Do ..Optimizer.Optimize(.Doos, ProductGroep, MachineTechnologie) If (MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Kraft()) { Index: APPS/Verpakking/DoosAanvuller.cls.xml =================================================================== diff -u -r69844 -r69952 --- APPS/Verpakking/DoosAanvuller.cls.xml (.../DoosAanvuller.cls.xml) (revision 69844) +++ APPS/Verpakking/DoosAanvuller.cls.xml (.../DoosAanvuller.cls.xml) (revision 69952) @@ -101,8 +101,8 @@ Set Param.Value = BasisDoos.K2 Do BasisDoos.Params.Insert(Param) - } ElseIf (ProductGroep = "OL") { //|| (ProductGroep = "TAOR INDELINGEN") - If (ProductGroep = "OL") { + } ElseIf ((ProductGroep = "OL") || (ProductGroep = "PR")) { //|| (ProductGroep = "TAOR INDELINGEN") + If ((ProductGroep = "OL") || (ProductGroep = "PR")) { Set BasisDoos.BoxSelect = "OL WRAPAROUND" //Meta 469 PRNr 924574 }/* ElseIf (ProductGroep = "TAOR INDELINGEN") { Set BasisDoos.BoxSelect = "TAOR INDELINGEN WRAPAROUND" //Meta 508 @@ -315,7 +315,7 @@ Set BasisDoos.Fold5 = Params("BKHOOGTE")+10 Set BasisDoos.NBR = $S(Params("BKQTY")>4:4,1:Params("BKQTY")) - } ElseIf (ProductGroep = "OL") { + } ElseIf ((ProductGroep = "OL") || (ProductGroep = "PR")) { Set BasisDoos.BoxSelect = "OL COMPLEX SEPARATOR" //Meta 483 PRNr 881438 Set BasisDoos.LogoPrint = "ORGALUX WHITE"