admin/tradon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch lot sur shipment

Browse Source
This commit is contained in:
laurentbarontini
2026-04-21 22:06:09 +02:00
parent fca279a038
commit edb23b008c
1 changed files with 124 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
modules/automation/cron.py
View File

@@ -11,6 +11,7 @@ import traceback
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class Cron(metaclass=PoolMeta): class Cron(metaclass=PoolMeta):
__name__ = 'ir.cron' __name__ = 'ir.cron'
@@ -18,9 +19,11 @@ class Cron(metaclass=PoolMeta):
def __setup__(cls): def __setup__(cls):
super().__setup__() super().__setup__()
cls.method.selection.append( cls.method.selection.append(
('automation.cron|update_shipment', "Update Shipment from freight booking info") ('automation.cron|update_shipment',
"Update Shipment from freight booking info")
) )
class AutomationCron(ModelSQL, ModelView): class AutomationCron(ModelSQL, ModelView):
"Automation Cron" "Automation Cron"
__name__ = 'automation.cron' __name__ = 'automation.cron'
@@ -30,7 +33,7 @@ class AutomationCron(ModelSQL, ModelView):
('weekly', "Weekly"), ('weekly', "Weekly"),
('monthly', "Monthly"), ('monthly', "Monthly"),
], "Frequency", required=True, ], "Frequency", required=True,
help="How frequently rates must be updated.") help="How frequently rates must be updated.")
last_update = fields.Date("Last Update", required=True) last_update = fields.Date("Last Update", required=True)
@@ -70,22 +73,23 @@ class AutomationCron(ModelSQL, ModelView):
)) ))
rows = cursor.fetchall() rows = cursor.fetchall()
logger.info(f"Nombre total de lignes à traiter : {len(rows)}") logger.info(f"Nombre total de lignes a traiter : {len(rows)}")
# ---- PREMIÈRE TRANSACTION : Création des objets de référence ---- # Premiere transaction : creation des objets de reference
with Transaction().new_transaction() as trans1: with Transaction().new_transaction() as trans1:
try: try:
logger.info("Début de la création des objets de référence...") logger.info(
"Debut de la creation des objets de reference...")
parties_to_save = [] parties_to_save = []
vessels_to_save = [] vessels_to_save = []
locations_to_save = [] locations_to_save = []
parties_cache = {} parties_cache = {}
vessels_cache = {} vessels_cache = {}
locations_cache = {} locations_cache = {}
# Collecter les données des objets de référence # Collecter les donnees des objets de reference
for row in rows: for row in rows:
( (
si_number, si_date, si_quantity, si_unit, si_number, si_date, si_quantity, si_unit,
@@ -97,47 +101,44 @@ class AutomationCron(ModelSQL, ModelView):
comments, fintrade_booking_key comments, fintrade_booking_key
) = row ) = row
# Fonction pour obtenir ou créer un Party
def get_or_create_party(name): def get_or_create_party(name):
if not name: if not name:
return None return None
name_upper = str(name).strip().upper() name_upper = str(name).strip().upper()
if name_upper in parties_cache: if name_upper in parties_cache:
return parties_cache[name_upper] return parties_cache[name_upper]
# Chercher d'abord dans la base existing = Party.search(
existing = Party.search([('name', '=', name_upper)], limit=1) [('name', '=', name_upper)], limit=1)
if existing: if existing:
parties_cache[name_upper] = existing[0] parties_cache[name_upper] = existing[0]
return existing[0] return existing[0]
# Créer un nouveau
new_p = Party() new_p = Party()
new_p.name = name_upper new_p.name = name_upper
parties_cache[name_upper] = new_p parties_cache[name_upper] = new_p
parties_to_save.append(new_p) parties_to_save.append(new_p)
return new_p return new_p
# Fonction pour obtenir ou créer un Vessel
def get_or_create_vessel(name): def get_or_create_vessel(name):
if not name: if not name:
return None return None
name_upper = str(name).strip().upper() name_upper = str(name).strip().upper()
if name_upper in vessels_cache: if name_upper in vessels_cache:
return vessels_cache[name_upper] return vessels_cache[name_upper]
existing = Vessel.search([('vessel_name', '=', name_upper)], limit=1) existing = Vessel.search(
[('vessel_name', '=', name_upper)], limit=1)
if existing: if existing:
vessels_cache[name_upper] = existing[0] vessels_cache[name_upper] = existing[0]
return existing[0] return existing[0]
new_v = Vessel() new_v = Vessel()
new_v.vessel_name = name_upper new_v.vessel_name = name_upper
vessels_cache[name_upper] = new_v vessels_cache[name_upper] = new_v
vessels_to_save.append(new_v) vessels_to_save.append(new_v)
return new_v return new_v
# Fonction pour obtenir ou créer une Location
def get_or_create_location(name, type_): def get_or_create_location(name, type_):
if not name: if not name:
return None return None
@@ -145,16 +146,15 @@ class AutomationCron(ModelSQL, ModelView):
key = f"{name_upper}_{type_}" key = f"{name_upper}_{type_}"
if key in locations_cache: if key in locations_cache:
return locations_cache[key] return locations_cache[key]
existing = Location.search([ existing = Location.search([
('name', '=', name_upper), ('name', '=', name_upper),
('type', '=', type_) ('type', '=', type_),
], limit=1) ], limit=1)
if existing: if existing:
locations_cache[key] = existing[0] locations_cache[key] = existing[0]
return existing[0] return existing[0]
new_loc = Location() new_loc = Location()
new_loc.name = name_upper new_loc.name = name_upper
new_loc.type = type_ new_loc.type = type_
@@ -162,40 +162,40 @@ class AutomationCron(ModelSQL, ModelView):
locations_to_save.append(new_loc) locations_to_save.append(new_loc)
return new_loc return new_loc
# Collecter les objets à créer
_ = get_or_create_party(carrier_name) _ = get_or_create_party(carrier_name)
_ = get_or_create_party(agent_name) _ = get_or_create_party(agent_name)
_ = get_or_create_vessel(vessel_name) _ = get_or_create_vessel(vessel_name)
_ = get_or_create_location(loading_name, 'supplier') _ = get_or_create_location(loading_name, 'supplier')
_ = get_or_create_location(destination_name, 'customer') _ = get_or_create_location(destination_name, 'customer')
# Sauvegarder tous les objets de référence
if parties_to_save: if parties_to_save:
logger.info(f"Création de {len(parties_to_save)} parties...") logger.info(f"Creation de {len(parties_to_save)} parties...")
Party.save(parties_to_save) Party.save(parties_to_save)
if vessels_to_save: if vessels_to_save:
logger.info(f"Création de {len(vessels_to_save)} vessels...") logger.info(f"Creation de {len(vessels_to_save)} vessels...")
Vessel.save(vessels_to_save) Vessel.save(vessels_to_save)
if locations_to_save: if locations_to_save:
logger.info(f"Création de {len(locations_to_save)} locations...") logger.info(
f"Creation de {len(locations_to_save)} locations...")
Location.save(locations_to_save) Location.save(locations_to_save)
trans1.commit() trans1.commit()
logger.info("Première transaction commitée : objets de référence créés") logger.info(
"Premiere transaction commitee : objets de reference crees")
except Exception as e: except Exception as e:
trans1.rollback() trans1.rollback()
logger.error(f"Erreur dans la création des objets de référence : {e}") logger.error(
f"Erreur dans la creation des objets de reference : {e}")
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
raise raise
# ---- TRANSACTIONS INDIVIDUELLES pour chaque shipment ---- # Transactions individuelles pour chaque shipment
successful_shipments = 0 successful_shipments = 0
failed_shipments = [] failed_shipments = []
# Recréer le curseur après la nouvelle transaction
cursor2 = Transaction().connection.cursor() cursor2 = Transaction().connection.cursor()
cursor2.execute(*t.select( cursor2.execute(*t.select(
t.ShippingInstructionNumber, t.ShippingInstructionNumber,
@@ -218,7 +218,7 @@ class AutomationCron(ModelSQL, ModelView):
)) ))
rows2 = cursor2.fetchall() rows2 = cursor2.fetchall()
for i, row in enumerate(rows2, 1): for i, row in enumerate(rows2, 1):
( (
si_number, si_date, si_quantity, si_unit, si_number, si_date, si_quantity, si_unit,
@@ -229,46 +229,79 @@ class AutomationCron(ModelSQL, ModelView):
etd_date, bl_date, controller, etd_date, bl_date, controller,
comments, fintrade_booking_key comments, fintrade_booking_key
) = row ) = row
logger.info(f"Traitement shipment {i}/{len(rows2)} : SI {si_number}") logger.info(f"Traitement shipment {i}/{len(rows2)} : SI {si_number}")
# ---- TRANSACTION INDIVIDUELLE pour ce shipment ----
try: try:
with Transaction().new_transaction() as trans_shipment: with Transaction().new_transaction() as trans_shipment:
logger.info(f"Début transaction pour SI {si_number}") logger.info(f"Debut transaction pour SI {si_number}")
# Vérifier si le shipment existe déjà
existing_shipment = ShipmentIn.search([ existing_shipment = ShipmentIn.search([
('reference', '=', si_number) ('reference', '=', si_number)
], limit=1) ], limit=1)
if existing_shipment: if existing_shipment:
logger.info(f"Shipment {si_number} existe déjà, ignoré") shipment = existing_shipment[0]
if shipment.incoming_moves:
logger.info(
"Shipment %s existe deja avec lots, ignore",
si_number)
trans_shipment.commit()
continue
logger.info(
"Shipment %s existe deja sans lots, verification freight_booking_lots",
si_number)
inv_date, inv_nb = shipment._create_lots_from_fintrade()
shipment = ShipmentIn(shipment.id)
if shipment.incoming_moves:
shipment.controller = shipment.get_controller()
shipment.controller_target = controller
if not shipment.fees:
shipment.create_fee(shipment.controller)
shipment.instructions = shipment.get_instructions_html(
inv_date, inv_nb)
ShipmentIn.save([shipment])
logger.info(
"Shipment %s mis a jour avec %s incoming move(s)",
si_number, len(shipment.incoming_moves))
else:
logger.info(
"Shipment %s existe sans lots et aucun lot disponible pour l'instant",
si_number)
trans_shipment.commit() trans_shipment.commit()
continue continue
# Récupérer les objets (maintenant ils existent dans la base)
carrier = None carrier = None
if carrier_name: if carrier_name:
carrier_list = Party.search([('name', '=', str(carrier_name).strip().upper())], limit=1) carrier_list = Party.search([
('name', '=',
str(carrier_name).strip().upper())
], limit=1)
if carrier_list: if carrier_list:
carrier = carrier_list[0] carrier = carrier_list[0]
logger.info(f"Carrier trouvé pour {si_number}: {carrier.name}") logger.info(
f"Carrier trouve pour {si_number}: {carrier.name}")
else: else:
logger.warning(f"Carrier NON TROUVÉ pour {si_number}: '{carrier_name}'") logger.warning(
f"Carrier NON TROUVE pour {si_number}: '{carrier_name}'")
agent = None agent = None
agent_list = Party.search([
agent_list = Party.search([('name', '=', str(agent_name or 'TBN').strip().upper())], limit=1) ('name', '=', str(agent_name or 'TBN').strip().upper())
], limit=1)
if agent_list: if agent_list:
agent = agent_list[0] agent = agent_list[0]
vessel = None vessel = None
if vessel_name: if vessel_name:
vessel_list = Vessel.search([('vessel_name', '=', str(vessel_name).strip().upper())], limit=1) vessel_list = Vessel.search([
('vessel_name', '=',
str(vessel_name).strip().upper())
], limit=1)
if vessel_list: if vessel_list:
vessel = vessel_list[0] vessel = vessel_list[0]
loc_from = None loc_from = None
if loading_name: if loading_name:
loc_from_list = Location.search([ loc_from_list = Location.search([
@@ -277,7 +310,7 @@ class AutomationCron(ModelSQL, ModelView):
], limit=1) ], limit=1)
if loc_from_list: if loc_from_list:
loc_from = loc_from_list[0] loc_from = loc_from_list[0]
loc_to = None loc_to = None
if destination_name: if destination_name:
loc_to_list = Location.search([ loc_to_list = Location.search([
@@ -286,19 +319,19 @@ class AutomationCron(ModelSQL, ModelView):
], limit=1) ], limit=1)
if loc_to_list: if loc_to_list:
loc_to = loc_to_list[0] loc_to = loc_to_list[0]
# Vérification critique du carrier
if not carrier: if not carrier:
error_msg = f"ERREUR CRITIQUE: Carrier manquant pour SI {si_number} (valeur: '{carrier_name}')" error_msg = (
f"ERREUR CRITIQUE: Carrier manquant pour SI {si_number} "
f"(valeur: '{carrier_name}')")
logger.error(error_msg) logger.error(error_msg)
raise ValueError(error_msg) raise ValueError(error_msg)
# Créer le shipment
shipment = ShipmentIn() shipment = ShipmentIn()
shipment.reference = si_number shipment.reference = si_number
shipment.from_location = loc_from shipment.from_location = loc_from
shipment.to_location = loc_to shipment.to_location = loc_to
shipment.carrier = None #carrier shipment.carrier = None # carrier
shipment.supplier = agent shipment.supplier = agent
shipment.agent = agent shipment.agent = agent
shipment.vessel = vessel shipment.vessel = vessel
@@ -307,21 +340,20 @@ class AutomationCron(ModelSQL, ModelView):
shipment.bl_date = bl_date shipment.bl_date = bl_date
shipment.etd = etd_date shipment.etd = etd_date
shipment.etad = shipment.bl_date + timedelta(days=20) shipment.etad = shipment.bl_date + timedelta(days=20)
# Sauvegarder ce shipment uniquement
ShipmentIn.save([shipment]) ShipmentIn.save([shipment])
inv_date,inv_nb = shipment._create_lots_from_fintrade() inv_date, inv_nb = shipment._create_lots_from_fintrade()
shipment.controller = shipment.get_controller() shipment.controller = shipment.get_controller()
shipment.controller_target = controller shipment.controller_target = controller
shipment.create_fee(shipment.controller) shipment.create_fee(shipment.controller)
shipment.instructions = shipment.get_instructions_html(inv_date,inv_nb) shipment.instructions = shipment.get_instructions_html(
inv_date, inv_nb)
ShipmentIn.save([shipment]) ShipmentIn.save([shipment])
trans_shipment.commit() trans_shipment.commit()
successful_shipments += 1 successful_shipments += 1
logger.info(f"✓ Shipment {si_number} créé avec succès") logger.info(f"Shipment {si_number} cree avec succes")
except Exception as e: except Exception as e:
# Cette transaction échoue mais les autres continuent
error_details = { error_details = {
'si_number': si_number, 'si_number': si_number,
'carrier_name': carrier_name, 'carrier_name': carrier_name,
@@ -329,8 +361,8 @@ class AutomationCron(ModelSQL, ModelView):
'traceback': traceback.format_exc() 'traceback': traceback.format_exc()
} }
failed_shipments.append(error_details) failed_shipments.append(error_details)
logger.error(f"✗ ERREUR pour shipment {si_number}: {e}") logger.error(f"ERREUR pour shipment {si_number}: {e}")
logger.error(f" Carrier: '{carrier_name}'") logger.error(f" Carrier: '{carrier_name}'")
logger.error(f" Agent: '{agent_name}'") logger.error(f" Agent: '{agent_name}'")
logger.error(f" Vessel: '{vessel_name}'") logger.error(f" Vessel: '{vessel_name}'")
@@ -338,24 +370,22 @@ class AutomationCron(ModelSQL, ModelView):
for line in traceback.format_exc().split('\n'): for line in traceback.format_exc().split('\n'):
if line.strip(): if line.strip():
logger.error(f" {line}") logger.error(f" {line}")
# ---- RÉSUMÉ FINAL ----
logger.info("=" * 60) logger.info("=" * 60)
logger.info("RÉSUMÉ DE L'EXÉCUTION") logger.info("RESUME DE L'EXECUTION")
logger.info("=" * 60) logger.info("=" * 60)
logger.info(f"Total de shipments à traiter : {len(rows2)}") logger.info(f"Total de shipments a traiter : {len(rows2)}")
logger.info(f"Shipments créés avec succès : {successful_shipments}") logger.info(f"Shipments crees avec succes : {successful_shipments}")
logger.info(f"Shipments en échec : {len(failed_shipments)}") logger.info(f"Shipments en echec : {len(failed_shipments)}")
if failed_shipments: if failed_shipments:
logger.info("\nDétail des échecs :") logger.info("\nDetail des echecs :")
for i, error in enumerate(failed_shipments, 1): for i, error in enumerate(failed_shipments, 1):
logger.info(f" {i}. SI {error['si_number']}:") logger.info(f" {i}. SI {error['si_number']}:")
logger.info(f" Carrier: '{error['carrier_name']}'") logger.info(f" Carrier: '{error['carrier_name']}'")
logger.info(f" Erreur: {error['error']}") logger.info(f" Erreur: {error['error']}")
# Log supplémentaire pour debug logger.info("\nAnalyse des carriers problematiques :")
logger.info("\nAnalyse des carriers problématiques :")
problematic_carriers = {} problematic_carriers = {}
for error in failed_shipments: for error in failed_shipments:
carrier = error['carrier_name'] carrier = error['carrier_name']
@@ -363,15 +393,16 @@ class AutomationCron(ModelSQL, ModelView):
problematic_carriers[carrier] += 1 problematic_carriers[carrier] += 1
else: else:
problematic_carriers[carrier] = 1 problematic_carriers[carrier] = 1
for carrier, count in problematic_carriers.items(): for carrier, count in problematic_carriers.items():
logger.info(f" Carrier '{carrier}' : {count} échec(s)") logger.info(f" Carrier '{carrier}' : {count} echec(s)")
existing = Party.search([
# Vérifier si ce carrier existe dans la base ('name', '=', str(carrier).strip().upper())
existing = Party.search([('name', '=', str(carrier).strip().upper())], limit=1) ], limit=1)
if existing: if existing:
logger.info(f" → EXISTE DANS LA BASE (ID: {existing[0].id})") logger.info(
f" -> EXISTE DANS LA BASE (ID: {existing[0].id})")
else: else:
logger.info(f" → N'EXISTE PAS DANS LA BASE") logger.info(" -> N'EXISTE PAS DANS LA BASE")
logger.info("=" * 60) logger.info("=" * 60)