Eduardo_Scripniciuc/st-ten-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev

Browse Source
This commit is contained in:
edo-neo 2025-11-11 15:16:03 +01:00
parent 5b41cb3805
commit 8ca97c9770
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/machine_settings/st-ten-12.ini
View File

@ -41,6 +41,7 @@ recipe_name_field: codice_ricetta
part_number_field: codice_ricetta part_number_field: codice_ricetta
label_template_field: modello_etichetta label_template_field: modello_etichetta
description_field: descrizione description_field: descrizione
codice_dima_field:
[recipes_defaults] [recipes_defaults]
tester_discharge_enable: yes tester_discharge_enable: yes

10
src/lib/helpers/recipe_manager.py
View File

@ -206,6 +206,7 @@ def import_recipes(config, csv_path=None, defaults=None, unsupported_steps=None,
recipe_name_field = config.get("recipe", {}).get("recipe_name_field", "codice_ricetta").strip() recipe_name_field = config.get("recipe", {}).get("recipe_name_field", "codice_ricetta").strip()
part_number_field = config.get("recipe", {}).get("part_number_field", "part_number").strip() part_number_field = config.get("recipe", {}).get("part_number_field", "part_number").strip()
description_field = config.get("recipe", {}).get("description_field", "descrizione").strip() description_field = config.get("recipe", {}).get("description_field", "descrizione").strip()
codice_dima_field = config.get("recipe", {}).get("codice_dima_field", "codice_dima").strip()
barcode_enable_field = config.get( barcode_enable_field = config.get(
"recipe", {} "recipe", {}
).get("barcode_enable_field", "verifica_codice_a_barre_abilitata").strip() ).get("barcode_enable_field", "verifica_codice_a_barre_abilitata").strip()
@ -237,8 +238,8 @@ def import_recipes(config, csv_path=None, defaults=None, unsupported_steps=None,
recipe.client = row.get("cliente", defaults["cliente"]) recipe.client = row.get("cliente", defaults["cliente"])
recipe.part_number = row.get(part_number_field, defaults["part_number"]) recipe.part_number = row.get(part_number_field, defaults["part_number"])
recipe.description = row.get(description_field, defaults["descrizione"]) recipe.description = row.get(description_field, defaults["descrizione"])
# New field: Codice Dima (supports both 'codice_dima' and 'codice dima' in CSV) # New field: Codice Dima (supports mapping and common variants)
recipe.codice_dima = row.get("codice_dima", row.get("codice_dima", None)) recipe.codice_dima = (row.get(codice_dima_field) or row.get("codice_dima") or row.get("codice dima") or None)
# Recipe specifications # Recipe specifications
steps = {} steps = {}
@ -327,6 +328,7 @@ def export_recipes(config, csv_path=None, logger=None):
os.makedirs(os.path.dirname(csv_path), exist_ok=True) os.makedirs(os.path.dirname(csv_path), exist_ok=True)
recipe_name_field = config.get("recipe", {}).get("recipe_name_field", "codice_ricetta").strip() recipe_name_field = config.get("recipe", {}).get("recipe_name_field", "codice_ricetta").strip()
codice_dima_field = config.get("recipe", {}).get("codice_dima_field", "codice_dima").strip()
barcode_enable_field = config.get("recipe", {}).get("barcode_enable_field", barcode_enable_field = config.get("recipe", {}).get("barcode_enable_field",
"verifica_codice_a_barre_abilitata").strip() "verifica_codice_a_barre_abilitata").strip()
barcode_serial_field = config.get("recipe", {}).get("barcode_serial_field", "codice_a_barre").strip() barcode_serial_field = config.get("recipe", {}).get("barcode_serial_field", "codice_a_barre").strip()
@ -345,11 +347,11 @@ def export_recipes(config, csv_path=None, logger=None):
recipe_name_field: recipe.name, recipe_name_field: recipe.name,
"cliente": recipe.client, "cliente": recipe.client,
"part_number": recipe.part_number, "part_number": recipe.part_number,
"codice_dima": getattr(recipe, "codice_dima", None), codice_dima_field: getattr(recipe, "codice_dima", None),
} }
# Add base fields to the fieldnames # Add base fields to the fieldnames
fieldnames.update([recipe_name_field, "cliente", "part_number"]) fieldnames.update([recipe_name_field, "cliente", "part_number", codice_dima_field])
# Check and add steps conditionally # Check and add steps conditionally
if "connector" in steps: if "connector" in steps: