Compare commits

...

2 Commits

Author SHA1 Message Date
f4e73bd5b9 Recupera movimenti barcode dopo risposta persa 2026-07-04 09:05:14 +02:00
e575c748cc Rafforza controlli carico barcode 2026-07-03 15:40:06 +02:00
4 changed files with 226 additions and 23 deletions

View File

@@ -410,6 +410,9 @@ class BarcodeClientApp:
lambda q=next_queue: self._start_queue(q), lambda q=next_queue: self._start_queue(q),
) )
if bool(getattr(state, "focus_destination", False)):
self.root.after(20, self._focus_destination_input)
else:
self.root.after(20, self._focus_primary_input) self.root.after(20, self._focus_primary_input)
def _focus_primary_input(self) -> None: def _focus_primary_input(self) -> None:
@@ -578,10 +581,25 @@ class BarcodeClientApp:
result = future.result() result = future.result()
except Exception as exc: except Exception as exc:
log_exception("Barcode WMS", exc, context="barcode async operation") log_exception("Barcode WMS", exc, context="barcode async operation")
current = self.service.state self._set_busy(True, "Verifico esito...")
current.status_text = "Transazione non completata, ripeti l'operazione." self._pending = asyncio.run_coroutine_threadsafe(
current.status_color = "#f4cccc" self.service.reconcile_after_submit_exception(
self._apply_state(current) scanned_pallet=self.scanned_var.get(),
destination_barcode=self.destination_var.get(),
),
self.loop,
)
self.root.after(40, lambda err=exc: self._poll_recovery_future(err))
return
if isinstance(result, BarcodeActionResult):
self._apply_state(result.state)
if result.message and not result.ok:
self.root.bell()
elif isinstance(result, BarcodeViewState):
self._apply_state(result)
def _show_transaction_error(self) -> None:
messagebox.showerror( messagebox.showerror(
"Barcode WMS", "Barcode WMS",
"Operazione non completata.\n\n" "Operazione non completata.\n\n"
@@ -589,12 +607,35 @@ class BarcodeClientApp:
"Il dettaglio tecnico e' stato scritto nel log.", "Il dettaglio tecnico e' stato scritto nel log.",
parent=self.root, parent=self.root,
) )
def _poll_recovery_future(self, original_exception: Exception) -> None:
if self._pending is None:
self._set_busy(False)
self._show_transaction_error()
return
if not self._pending.done():
self.root.after(40, lambda err=original_exception: self._poll_recovery_future(err))
return
future = self._pending
self._pending = None
self._set_busy(False)
try:
result = future.result()
except Exception as exc:
log_exception("Barcode WMS", exc, context=f"barcode recovery after {original_exception!r}")
current = self.service.state
current.status_text = "Transazione non completata, ripeti l'operazione."
current.status_color = "#f4cccc"
self._apply_state(current)
self._show_transaction_error()
return return
if isinstance(result, BarcodeActionResult): if isinstance(result, BarcodeActionResult):
self._apply_state(result.state) self._apply_state(result.state)
if result.message and not result.ok: if not result.ok:
self.root.bell() self.root.bell()
self._show_transaction_error()
elif isinstance(result, BarcodeViewState): elif isinstance(result, BarcodeViewState):
self._apply_state(result) self._apply_state(result)

View File

@@ -86,6 +86,15 @@ WHERE g.BarcodePallet = :pallet
ORDER BY g.IDCella; ORDER BY g.IDCella;
""" """
SQL_OPEN_PALLETS_BY_CELL = """
SELECT
g.BarcodePallet,
g.IDCella
FROM dbo.XMag_GiacenzaPallet AS g
WHERE g.IDCella = :id_cella
ORDER BY g.BarcodePallet;
"""
SQL_RESOLVE_PHYSICAL_CELL = """ SQL_RESOLVE_PHYSICAL_CELL = """
DECLARE @raw int = TRY_CONVERT(int, :destination); DECLARE @raw int = TRY_CONVERT(int, :destination);
DECLARE @cell_id int = DECLARE @cell_id int =
@@ -204,6 +213,12 @@ class BarcodeRepository:
res = await self.db_client.query_json(SQL_OPEN_LOCATIONS_BY_PALLET, {"pallet": str(pallet or "").strip()}) res = await self.db_client.query_json(SQL_OPEN_LOCATIONS_BY_PALLET, {"pallet": str(pallet or "").strip()})
return _rows_to_dicts(res) return _rows_to_dicts(res)
async def fetch_open_pallets_by_cell(self, id_cella: int) -> list[dict[str, Any]]:
"""Return pallets currently present in a physical cell."""
res = await self.db_client.query_json(SQL_OPEN_PALLETS_BY_CELL, {"id_cella": int(id_cella)})
return _rows_to_dicts(res)
async def resolve_physical_cell(self, destination: str) -> DestinationCell | None: async def resolve_physical_cell(self, destination: str) -> DestinationCell | None:
"""Accept either an internal cell ID or the scanned legacy cell barcode.""" """Accept either an internal cell ID or the scanned legacy cell barcode."""

