Index: APPS/Halux/PPS/impl/AansturingActie/common/KlantEtiket/EtiketPrinter.cls.xml =================================================================== diff -u -r73425 -r74429 --- APPS/Halux/PPS/impl/AansturingActie/common/KlantEtiket/EtiketPrinter.cls.xml (.../EtiketPrinter.cls.xml) (revision 73425) +++ APPS/Halux/PPS/impl/AansturingActie/common/KlantEtiket/EtiketPrinter.cls.xml (.../EtiketPrinter.cls.xml) (revision 74429) @@ -141,8 +141,9 @@ #dim MagUitgevoerdWorden As %Boolean = $$$True #dim MesFaseActief As %Integer = 1 #dim IsActiefKlantEtikettenMes As %Boolean = ..ProjectSettingsApi.IsActiefKlantEtikettenMes() + #dim CategorTLM As %Boolean = ((Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Tandembox()) ||(Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Legrabox()) ||(Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Merivobox())) - If ((..MESService.IsActiefVoorMes(Batch.GeefLijn(), MesFaseActief)) && IsActiefKlantEtikettenMes) { + If ((..MESService.IsActiefVoorMes(Batch.GeefLijn(), MesFaseActief)) && IsActiefKlantEtikettenMes && CategorTLM) { Set MagUitgevoerdWorden = $$$False If $$$Not(IsProductieWijzeVolledig) { Index: APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml =================================================================== diff -u -r74262 -r74429 --- APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml (.../DnaCodeServiceHelper.cls.xml) (revision 74262) +++ APPS/Halux/AAP/DnaCodeService/DnaCodeServiceHelper.cls.xml (.../DnaCodeServiceHelper.cls.xml) (revision 74429) @@ -91,7 +91,11 @@ DnaCode:DOM.Halux.AAP.DnaCode 1 %Boolean - Index: APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml =================================================================== diff -u -r73841 -r74429 --- APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml (.../BatchPitchDataExporter.cls.xml) (revision 73841) +++ APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml (.../BatchPitchDataExporter.cls.xml) (revision 74429) @@ -63,8 +63,9 @@ While BatchesPitched.HasNext() { #dim PitchedBatch As APPS.Halux.Planning.Pitching.dto.BatchPitched = BatchesPitched.Next() #dim Batch As APPS.Halux.common.impl.BatchImpl = PitchedBatch.Batch + #dim CategorTLM As %Boolean = ((Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Tandembox()) ||(Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Legrabox()) ||(Batch.GeefCategorie() = ##class(APPS.Halux.common.enu.Categorie).Merivobox())) - If (..MESService.IsActiefVoorMes(Batch.GeefLijn(), ..#MESFaseActief)) { + If (..MESService.IsActiefVoorMes(Batch.GeefLijn(), ..#MESFaseActief) && CategorTLM) { Try { If ((Batch.IsReedsGestart()) && ($$$Not(..IsBatchExported(Batch.GeefID())))) { Do ..BatchPitchExportedService.BepaalVolgnummerEnBewaar(PitchedBatch) @@ -76,7 +77,7 @@ } } Catch { #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() - Do ..Logger.Error("ExporteerBatchPitchedDataNaarObjective", Exception.GeefOmschrijving()) + Do ..Logger.ErrorMail("ExporteerBatchPitchedDataNaarObjective", Exception.GeefOmschrijving()) } } @@ -90,8 +91,9 @@ BatchID:%String,IsTriggerResetBatch:%Boolean=0