Stage 7+14 — Mechanic Board + Scan Center
Mechanic Workflow (Stage 7): - /app/mechanic Filament page filtered to master_id = auth user - Kanban 4 columns (in_work / awaiting_parts / ready / recent), each card shows WO#, plate, client, complaint summary, photo presence - 2 KPI tiles (active now / closed today) - Mobile-responsive grid (auto-fit, minmax 260px) WarehouseService: - issueNow(WorkOrderPart) — consume reservations immediately scoped to one line, without closing the WO (mechanic physically takes part now) - returnPart(WorkOrderPart, qty?, notes?) — refund to stock as new batch at original buy_price, writes `return` event, capped at consumed total WO PartsRelationManager: - "Eliberează" action — visible when active reservation exists - "Restituire" action — visible when consumed reservation exists, with qty modal + notes Scan Center (Stage 14): - PartResource "QR" action — per-part SVG QR with payload PART:<article|id> - BulkAction "Tipărește etichete QR" → /parts/labels?ids=N,M (HTML A4 sheet, 3-col grid, print CSS hides toolbar) - /app/scan Filament page using html5-qrcode 2.3.8 (CDN), auto-picks back camera, decodes → Livewire dispatches scanner-decoded → resolveAndRedirect - Lookup matches PART:N prefix, parts.article, parts.barcode, or numeric id - Manual input fallback for browsers without camera Tests (6 new): - WarehouseIssueReturnTest (3): issueNow consumes immediately; returnPart creates positive batch + return event; over-return is capped - ScannerLookupTest (3): PART: prefix lookup, raw barcode lookup, unknown miss Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,85 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Tenant\Pages;
|
||||
|
||||
use App\Models\Tenant\WorkOrder;
|
||||
use Filament\Pages\Page;
|
||||
|
||||
/**
|
||||
* Mobile-first dashboard for a single mechanic — shows ONLY work orders
|
||||
* assigned to the currently logged-in user (master_id = auth()->id()).
|
||||
* Kanban-style grouped by status.
|
||||
*/
|
||||
class MechanicBoard extends Page
|
||||
{
|
||||
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-wrench';
|
||||
|
||||
protected static ?string $navigationLabel = 'Atelierul meu';
|
||||
|
||||
protected static string|\UnitEnum|null $navigationGroup = 'Service';
|
||||
|
||||
protected static ?int $navigationSort = 25;
|
||||
|
||||
protected static ?string $title = 'Atelierul meu';
|
||||
|
||||
protected string $view = 'filament.tenant.pages.mechanic-board';
|
||||
|
||||
public function getColumns(): array
|
||||
{
|
||||
$userId = auth()->id();
|
||||
if (! $userId) return [];
|
||||
|
||||
$all = WorkOrder::with(['client', 'vehicle'])
|
||||
->where('master_id', $userId)
|
||||
->whereIn('status', ['in_work', 'awaiting_parts', 'ready', 'done', 'approved', 'diagnosis'])
|
||||
->orderBy('opened_at', 'desc')
|
||||
->get();
|
||||
|
||||
return [
|
||||
[
|
||||
'key' => 'in_work',
|
||||
'label' => 'În lucru',
|
||||
'color' => '#f59e0b',
|
||||
'items' => $all->where('status', 'in_work')->values(),
|
||||
],
|
||||
[
|
||||
'key' => 'awaiting_parts',
|
||||
'label' => 'Așteaptă piese',
|
||||
'color' => '#8b5cf6',
|
||||
'items' => $all->whereIn('status', ['awaiting_parts'])->values(),
|
||||
],
|
||||
[
|
||||
'key' => 'ready',
|
||||
'label' => 'Gata',
|
||||
'color' => '#10b981',
|
||||
'items' => $all->where('status', 'ready')->values(),
|
||||
],
|
||||
[
|
||||
'key' => 'recent',
|
||||
'label' => 'Recente / restul',
|
||||
'color' => '#64748b',
|
||||
'items' => $all->whereIn('status', ['done', 'approved', 'diagnosis'])
|
||||
->take(20)
|
||||
->values(),
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
public function getCounts(): array
|
||||
{
|
||||
$userId = auth()->id();
|
||||
return [
|
||||
'active' => $userId
|
||||
? WorkOrder::where('master_id', $userId)
|
||||
->whereIn('status', ['in_work', 'awaiting_parts', 'ready'])
|
||||
->count()
|
||||
: 0,
|
||||
'closed_today' => $userId
|
||||
? WorkOrder::where('master_id', $userId)
|
||||
->where('status', 'done')
|
||||
->whereDate('closed_at', today())
|
||||
->count()
|
||||
: 0,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Tenant\Pages;
|
||||
|
||||
use App\Models\Tenant\Part;
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Pages\Page;
|
||||
use Livewire\Attributes\On;
|
||||
|
||||
/**
|
||||
* Mobile scanner: opens camera in the browser, decodes QR/barcode, looks up
|
||||
* Part by:
|
||||
* - `PART:<article|id>` payload (our own QR labels)
|
||||
* - exact barcode match on parts.barcode
|
||||
* - exact article match on parts.article
|
||||
* On match → redirect to Part edit page.
|
||||
*/
|
||||
class Scanner extends Page
|
||||
{
|
||||
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-qr-code';
|
||||
|
||||
protected static ?string $navigationLabel = 'Scaner';
|
||||
|
||||
protected static string|\UnitEnum|null $navigationGroup = 'Depozit';
|
||||
|
||||
protected static ?int $navigationSort = 39;
|
||||
|
||||
protected static ?string $title = 'Scaner cod QR / Bare';
|
||||
|
||||
protected string $view = 'filament.tenant.pages.scanner';
|
||||
|
||||
public string $manual = '';
|
||||
|
||||
#[On('scanner-decoded')]
|
||||
public function decoded(string $text): void
|
||||
{
|
||||
$this->resolveAndRedirect(trim($text));
|
||||
}
|
||||
|
||||
public function submitManual(): void
|
||||
{
|
||||
if (trim($this->manual) === '') return;
|
||||
$this->resolveAndRedirect(trim($this->manual));
|
||||
}
|
||||
|
||||
protected function resolveAndRedirect(string $code): void
|
||||
{
|
||||
$clean = $code;
|
||||
if (str_starts_with($clean, 'PART:')) {
|
||||
$clean = substr($clean, 5);
|
||||
}
|
||||
|
||||
$part = Part::where(function ($q) use ($clean, $code) {
|
||||
$q->where('article', $clean)
|
||||
->orWhere('barcode', $clean)
|
||||
->orWhere('barcode', $code);
|
||||
if (ctype_digit($clean)) $q->orWhere('id', (int) $clean);
|
||||
})
|
||||
->first();
|
||||
|
||||
if (! $part) {
|
||||
Notification::make()
|
||||
->title('Cod necunoscut')
|
||||
->body('Nu am găsit nicio piesă pentru: ' . $code)
|
||||
->warning()
|
||||
->send();
|
||||
return;
|
||||
}
|
||||
|
||||
Notification::make()
|
||||
->title('Piesă găsită: ' . $part->name)
|
||||
->success()
|
||||
->send();
|
||||
|
||||
$this->redirect(
|
||||
route('filament.tenant.resources.parts.edit', ['record' => $part->id])
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -135,6 +135,26 @@ class PartResource extends Resource
|
||||
->query(fn ($q) => $q->where('qty', '<=', 0)),
|
||||
])
|
||||
->actions([
|
||||
Actions\Action::make('qr')
|
||||
->label('QR')
|
||||
->icon('heroicon-m-qr-code')
|
||||
->color('gray')
|
||||
->modalHeading(fn (Part $r) => 'QR pentru ' . $r->name)
|
||||
->modalSubmitAction(false)
|
||||
->modalCancelActionLabel('Închide')
|
||||
->modalContent(function (Part $r) {
|
||||
$payload = 'PART:' . ($r->article ?: $r->id);
|
||||
$svg = (new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
|
||||
'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_MARKUP_SVG,
|
||||
'eccLevel' => \chillerlan\QRCode\QRCode::ECC_M,
|
||||
'scale' => 8,
|
||||
'imageBase64' => false,
|
||||
'addQuietzone' => true,
|
||||
])))->render($payload);
|
||||
return view('filament.tenant.part-qr', [
|
||||
'part' => $r, 'svg' => $svg, 'payload' => $payload,
|
||||
]);
|
||||
}),
|
||||
Actions\Action::make('ai_price')
|
||||
->label('AI: preț recomandat')
|
||||
->icon('heroicon-m-sparkles')
|
||||
@@ -186,6 +206,17 @@ class PartResource extends Resource
|
||||
Actions\EditAction::make(),
|
||||
Actions\DeleteAction::make(),
|
||||
])
|
||||
->bulkActions([
|
||||
Actions\BulkAction::make('print_labels')
|
||||
->label('Tipărește etichete QR')
|
||||
->icon('heroicon-m-printer')
|
||||
->color('gray')
|
||||
->action(function ($records) {
|
||||
$ids = collect($records)->pluck('id')->implode(',');
|
||||
return redirect()->away('/parts/labels?ids=' . $ids);
|
||||
})
|
||||
->deselectRecordsAfterCompletion(),
|
||||
])
|
||||
->emptyStateHeading('Depozit gol')
|
||||
->emptyStateDescription('Adaugă piese manual, sau folosește Achiziții ca să le adaugi prin recepție de la furnizor (cu prețuri și stoc auto). Procentaj poate seta automat prețul de vânzare.')
|
||||
->emptyStateIcon('heroicon-o-cube')
|
||||
|
||||
+45
@@ -3,9 +3,12 @@
|
||||
namespace App\Filament\Tenant\Resources\WorkOrderResource\RelationManagers;
|
||||
|
||||
use App\Models\Tenant\Part;
|
||||
use App\Models\Tenant\PartReservation;
|
||||
use App\Models\Tenant\WorkOrderPart;
|
||||
use App\Services\Warehouse\WarehouseService;
|
||||
use Filament\Actions;
|
||||
use Filament\Forms;
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Resources\RelationManagers\RelationManager;
|
||||
use Filament\Schemas\Components\Utilities\Set;
|
||||
use Filament\Schemas\Schema;
|
||||
@@ -82,6 +85,48 @@ class PartsRelationManager extends RelationManager
|
||||
Actions\CreateAction::make(),
|
||||
])
|
||||
->actions([
|
||||
Actions\Action::make('issue_now')
|
||||
->label('Eliberează')
|
||||
->icon('heroicon-m-arrow-up-on-square')
|
||||
->color('warning')
|
||||
->visible(fn (WorkOrderPart $r) => $r->part_id
|
||||
&& PartReservation::where('work_order_part_id', $r->id)
|
||||
->where('status', PartReservation::STATUS_ACTIVE)
|
||||
->exists())
|
||||
->requiresConfirmation()
|
||||
->modalDescription('Confirmă că mecanicul ia fizic piesa din depozit. Stocul scade acum, fără să aștepți închiderea fișei.')
|
||||
->action(function (WorkOrderPart $r) {
|
||||
$n = app(WarehouseService::class)->issueNow($r);
|
||||
Notification::make()
|
||||
->title("Eliberat: {$n} rezervări consumate")
|
||||
->success()->send();
|
||||
}),
|
||||
Actions\Action::make('return_part')
|
||||
->label('Restituire')
|
||||
->icon('heroicon-m-arrow-uturn-left')
|
||||
->color('gray')
|
||||
->visible(fn (WorkOrderPart $r) => $r->part_id
|
||||
&& PartReservation::where('work_order_part_id', $r->id)
|
||||
->where('status', PartReservation::STATUS_CONSUMED)
|
||||
->exists())
|
||||
->schema([
|
||||
Forms\Components\TextInput::make('qty')
|
||||
->label('Cantitate restituită')
|
||||
->numeric()
|
||||
->required()
|
||||
->minValue(0.001)
|
||||
->default(fn (WorkOrderPart $r) => (float) $r->qty),
|
||||
Forms\Components\Textarea::make('notes')->rows(2)->label('Observații'),
|
||||
])
|
||||
->action(function (WorkOrderPart $r, array $data) {
|
||||
$batch = app(WarehouseService::class)->returnPart(
|
||||
$r, (float) $data['qty'], $data['notes'] ?? null
|
||||
);
|
||||
Notification::make()
|
||||
->title($batch ? 'Piesa returnată în stoc' : 'Nimic de restituit')
|
||||
->{$batch ? 'success' : 'warning'}()
|
||||
->send();
|
||||
}),
|
||||
Actions\EditAction::make(),
|
||||
Actions\DeleteAction::make(),
|
||||
]);
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Tenant\Part;
|
||||
use chillerlan\QRCode\QRCode;
|
||||
use chillerlan\QRCode\QROptions;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class PartLabelsController extends Controller
|
||||
{
|
||||
public function sheet(Request $request)
|
||||
{
|
||||
$ids = array_filter(array_map('intval', explode(',', (string) $request->query('ids', ''))));
|
||||
if (empty($ids)) abort(400, 'No parts selected.');
|
||||
|
||||
$parts = Part::whereIn('id', $ids)->orderBy('name')->get();
|
||||
|
||||
$opts = new QROptions([
|
||||
'outputType' => QRCode::OUTPUT_MARKUP_SVG,
|
||||
'eccLevel' => QRCode::ECC_M,
|
||||
'scale' => 4,
|
||||
'imageBase64' => false,
|
||||
'addQuietzone' => true,
|
||||
]);
|
||||
|
||||
$labels = $parts->map(function (Part $p) use ($opts) {
|
||||
$payload = 'PART:' . ($p->article ?: $p->id);
|
||||
return [
|
||||
'part' => $p,
|
||||
'svg' => (new QRCode($opts))->render($payload),
|
||||
'payload' => $payload,
|
||||
];
|
||||
});
|
||||
|
||||
return view('parts.labels', ['labels' => $labels]);
|
||||
}
|
||||
}
|
||||
@@ -262,6 +262,95 @@ class WarehouseService
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Issue parts NOW for a single WO line — used when the mechanic physically
|
||||
* takes the part from the shelf before the WO is closed. Same logic as
|
||||
* consume() but scoped to one work_order_part_id.
|
||||
*/
|
||||
public function issueNow(WorkOrderPart $wop): int
|
||||
{
|
||||
return DB::transaction(function () use ($wop) {
|
||||
$active = PartReservation::with(['batch', 'part'])
|
||||
->where('work_order_part_id', $wop->id)
|
||||
->where('status', PartReservation::STATUS_ACTIVE)
|
||||
->lockForUpdate()
|
||||
->get();
|
||||
|
||||
foreach ($active as $r) {
|
||||
$batch = $r->batch;
|
||||
if (! $batch) continue;
|
||||
$take = min((float) $r->qty, (float) $batch->qty_remaining);
|
||||
if ($take <= 0) continue;
|
||||
|
||||
$batch->qty_remaining = (float) $batch->qty_remaining - $take;
|
||||
$batch->save();
|
||||
|
||||
$this->logEvent(
|
||||
$r->part, $batch, $batch->warehouse,
|
||||
'issue', -$take, (float) $batch->buy_price,
|
||||
$wop->workOrder, "WO part #{$wop->id} (issue now)"
|
||||
);
|
||||
|
||||
$r->status = PartReservation::STATUS_CONSUMED;
|
||||
$r->consumed_at = now();
|
||||
$r->save();
|
||||
|
||||
if ($r->part) {
|
||||
$r->part->qty_reserved = max(0.0, (float) $r->part->qty_reserved - (float) $r->qty);
|
||||
$r->part->saveQuietly();
|
||||
}
|
||||
}
|
||||
|
||||
if ($wop->part) $this->syncPartCachedQty($wop->part);
|
||||
return $active->count();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Return parts physically taken back to stock. Creates a NEW batch with
|
||||
* the same buy_price as the original (FIFO-correct re-entry) and writes
|
||||
* a `return` event referencing the WO part.
|
||||
*/
|
||||
public function returnPart(WorkOrderPart $wop, ?float $qty = null, ?string $notes = null): ?PartBatch
|
||||
{
|
||||
if (! $wop->part_id) return null;
|
||||
|
||||
return DB::transaction(function () use ($wop, $qty, $notes) {
|
||||
$consumed = PartReservation::where('work_order_part_id', $wop->id)
|
||||
->where('status', PartReservation::STATUS_CONSUMED)
|
||||
->orderBy('consumed_at', 'desc')
|
||||
->get();
|
||||
|
||||
$totalConsumed = (float) $consumed->sum('qty');
|
||||
$qtyReturn = $qty !== null ? min((float) $qty, $totalConsumed) : $totalConsumed;
|
||||
if ($qtyReturn <= 0) return null;
|
||||
|
||||
$unitCost = (float) ($consumed->first()?->batch?->buy_price ?? $wop->buy_price);
|
||||
$warehouse = $consumed->first()?->batch?->warehouse
|
||||
?? $this->defaultWarehouse($wop->company_id);
|
||||
|
||||
$batch = PartBatch::create([
|
||||
'company_id' => $wop->company_id,
|
||||
'part_id' => $wop->part_id,
|
||||
'warehouse_id' => $warehouse->id,
|
||||
'qty_in' => $qtyReturn,
|
||||
'qty_remaining' => $qtyReturn,
|
||||
'buy_price' => $unitCost,
|
||||
'received_at' => now(),
|
||||
'notes' => $notes ?? "Retur de la WO part #{$wop->id}",
|
||||
]);
|
||||
|
||||
$this->logEvent(
|
||||
$wop->part, $batch, $warehouse,
|
||||
'return', $qtyReturn, $unitCost,
|
||||
$wop->workOrder, $notes ?? "Retur WO #{$wop->workOrder?->number}"
|
||||
);
|
||||
|
||||
$this->syncPartCachedQty($wop->part);
|
||||
return $batch;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Move stock between warehouses (FIFO from source). Creates one transfer_out
|
||||
* + one transfer_in batch in the destination warehouse.
|
||||
|
||||
Reference in New Issue
Block a user