View File

@@ -30,6 +30,7 @@ class BarcodeViewState:
scanned_pallet: str = "" scanned_pallet: str = ""
auto_advance_delay_ms: int = 0 auto_advance_delay_ms: int = 0
destination_readonly: bool = False destination_readonly: bool = False
focus_destination: bool = False
@dataclass @dataclass
@@ -176,9 +177,78 @@ class BarcodeService:
self._state.status_color = self.RED self._state.status_color = self.RED
return BarcodeActionResult(False, self._state, self._state.status_text) return BarcodeActionResult(False, self._state, self._state.status_text)
target_barcode = destination
target_numero_cella = int(destination)
target_id_cella = 9999 if destination == self.SHIPPED_BARCODE else (1000 if destination == self.NON_SCAFFALATA_BARCODE else None)
target_display = destination
if is_direct_load:
resolved_cell = await self.repository.resolve_physical_cell(destination)
if not resolved_cell:
self._state.scanned_pallet = pallet
self._state.destination_barcode = destination
self._state.status_text = f"Cella non valida: {destination}."
self._state.status_color = self.RED
self._state.focus_destination = True
return BarcodeActionResult(False, self._state, self._state.status_text)
occupants = await self.repository.fetch_open_pallets_by_cell(resolved_cell.id_cella)
if occupants:
log_runtime_event(
"Barcode WMS",
(
"MOVE BLOCKED DESTINATION_OCCUPIED "
f"pallet={pallet} "
f"cell={resolved_cell.id_cella} "
f"occupants={','.join(str(row.get('BarcodePallet') or '') for row in occupants)}"
),
)
self._state.scanned_pallet = pallet
self._state.destination_barcode = destination
self._state.status_text = "Errore: cella scelta occupata, cambiare cella di destinazione."
self._state.status_color = self.RED
self._state.destination_readonly = False
self._state.focus_destination = True
return BarcodeActionResult(False, self._state, self._state.status_text)
target_barcode = resolved_cell.barcode_cella
target_numero_cella = resolved_cell.numero_cella
target_id_cella = resolved_cell.id_cella
target_display = resolved_cell.ubicazione or destination
current_location = await self.repository.fetch_current_location_by_pallet(pallet) current_location = await self.repository.fetch_current_location_by_pallet(pallet)
picking_before_move = await self.repository.fetch_picking_by_pallet(pallet) picking_before_move = await self.repository.fetch_picking_by_pallet(pallet)
if not current_location and not picking_before_move: if not current_location and not picking_before_move:
if is_direct_load:
trace_row = await self.repository.fetch_trace_by_pallet(pallet)
if not trace_row:
self._state.scanned_pallet = pallet
self._state.destination_barcode = destination
self._state.status_text = "Errore: UDC non riconosciuta in ERP/SAM."
self._state.status_color = self.RED
return BarcodeActionResult(False, self._state, self._state.status_text)
log_runtime_event(
"Barcode WMS",
f"AUTO INTAKE NON_SHELVED pallet={pallet} before_cell={target_id_cella}",
)
await self.repository.execute_legacy_move(
operator_id=self.operator_id,
barcode_cella=self.NON_SCAFFALATA_BARCODE,
barcode_pallet=pallet,
numero_cella=int(self.NON_SCAFFALATA_BARCODE),
)
current_location = await self.repository.fetch_current_location_by_pallet(pallet)
try:
current_id_cella = int((current_location or {}).get("IDCella") or 0)
except Exception:
current_id_cella = 0
if current_id_cella != 1000:
self._state.scanned_pallet = pallet
self._state.destination_barcode = destination
self._state.status_text = "Movimento non confermato: ingresso UDC non scaffalata non riuscito."
self._state.status_color = self.RED
return BarcodeActionResult(False, self._state, self._state.status_text)
else:
self._state.scanned_pallet = pallet self._state.scanned_pallet = pallet
self._state.status_text = "UDC non presente a magazzino." self._state.status_text = "UDC non presente a magazzino."
self._state.status_color = self.RED self._state.status_color = self.RED
@@ -205,16 +275,13 @@ class BarcodeService:
self._state.status_color = self.RED self._state.status_color = self.RED
return BarcodeActionResult(False, self._state, self._state.status_text) return BarcodeActionResult(False, self._state, self._state.status_text)
target_barcode = destination if not is_direct_load and destination not in (self.NON_SCAFFALATA_BARCODE, self.SHIPPED_BARCODE):
target_numero_cella = int(destination)
target_id_cella = 9999 if destination == self.SHIPPED_BARCODE else (1000 if destination == self.NON_SCAFFALATA_BARCODE else None)
target_display = destination
if destination not in (self.NON_SCAFFALATA_BARCODE, self.SHIPPED_BARCODE):
resolved_cell = await self.repository.resolve_physical_cell(destination) resolved_cell = await self.repository.resolve_physical_cell(destination)
if not resolved_cell: if not resolved_cell:
self._state.scanned_pallet = pallet self._state.scanned_pallet = pallet
self._state.status_text = f"Cella non valida: {destination}." self._state.status_text = f"Cella non valida: {destination}."
self._state.status_color = self.RED self._state.status_color = self.RED
self._state.focus_destination = True
return BarcodeActionResult(False, self._state, self._state.status_text) return BarcodeActionResult(False, self._state, self._state.status_text)
target_barcode = resolved_cell.barcode_cella target_barcode = resolved_cell.barcode_cella
target_numero_cella = resolved_cell.numero_cella target_numero_cella = resolved_cell.numero_cella
@@ -346,6 +413,86 @@ class BarcodeService:
return await self.submit(scanned_pallet=pallet, destination_barcode=self.NON_SCAFFALATA_BARCODE) return await self.submit(scanned_pallet=pallet, destination_barcode=self.NON_SCAFFALATA_BARCODE)
async def reconcile_after_submit_exception(
self,
*,
scanned_pallet: str,
destination_barcode: str,
) -> BarcodeActionResult:
"""Check whether a failed client round-trip actually committed on SQL Server."""
pallet = str(scanned_pallet or "").strip()
destination = str(destination_barcode or "").strip()
if not pallet or not destination or not destination.isdigit():
self._state.status_text = "Transazione non completata, ripeti l'operazione."
self._state.status_color = self.RED
return BarcodeActionResult(False, self._state, self._state.status_text)
target_id_cella = 9999 if destination == self.SHIPPED_BARCODE else (1000 if destination == self.NON_SCAFFALATA_BARCODE else None)
target_display = destination
if target_id_cella is None:
resolved_cell = await self.repository.resolve_physical_cell(destination)
if not resolved_cell:
self._state.scanned_pallet = pallet
self._state.destination_barcode = destination
self._state.status_text = "Transazione non completata, ripeti l'operazione."
self._state.status_color = self.RED
self._state.focus_destination = True
return BarcodeActionResult(False, self._state, self._state.status_text)
target_id_cella = int(resolved_cell.id_cella)
target_display = resolved_cell.ubicazione or destination
current_location = await self.repository.fetch_current_location_by_pallet(pallet)
try:
current_id_cella = int((current_location or {}).get("IDCella") or 0)
except Exception:
current_id_cella = 0
if current_id_cella != target_id_cella:
log_runtime_event(
"Barcode WMS",
(
"MOVE RECOVERY NOT_CONFIRMED "
f"pallet={pallet} "
f"destination={destination} "
f"expected_cell={target_id_cella} "
f"actual_cell={current_id_cella}"
),
)
self._state.scanned_pallet = pallet
self._state.destination_barcode = destination
self._state.status_text = "Transazione non completata, ripeti l'operazione."
self._state.status_color = self.RED
return BarcodeActionResult(False, self._state, self._state.status_text)
last_priority_state = self._current_priority_state
is_recovered_picking = bool(destination == self.SHIPPED_BARCODE and last_priority_state in (0, 1))
auto_advance_delay_ms = 3000 if is_recovered_picking else 5000
state = await self._build_post_move_state(
barcode_pallet=pallet,
destination_barcode=destination,
destination_display=target_display,
last_priority_state=last_priority_state,
auto_advance_delay_ms=auto_advance_delay_ms,
)
state.status_text = (
"Ok Scarico - risposta persa recuperata"
if is_recovered_picking
else "Movimento completato - risposta persa recuperata"
)
state.status_color = self.GREEN_YELLOW
self._state = state
log_runtime_event(
"Barcode WMS",
(
"MOVE RECOVERY CONFIRMED "
f"pallet={pallet} "
f"destination={destination} "
f"cell={target_id_cella}"
),
)
return BarcodeActionResult(True, self._state, self._state.status_text)
async def _build_post_move_state( async def _build_post_move_state(
self, self,
*, *,

View File

@@ -13,9 +13,9 @@ MODULE_VERSIONS: dict[str, str] = {
"async_msssql_query": "1.0.0", "async_msssql_query": "1.0.0",
"audit_log": "1.0.0", "audit_log": "1.0.0",
"main": "1.0.1", "main": "1.0.1",
"barcode_client": "1.0.17", "barcode_client": "1.0.19",
"barcode_repository": "1.0.4", "barcode_repository": "1.0.5",
"barcode_service": "1.0.13", "barcode_service": "1.0.15",
"busy_overlay": "1.0.0", "busy_overlay": "1.0.0",
"db_config": "1.0.0", "db_config": "1.0.0",
"gestione_aree": "1.0.1", "gestione_aree": "1.0.1",