commit melhorias compras2
tests / ci (push) Waiting to run

This commit is contained in:
2026-11-21 21:11:55 +02:00
parent 12dd6df28a
commit 4fac443dda
13 changed files with 175 additions and 14 deletions
@@ -305,6 +305,7 @@ class SupplyPlanningController extends Controller
'id' => $line->id, 'label' => $orders[$line->purchase_order_id]->number.' · '.$line->description.' · '.$line->quantity.' '.$line->unit,
'stock_item_id' => $orders[$line->purchase_order_id]->snapshot['catalogue_sources'][$line->requisition_item_id]['stock_item_id'] ?? null,
'quantity_milli' => ReceiptWorkflow::milli($line->quantity),
'unit' => $line->unit,
]);
$requests = collect();
if ($canPrepare && $kind === 'reservation') {
@@ -340,6 +341,7 @@ class SupplyPlanningController extends Controller
}
return Inertia::render('supply/coordination', ['kind' => $kind, 'ready' => $ready,
'conversionQaEnabled' => app()->environment('testing') && config('inventory_conversion.qa_enabled') === true,
'recordFilters' => ['record_search' => trim($filters['record_search'] ?? ''), 'record_state' => $filters['record_state'] ?? ''],
'recordPagination' => $page === null ? null : ['current_page' => $page->currentPage(), 'last_page' => $page->lastPage(), 'total' => $page->total(),
'prev_page_url' => $page->previousPageUrl(), 'next_page_url' => $page->nextPageUrl()],
+1 -1
View File
@@ -75,7 +75,7 @@ final class ReceiptQuantityConversion
if ($basis === null) {
return $physical;
}
abort_unless(config('inventory_conversion.qa_enabled') === true, 503, 'Convers?o ainda n?o instalada.');
abort_unless(config('inventory_conversion.qa_enabled') === true, 503, 'Conversão ainda não instalada.');
app(ReceiptStockMovement::class)->load();
try {
return (int) QuantityConversion::fromBase((string) $physical, $basis['numerator'], $basis['denominator']);
+6
View File
@@ -95,6 +95,12 @@ class ReceiptWorkflow
throw ValidationException::withMessages(['items' => 'Reutilize o artigo e armazém já associados à confirmação desta linha.']);
}
$line['stock_item_id'] = $mapping->stock_item_id;
if (isset($mapping->data['conversion'])) {
if (isset($line['conversion']) && $line['conversion'] !== $mapping->data['conversion']) {
throw ValidationException::withMessages(['items' => 'Reutilize a conversão da confirmação de entrega.']);
}
$line['conversion'] = $mapping->data['conversion'];
}
}
if (! empty($order->snapshot['catalogue_sources']) && empty($line['stock_item_id'])) {
$orderLine = $order->items()->whereKey($line['purchase_order_item_id'])->first();
+23 -3
View File
@@ -19,6 +19,7 @@ use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
use Tempo\Inventory\QuantityConversion;
class SupplyCoordination
{
@@ -107,6 +108,9 @@ class SupplyCoordination
app(OrderCancellationWorkflow::class)->assertOperational($order);
$snapshot['order'] = $order->only(['id', 'number']);
$snapshot['order_line'] = $line->only(['id', 'quantity', 'unit', 'description']);
if (isset($data['conversion_basis'])) {
$snapshot['quantity_conversion'] = $data['conversion_basis'];
}
}
$state = $kind === 'alternative' ? 'draft' : 'active';
} elseif ($kind === 'alternative') {
@@ -170,7 +174,8 @@ class SupplyCoordination
'alternative' => ['substitute_id' => 'required|integer|min:1', 'application' => 'required|string|max:200', 'compatibility' => 'required|in:equivalent,conditional,incompatible,pending',
'conditions' => 'required_if:compatibility,conditional|nullable|string|max:4000', 'evidence' => 'required|string|min:10|max:4000', 'factor_numerator' => 'required|integer|min:1|max:1000000', 'factor_denominator' => 'required|integer|min:1|max:1000000', 'valid_until' => 'required|date_format:Y-m-d'],
'reservation' => ['requisition_item_id' => 'nullable|integer|min:1', 'quantity_milli' => 'required|integer|min:1|max:1000000000', 'needed_on' => 'required|date_format:Y-m-d', 'additional' => 'required|boolean', 'reference' => 'required|string|max:200'],
'delivery' => ['purchase_order_item_id' => 'required|integer|min:1', 'quantity_milli' => 'required|integer|min:1|max:1000000000', 'expected_on' => 'required|date_format:Y-m-d', 'confirmed_on' => 'required|date_format:Y-m-d|before_or_equal:today', 'evidence' => 'required|string|min:5|max:2000'],
'delivery' => ['purchase_order_item_id' => 'required|integer|min:1', 'quantity_milli' => 'required|integer|min:1|max:1000000000', 'expected_on' => 'required|date_format:Y-m-d', 'confirmed_on' => 'required|date_format:Y-m-d|before_or_equal:today', 'evidence' => 'required|string|min:5|max:2000',
'conversion' => 'sometimes|nullable|array:numerator,denominator,source,version'],
default => abort(404),
};
$data = Validator::make($input, $rules)->validate();
@@ -208,7 +213,11 @@ class SupplyCoordination
app(OrderCancellationWorkflow::class)->assertOperational($order);
$stock = StockItem::query()->whereKey($data['stock_item_id'])->firstOrFail();
$linked = $order->snapshot['catalogue_sources'][$line->requisition_item_id]['stock_item_id'] ?? null;
$this->require($order->status === 'issued' && $line->unit === $stock->unit && ($linked === null || $linked === $stock->id), 'data.stock_item_id', 'A confirmação deve respeitar o artigo e unidade da ordem emitida.');
$this->require($order->status === 'issued' && ($linked === null || $linked === $stock->id), 'data.stock_item_id', 'A confirmação deve respeitar o artigo da ordem emitida.');
$conversion = app(ReceiptQuantityConversion::class)->freeze($actor, $line, $stock, $data['quantity_milli'], $data['conversion'] ?? null);
if ($conversion !== null) {
$data['conversion_basis'] = array_diff_key($conversion, array_flip(['accepted_document_milli', 'accepted_stock_milli']));
}
$this->require($old === null || $old->data['purchase_order_item_id'] === (int) $data['purchase_order_item_id'], 'data.purchase_order_item_id', 'A revisão mantém a linha da ordem original.');
$others = app(SupplyPlanning::class)->latest('delivery')->where('state', 'active')->where('id', '!=', $old->id ?? 0)->get()->filter(fn ($r) => $r->data['purchase_order_item_id'] == $line->id)->sum(fn ($r) => $r->data['quantity_milli']);
$this->require($others === 0, 'data.purchase_order_item_id', 'Esta linha já tem confirmação activa. Reveja-a para actualizar quantidade ou prazo.');
@@ -216,6 +225,9 @@ class SupplyCoordination
$this->require($data['quantity_milli'] >= app(ReceiptWorkflow::class)->recordedQuantity($line->id, 'received_milli'), 'data.quantity_milli', 'A quantidade acumulada confirmada não pode ficar abaixo da já recebida.');
// A line has one canonical destination/article mapping, even across revisions.
$mapping = app(SupplyPlanning::class)->latest('delivery')->get()->first(fn ($r) => $r->data['purchase_order_item_id'] == $line->id);
if (isset($mapping?->data['conversion_basis'])) {
$this->require(($data['conversion_basis'] ?? null) === $mapping->data['conversion_basis'], 'data.conversion', 'Conserve a base de conversão já congelada na confirmação desta linha.');
}
$this->require($mapping === null || ($mapping->stock_item_id === $stock->id && $mapping->warehouse_id === (int) $data['warehouse_id']), 'data.warehouse_id', 'Esta linha já tem artigo/local associados. Reutilize a associação existente.');
$receivedStocks = GoodsReceiptItem::query()->where('purchase_order_item_id', $line->id)->whereNotNull('stock_item_id')->pluck('stock_item_id')->unique();
$this->require($receivedStocks->isEmpty() || ($receivedStocks->count() === 1 && (int) $receivedStocks->first() === $stock->id), 'data.stock_item_id', 'A confirmação deve reutilizar o artigo já recebido nesta linha.');
@@ -244,7 +256,15 @@ class SupplyCoordination
{
$received = app(ReceiptWorkflow::class)->recordedQuantity($record->data['purchase_order_item_id'], 'received_milli');
return max(0, BigDecimal::of($record->data['quantity_milli'])->minus($received)->toInt());
$remaining = max(0, BigDecimal::of($record->data['quantity_milli'])->minus($received)->toInt());
$basis = $record->data['conversion_basis'] ?? null;
if ($basis === null) {
return $remaining;
}
abort_unless(config('inventory_conversion.qa_enabled') === true, 503, 'Conversão ainda não instalada.');
app(ReceiptStockMovement::class)->load();
return (int) QuantityConversion::toBase((string) $remaining, $basis['numerator'], $basis['denominator']);
}
/** @param list<array<string,mixed>> $applications