From bb62a73deef87d34760ef05c3f58dfd4fa25a707 Mon Sep 17 00:00:00 2001 From: Floke Date: Thu, 28 Aug 2025 11:03:16 +0000 Subject: [PATCH] sync_manager.py aktualisiert --- sync_manager.py | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/sync_manager.py b/sync_manager.py index 09671e9e..a0d5cb65 100644 --- a/sync_manager.py +++ b/sync_manager.py @@ -139,12 +139,19 @@ class SyncManager: rows_to_append.append(new_row_data) if existing_ids: + # Erstelle ein indiziertes D365-DataFrame für schnellen Zugriff d365_indexed = self.d365_df.set_index('CRM ID') - gsheet_indexed = self.gsheet_df.set_index('CRM ID') + + # --- FINALE KORREKTUR DER ITERATIONS-LOGIK --- + # Wir filtern das GSheet-DataFrame, um nur die bestehenden Zeilen zu bekommen, + # ABER wir behalten seinen ursprünglichen numerischen Index. + gsheet_to_update_df = self.gsheet_df[self.gsheet_df['CRM ID'].isin(existing_ids)] - for row_idx, gsheet_row in gsheet_indexed.iterrows(): - crm_id = gsheet_row.name + # .iterrows() gibt hier den korrekten numerischen Index und die Zeilendaten zurück + for original_row_index, gsheet_row in gsheet_to_update_df.iterrows(): + crm_id = gsheet_row['CRM ID'] if crm_id not in d365_indexed.index: continue + d365_row = d365_indexed.loc[crm_id] row_updates, conflict_messages, needs_reeval = {}, [], False @@ -154,28 +161,18 @@ class SyncManager: gsheet_val = str(gsheet_row[gsheet_col]).strip() is_different = False - - # --- NEUE, VERFEINERTE PRÜFLOGIK --- if gsheet_col == 'CRM Land': translated_d365_val = Config.COUNTRY_CODE_MAP.get(d365_val.lower(), d365_val) if translated_d365_val.lower() != gsheet_val.lower(): is_different = True - elif gsheet_col == 'CRM Anzahl Techniker': - if d365_val == '-1' and gsheet_val == '': - is_different = False # Behandle '-1' und leer als identisch - elif d365_val != gsheet_val: - is_different = True - + if d365_val == '-1' and gsheet_val == '': is_different = False + elif d365_val != gsheet_val: is_different = True elif gsheet_col == 'CRM Branche': - # Überschreibe die CRM Branche nur, wenn unser KI-Feld noch leer ist if gsheet_row['Chat Vorschlag Branche'] == '' and d365_val != gsheet_val: is_different = True - - else: # Standard-Vergleich für alle anderen Felder - if d365_val != gsheet_val: - is_different = True - # --- ENDE DER PRÜFLOGIK --- + else: + if d365_val != gsheet_val: is_different = True if is_different: row_updates[gsheet_col] = d365_val @@ -185,11 +182,9 @@ class SyncManager: for gsheet_col in self.smart_merge_cols: d365_val = str(d365_row.get(gsheet_col, '')).strip() gsheet_val = str(gsheet_row.get(gsheet_col, '')).strip() - if d365_val and not gsheet_val: row_updates[gsheet_col] = d365_val needs_reeval = True - self.logger.debug(f"ReEval für {crm_id} durch '{gsheet_col}' (GSheet war leer): D365='{d365_val}'") elif d365_val and gsheet_val and d365_val != gsheet_val: conflict_messages.append(f"{gsheet_col}_CONFLICT: D365='{d365_val}' | GSHEET='{gsheet_val}'") @@ -197,7 +192,8 @@ class SyncManager: if needs_reeval: row_updates["ReEval Flag"] = "x" if row_updates: - sheet_row_number = row_idx + self.sheet_handler._header_rows + 1 + # Hier ist 'original_row_index' jetzt die korrekte Integer-Zeilennummer + sheet_row_number = original_row_index + self.sheet_handler._header_rows + 1 for col_name, value in row_updates.items(): updates_to_batch.append({ "range": f"{COLUMN_MAP[col_name]['Titel']}{sheet_row_number}", "values": [[value]] })