From f5cc53253eff0a23d0e225975f1c1252474c236a Mon Sep 17 00:00:00 2001 From: Simon Steuer Date: Fri, 11 Jul 2025 23:35:44 +0200 Subject: [PATCH] =?UTF-8?q?siehe=20JIRA=20SUR-644=20-=20Fehlt=20eine=20Num?= =?UTF-8?q?mer=20in=20der=20Blacklist=20wird=20nun=20bei=20jedem=20Klick?= =?UTF-8?q?=20auf=20'Migrieren'=20in=20der=20GUI=20gepr=C3=BCft,=20ob=20di?= =?UTF-8?q?e=20Nummer=20in=20der=20ERP=5FBOM.ini=20vorliegt.=20Fehlt=20sie?= =?UTF-8?q?,=20erscheint=20wie=20gewohnt=20die=20Fehlermeldung,=20dass=20d?= =?UTF-8?q?ie=20Nummer=20in=20der=20Datei=20fehlt=20-=20eine=20Migration?= =?UTF-8?q?=20erfolgt=20also=20nicht.=20Erst=20wenn=20die=20Meldung=20mit?= =?UTF-8?q?=20'OK'=20best=C3=A4tigt=20und=20die=20Nummer=20anschlie=C3=9Fe?= =?UTF-8?q?nd=20in=20die=20.ini-Datei=20hinzugef=C3=BCgt=20wurde=20kann=20?= =?UTF-8?q?die=20Migration=20mit=20dem=20n=C3=A4chsten=20Klick=20auf=20'Mi?= =?UTF-8?q?grieren'=20erfolgreich=20abgeschlossen=20werden.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/controller.py | 13 ++++++++----- lib/manage_configs.py | 8 +++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/controller.py b/lib/controller.py index 4cad091..db99dba 100644 --- a/lib/controller.py +++ b/lib/controller.py @@ -287,15 +287,17 @@ class Controller(Observer): elif key == 'cb_zurücksetzen': self.zuruecksetzen() elif key == 'cb_suche_asm': - # kopiere Blacklist von Server + # hole dir die in die GUI eingetragene Nummer update_database.get_blacklist(self.get_env("data")) - # hole dir den in die gui eingetragene Nummer current_asmid = self.data_from_view('asm_id') - self.set_current_asm_id(current_asmid) + if current_asmid != '': + self.set_current_asm_id(current_asmid) elif key == 'cb_ladelokal_asm': + # hole dir nur die lokalen Daten. Keine Datenbankabfrage außer Blacklist + update_database.get_blacklist(self.get_env("data")) current_asmid = self.data_from_view('asm_id') - # hole dir nur die lokalen Daten. Keine Datenbankabfrage - self.set_current_asm_id(current_asmid, load_local_bom=True, load_local_teilestamm=True, load_local_rd_ids=True) + if current_asmid != '': + self.set_current_asm_id(current_asmid, load_local_bom=True, load_local_teilestamm=True, load_local_rd_ids=True) elif key == 'cb_3dsuchen': self.suche_3d() @@ -322,6 +324,7 @@ class Controller(Observer): return # Pruefung ob assembly-id in Blacklist fehlt + update_database.get_blacklist(self.get_env("data")) (ok, missing_blacklist_id) = self._model.check_blacklist_completeness() if ok == False: id = ''.join(missing_blacklist_id) diff --git a/lib/manage_configs.py b/lib/manage_configs.py index d7d821c..e3f6051 100644 --- a/lib/manage_configs.py +++ b/lib/manage_configs.py @@ -806,7 +806,6 @@ class Configs: self.Materialien = MaterialTransConfig(cfg_dir) self.bom_config = BOMConfig(cfg_dir) self._teilenummern = None - self._blacklist = None def get_cfg_path(self): return self._cfg_dir @@ -826,8 +825,7 @@ class Configs: def get_blacklist(self): if not self._data_dir: raise Exception("set_data_dir not called. path not set") - if not self._blacklist: - with open(os.path.join(self._data_dir, 'blacklist.txt')) as f: - lines = f.read().splitlines() - self._blacklist = lines + with open(os.path.join(self._data_dir, 'blacklist.txt')) as f: + lines = f.read().splitlines() + self._blacklist = lines return self._blacklist