Stage 6 — Purchase System: partial receipt + supplier analytics
Schema: - purchase_items.qty_received (backfilled from `received` boolean) - purchases.warehouse_id (target warehouse FK) - supplier_part_prices (price history per supplier/part with purchase ref) - New status `partial` between ordered and received Purchase ↔ Warehouse integration: - Purchase::receiveItem(item, qty, warehouse?) — routes through WarehouseService::receive: creates batch + receipt event + supplier price row - Purchase::receiveAllRemaining(warehouse?) — receives all outstanding lines - Purchase::recomputeStatus() — auto: ordered → partial → received Old flat markReceived() removed — every receipt now writes batches + ledger. Filament: - Purchase list: progress %, partial badge, warehouse picker on form - ItemsRelationManager: per-line "Recepționează" with qty + warehouse modal, qty_received shown as "X.XX / Y.YY" with colour - PartResource: new PriceHistoryRelationManager (supplier price history) - SupplierResource: derived columns onTimeRate / avgDeliveryDays / spend(90d) + "Rerating" action Analytics: - App\Services\Warehouse\SupplierAnalytics (onTimeRate, avgDeliveryDays, spend, count, computedRating) - `suppliers:rate` artisan command + weekly schedule (Mon 04:00) - Computed rating: 70% on-time + 20% volume + 10% speed bonus Tests (6 new, all pass): - Partial receipt of 3/10 → status=partial + 1 batch + 1 price row - receiveAllRemaining → status=received with received_at set - Over-receive throws InvalidArgumentException - Two partial receipts (4+6) → 2 batches FIFO + status=received - onTimeRate 50% with 1 on-time + 1 late - computedRating null when <2 deliveries Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -184,6 +184,7 @@ class PartResource extends Resource
|
||||
{
|
||||
return [
|
||||
RelationManagers\BatchesRelationManager::class,
|
||||
RelationManagers\PriceHistoryRelationManager::class,
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Tenant\Resources\PartResource\RelationManagers;
|
||||
|
||||
use Filament\Resources\RelationManagers\RelationManager;
|
||||
use Filament\Tables;
|
||||
use Filament\Tables\Table;
|
||||
|
||||
class PriceHistoryRelationManager extends RelationManager
|
||||
{
|
||||
protected static string $relationship = 'priceHistory';
|
||||
|
||||
protected static ?string $title = 'Istoric prețuri furnizori';
|
||||
|
||||
public function table(Table $table): Table
|
||||
{
|
||||
return $table
|
||||
->columns([
|
||||
Tables\Columns\TextColumn::make('observed_at')
|
||||
->label('Data')
|
||||
->dateTime('d.m.Y H:i')
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('supplier.name')->label('Furnizor')->searchable(),
|
||||
Tables\Columns\TextColumn::make('purchase.number')->label('PO')->placeholder('—'),
|
||||
Tables\Columns\TextColumn::make('price')
|
||||
->money('MDL')
|
||||
->alignRight()
|
||||
->sortable(),
|
||||
Tables\Columns\TextColumn::make('currency')->label('Val.'),
|
||||
])
|
||||
->defaultSort('observed_at', 'desc')
|
||||
->emptyStateHeading('Niciun preț înregistrat')
|
||||
->emptyStateDescription('Prețurile se înregistrează automat la fiecare recepție de PO.');
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ use App\Filament\Tenant\Resources\PurchaseResource\Pages;
|
||||
use App\Filament\Tenant\Resources\PurchaseResource\RelationManagers;
|
||||
use App\Models\Tenant\Purchase;
|
||||
use App\Models\Tenant\Supplier;
|
||||
use App\Models\Tenant\Warehouse;
|
||||
use Filament\Actions;
|
||||
use Filament\Forms;
|
||||
use Filament\Notifications\Notification;
|
||||
@@ -43,6 +44,11 @@ class PurchaseResource extends Resource
|
||||
->options(fn () => Supplier::where('is_active', true)->pluck('name', 'id'))
|
||||
->searchable()
|
||||
->required(),
|
||||
Forms\Components\Select::make('warehouse_id')
|
||||
->label('Depozit țintă')
|
||||
->options(fn () => Warehouse::where('is_active', true)->pluck('name', 'id'))
|
||||
->default(fn () => Warehouse::where('is_default', true)->value('id'))
|
||||
->required(),
|
||||
Forms\Components\Select::make('status')
|
||||
->options(Purchase::STATUSES)
|
||||
->default('draft')
|
||||
@@ -71,9 +77,19 @@ class PurchaseResource extends Resource
|
||||
->colors([
|
||||
'gray' => ['draft'],
|
||||
'warning' => ['ordered'],
|
||||
'info' => ['partial'],
|
||||
'success' => ['received'],
|
||||
'danger' => ['cancelled'],
|
||||
]),
|
||||
Tables\Columns\TextColumn::make('received_progress')
|
||||
->label('Progres')
|
||||
->state(function (Purchase $r) {
|
||||
$items = $r->items;
|
||||
$ord = (float) $items->sum('qty');
|
||||
$rec = (float) $items->sum('qty_received');
|
||||
return $ord > 0 ? sprintf('%d%%', (int) round($rec / $ord * 100)) : '—';
|
||||
})
|
||||
->alignRight(),
|
||||
Tables\Columns\TextColumn::make('total')->money('MDL')->alignRight(),
|
||||
])
|
||||
->filters([
|
||||
@@ -83,19 +99,27 @@ class PurchaseResource extends Resource
|
||||
->options(fn () => Supplier::pluck('name', 'id')),
|
||||
])
|
||||
->actions([
|
||||
Actions\Action::make('receive')
|
||||
->label('Recepționează')
|
||||
Actions\Action::make('receive_all')
|
||||
->label('Recepție totală')
|
||||
->icon('heroicon-m-check-circle')
|
||||
->color('success')
|
||||
->visible(fn (Purchase $r) => $r->status !== 'received' && $r->status !== 'cancelled')
|
||||
->visible(fn (Purchase $r) => ! in_array($r->status, ['received', 'cancelled', 'draft'], true))
|
||||
->requiresConfirmation()
|
||||
->modalDescription('Se va incrementa stocul pieselor legate.')
|
||||
->modalDescription('Se vor crea batch-uri pentru toate restanțele rămase în depozitul țintă.')
|
||||
->action(function (Purchase $r) {
|
||||
$r->markReceived();
|
||||
Notification::make()
|
||||
->title('Recepționat — stoc actualizat')
|
||||
->success()
|
||||
->send();
|
||||
try {
|
||||
$r->receiveAllRemaining();
|
||||
Notification::make()
|
||||
->title('Recepție completă — batch-uri create')
|
||||
->success()
|
||||
->send();
|
||||
} catch (\Throwable $e) {
|
||||
Notification::make()
|
||||
->title('Eroare')
|
||||
->body($e->getMessage())
|
||||
->danger()
|
||||
->send();
|
||||
}
|
||||
}),
|
||||
Actions\EditAction::make(),
|
||||
Actions\DeleteAction::make(),
|
||||
|
||||
+47
-2
@@ -3,8 +3,11 @@
|
||||
namespace App\Filament\Tenant\Resources\PurchaseResource\RelationManagers;
|
||||
|
||||
use App\Models\Tenant\Part;
|
||||
use App\Models\Tenant\PurchaseItem;
|
||||
use App\Models\Tenant\Warehouse;
|
||||
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;
|
||||
@@ -52,16 +55,58 @@ class ItemsRelationManager extends RelationManager
|
||||
->columns([
|
||||
Tables\Columns\TextColumn::make('name')->wrap(),
|
||||
Tables\Columns\TextColumn::make('article')->placeholder('—'),
|
||||
Tables\Columns\TextColumn::make('qty')->alignRight(),
|
||||
Tables\Columns\TextColumn::make('qty')->label('Comandat')->alignRight(),
|
||||
Tables\Columns\TextColumn::make('qty_received')
|
||||
->label('Recepționat')
|
||||
->alignRight()
|
||||
->color(fn ($state, $record) => $record->isFullyReceived() ? 'success' : ((float) $state > 0 ? 'warning' : 'gray'))
|
||||
->formatStateUsing(fn ($state, $record) => sprintf('%.2f / %.2f', (float) $state, (float) $record->qty)),
|
||||
Tables\Columns\TextColumn::make('unit')->label('UM'),
|
||||
Tables\Columns\TextColumn::make('buy_price')->money('MDL')->alignRight(),
|
||||
Tables\Columns\TextColumn::make('total')->money('MDL')->alignRight(),
|
||||
Tables\Columns\IconColumn::make('received')->boolean()->label('Recepț.'),
|
||||
])
|
||||
->headerActions([
|
||||
Actions\CreateAction::make(),
|
||||
])
|
||||
->actions([
|
||||
Actions\Action::make('receive_item')
|
||||
->label('Recepționează')
|
||||
->icon('heroicon-m-arrow-down-tray')
|
||||
->color('success')
|
||||
->visible(fn (PurchaseItem $r) => ! $r->isFullyReceived())
|
||||
->schema([
|
||||
Forms\Components\Placeholder::make('outstanding')
|
||||
->label('Restanță')
|
||||
->content(fn (PurchaseItem $r) => sprintf('%.2f %s', $r->outstanding(), $r->unit ?? 'buc')),
|
||||
Forms\Components\TextInput::make('qty')
|
||||
->label('Cantitate recepționată')
|
||||
->numeric()
|
||||
->required()
|
||||
->minValue(0.001)
|
||||
->default(fn (PurchaseItem $r) => $r->outstanding()),
|
||||
Forms\Components\Select::make('warehouse_id')
|
||||
->label('Depozit țintă')
|
||||
->options(fn () => Warehouse::where('is_active', true)->pluck('name', 'id'))
|
||||
->default(fn (PurchaseItem $r) => $r->purchase?->warehouse_id
|
||||
?? Warehouse::where('is_default', true)->value('id'))
|
||||
->required(),
|
||||
])
|
||||
->action(function (PurchaseItem $r, array $data) {
|
||||
$wh = $data['warehouse_id'] ? Warehouse::find($data['warehouse_id']) : null;
|
||||
try {
|
||||
$r->purchase->receiveItem($r, (float) $data['qty'], $wh);
|
||||
Notification::make()
|
||||
->title('Recepționat — batch creat')
|
||||
->success()
|
||||
->send();
|
||||
} catch (\Throwable $e) {
|
||||
Notification::make()
|
||||
->title('Eroare la recepție')
|
||||
->body($e->getMessage())
|
||||
->danger()
|
||||
->send();
|
||||
}
|
||||
}),
|
||||
Actions\EditAction::make(),
|
||||
Actions\DeleteAction::make(),
|
||||
]);
|
||||
|
||||
@@ -68,15 +68,56 @@ class SupplierResource extends Resource
|
||||
Tables\Columns\TextColumn::make('rating')
|
||||
->label('Rating')
|
||||
->formatStateUsing(fn ($s) => str_repeat('★', (int) $s)),
|
||||
Tables\Columns\TextColumn::make('delivery_days')->label('Livrare (zile)')->alignRight(),
|
||||
Tables\Columns\TextColumn::make('on_time_pct')
|
||||
->label('La timp 90d')
|
||||
->state(fn (Supplier $r) => app(\App\Services\Warehouse\SupplierAnalytics::class)->onTimeRate($r))
|
||||
->formatStateUsing(fn ($s) => $s === null ? '—' : "{$s}%")
|
||||
->color(fn ($s) => $s === null ? 'gray' : ($s >= 90 ? 'success' : ($s >= 70 ? 'warning' : 'danger')))
|
||||
->alignRight()
|
||||
->toggleable(),
|
||||
Tables\Columns\TextColumn::make('avg_delivery_days')
|
||||
->label('Avg zile')
|
||||
->state(fn (Supplier $r) => app(\App\Services\Warehouse\SupplierAnalytics::class)->avgDeliveryDays($r))
|
||||
->formatStateUsing(fn ($s) => $s === null ? '—' : (string) $s)
|
||||
->alignRight()
|
||||
->toggleable(),
|
||||
Tables\Columns\TextColumn::make('spend_90d')
|
||||
->label('Cheltuit 90d')
|
||||
->state(fn (Supplier $r) => app(\App\Services\Warehouse\SupplierAnalytics::class)->spend($r))
|
||||
->money('MDL')
|
||||
->alignRight()
|
||||
->toggleable(),
|
||||
Tables\Columns\TextColumn::make('delivery_days')->label('Livrare (zile)')->alignRight()->toggleable(),
|
||||
Tables\Columns\TextColumn::make('discount_pct')->label('Discount')
|
||||
->formatStateUsing(fn ($s) => $s . '%')->alignRight(),
|
||||
->formatStateUsing(fn ($s) => $s . '%')->alignRight()->toggleable(),
|
||||
Tables\Columns\IconColumn::make('is_active')->boolean(),
|
||||
])
|
||||
->filters([
|
||||
Tables\Filters\TernaryFilter::make('is_active')->label('Activi'),
|
||||
])
|
||||
->actions([
|
||||
Actions\Action::make('rate')
|
||||
->label('Rerating')
|
||||
->icon('heroicon-m-arrow-path')
|
||||
->color('gray')
|
||||
->action(function (Supplier $r) {
|
||||
$score = app(\App\Services\Warehouse\SupplierAnalytics::class)
|
||||
->computedRating($r);
|
||||
if ($score === null) {
|
||||
\Filament\Notifications\Notification::make()
|
||||
->title('Date insuficiente')
|
||||
->body('Necesită cel puțin 2 recepții complete cu data așteptată setată.')
|
||||
->warning()
|
||||
->send();
|
||||
return;
|
||||
}
|
||||
$r->rating = $score;
|
||||
$r->saveQuietly();
|
||||
\Filament\Notifications\Notification::make()
|
||||
->title("Rating actualizat → {$score}★")
|
||||
->success()
|
||||
->send();
|
||||
}),
|
||||
Actions\EditAction::make(),
|
||||
Actions\DeleteAction::make(),
|
||||
])
|
||||
|
||||
Reference in New Issue
Block a user