feat(invoice+import): refresh facturi, detalii factura, fix duplicate CODMAT + rollback
- PL/SQL: handle duplicate CODMAT in nom_articole with MAX(id_articol) - import_service: add explicit conn.rollback() on Oracle errors - sync_service: auto-fix stale ERROR orders that exist in Oracle - invoice_service: add data_act (invoice date) from vanzari table - sync router: new POST /api/dashboard/refresh-invoices endpoint - order detail: enrich with invoice data (serie, numar, data factura) - dashboard: refresh invoices button (desktop + mobile icon) - quick map modal: compact single-row layout, pre-populate existing mappings - quick map: link on SKU column instead of CODMAT Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Agent
@@ -330,6 +330,39 @@ async def order_detail(order_number: str):
|
||||
if sku and sku in codmat_map:
|
||||
item["codmat_details"] = codmat_map[sku]
|
||||
|
||||
# Enrich with invoice data
|
||||
order = detail.get("order", {})
|
||||
if order.get("factura_numar"):
|
||||
order["invoice"] = {
|
||||
"facturat": True,
|
||||
"serie_act": order.get("factura_serie"),
|
||||
"numar_act": order.get("factura_numar"),
|
||||
"data_act": order.get("factura_data"),
|
||||
"total_fara_tva": order.get("factura_total_fara_tva"),
|
||||
"total_tva": order.get("factura_total_tva"),
|
||||
"total_cu_tva": order.get("factura_total_cu_tva"),
|
||||
}
|
||||
elif order.get("id_comanda"):
|
||||
# Check Oracle live
|
||||
try:
|
||||
inv_data = await asyncio.to_thread(
|
||||
invoice_service.check_invoices_for_orders, [order["id_comanda"]]
|
||||
)
|
||||
inv = inv_data.get(order["id_comanda"])
|
||||
if inv and inv.get("facturat"):
|
||||
order["invoice"] = inv
|
||||
await sqlite_service.update_order_invoice(
|
||||
order_number,
|
||||
serie=inv.get("serie_act"),
|
||||
numar=str(inv.get("numar_act", "")),
|
||||
total_fara_tva=inv.get("total_fara_tva"),
|
||||
total_tva=inv.get("total_tva"),
|
||||
total_cu_tva=inv.get("total_cu_tva"),
|
||||
data_act=inv.get("data_act"),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return detail
|
||||
|
||||
|
||||
@@ -372,6 +405,7 @@ async def dashboard_orders(page: int = 1, per_page: int = 50,
|
||||
"total_fara_tva": o.get("factura_total_fara_tva"),
|
||||
"total_tva": o.get("factura_total_tva"),
|
||||
"total_cu_tva": o.get("factura_total_cu_tva"),
|
||||
"data_act": o.get("factura_data"),
|
||||
}
|
||||
else:
|
||||
o["invoice"] = None
|
||||
@@ -388,6 +422,18 @@ async def dashboard_orders(page: int = 1, per_page: int = 50,
|
||||
idc = o.get("id_comanda")
|
||||
if idc and idc in invoice_data:
|
||||
o["invoice"] = invoice_data[idc]
|
||||
# Update SQLite cache so counts stay accurate
|
||||
inv = invoice_data[idc]
|
||||
if inv.get("facturat"):
|
||||
await sqlite_service.update_order_invoice(
|
||||
o["order_number"],
|
||||
serie=inv.get("serie_act"),
|
||||
numar=str(inv.get("numar_act", "")),
|
||||
total_fara_tva=inv.get("total_fara_tva"),
|
||||
total_tva=inv.get("total_tva"),
|
||||
total_cu_tva=inv.get("total_cu_tva"),
|
||||
data_act=inv.get("data_act"),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
@@ -400,11 +446,14 @@ async def dashboard_orders(page: int = 1, per_page: int = 50,
|
||||
|
||||
# Use counts from sqlite_service (already period-scoped)
|
||||
counts = result.get("counts", {})
|
||||
# Prefer SQLite-based uninvoiced count (covers full period, not just current page)
|
||||
counts["nefacturate"] = counts.get("uninvoiced_sqlite", sum(
|
||||
# Count newly-cached invoices found during this request
|
||||
newly_invoiced = sum(1 for o in uncached_orders if o.get("invoice") and o["invoice"].get("facturat"))
|
||||
# Adjust uninvoiced count: start from SQLite count, subtract newly-found invoices
|
||||
uninvoiced_base = counts.get("uninvoiced_sqlite", sum(
|
||||
1 for o in all_orders
|
||||
if o.get("status") in ("IMPORTED", "ALREADY_IMPORTED") and not o.get("invoice")
|
||||
))
|
||||
counts["nefacturate"] = max(0, uninvoiced_base - newly_invoiced)
|
||||
imported_total = counts.get("imported_all") or counts.get("imported", 0)
|
||||
counts["facturate"] = max(0, imported_total - counts["nefacturate"])
|
||||
counts.setdefault("total", counts.get("imported", 0) + counts.get("skipped", 0) + counts.get("error", 0))
|
||||
@@ -441,6 +490,38 @@ async def dashboard_orders(page: int = 1, per_page: int = 50,
|
||||
}
|
||||
|
||||
|
||||
@router.post("/api/dashboard/refresh-invoices")
|
||||
async def refresh_invoices():
|
||||
"""Force-refresh invoice status from Oracle for all uninvoiced imported orders."""
|
||||
try:
|
||||
uninvoiced = await sqlite_service.get_uninvoiced_imported_orders()
|
||||
if not uninvoiced:
|
||||
return {"updated": 0, "message": "Nicio comanda de verificat"}
|
||||
|
||||
id_comanda_list = [o["id_comanda"] for o in uninvoiced]
|
||||
invoice_data = await asyncio.to_thread(
|
||||
invoice_service.check_invoices_for_orders, id_comanda_list
|
||||
)
|
||||
id_to_order = {o["id_comanda"]: o["order_number"] for o in uninvoiced}
|
||||
updated = 0
|
||||
for idc, inv in invoice_data.items():
|
||||
order_num = id_to_order.get(idc)
|
||||
if order_num and inv.get("facturat"):
|
||||
await sqlite_service.update_order_invoice(
|
||||
order_num,
|
||||
serie=inv.get("serie_act"),
|
||||
numar=str(inv.get("numar_act", "")),
|
||||
total_fara_tva=inv.get("total_fara_tva"),
|
||||
total_tva=inv.get("total_tva"),
|
||||
total_cu_tva=inv.get("total_cu_tva"),
|
||||
data_act=inv.get("data_act"),
|
||||
)
|
||||
updated += 1
|
||||
return {"updated": updated, "checked": len(uninvoiced)}
|
||||
except Exception as e:
|
||||
return {"error": str(e), "updated": 0}
|
||||
|
||||
|
||||
@router.put("/api/sync/schedule")
|
||||
async def update_schedule(config: ScheduleConfig):
|
||||
"""Update scheduler configuration."""
|
||||
|
||||
Reference in New Issue
Block a user