gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Warenwirtschaft: AP-53 — Nacharbeit zur Prüfung 10.09.2026 (Toleranzregel zentral, Sockelrand, Chargenzeile, Ausschuss-Meldung, Auflösung/Obergrenze)

Browse source 
Prüfbericht pruefung-ap53-mengenpraezision-2026-09-10.md, alle Punkte umgesetzt:
- AP53-01: Toleranz nur noch in ProductionService (TOLERANCE_RATIO 0,05, TOLERANCE_FLOOR 0,005, COMPARE_EPSILON); das Produktions-JS rendert die Konstanten aus dem Service statt eigener Zahlen (Ampel hatte noch Sockel 0,05 g).
- AP53-02: withinTolerance() vergleicht mit Float-Ausgleich 1e-9 — 0,025 g auf 0,020 g Soll ist wieder zulässig, 0,026 g nicht; Sollwerte werden nicht gerundet.
- AP53-03: Chargen-Hauptzeile und Standortsumme im Rohstoff-Detail mit formatWawiQuantity(…, 0) (0,125 g statt 0 g).
- AP53-04: Ausschuss-Fehlermeldungen (Request ohne/mit Charge, Controller-Wiederholung) mit formatWawiQuantity().
- 4.1: Obergrenze decimal(12,3) bewusst akzeptiert (Live max. 49.000 g) und als InventoryService::QUANTITY_MAX validiert; Bereichsprüfung + Rollback-Hinweis in der Deploy-Checkliste.
- 4.2: normalizeWawiQuantity() (parsen + drei Stellen) in Bestell-/Wareneingangs-/Ausschuss-Requests, parseQuantity() rundet kanonisch für batch_key- und stock_entry_id-Zeilen; Untergrenze 0,001 g; ml-Eingaben, die umgerechnet 0,000 g ergeben, werden abgelehnt (Store/Update/Receive).
- 4.3: Einkaufs-JS trennt formatQuantity (3), formatPrice (2, wie vor AP-53) und formatDensity (4).
- 4.4: Hinweise präzisiert (Übersichten ganzzahlig, Rundungs-/Untergrenzregel), Leitfaden §26 mit Sockelrand-, Hauptzeilen- und Meldungs-Prüfschritten, Plan V7 und README aktualisiert, Prüfbericht Abschnitt 6 mit Nacharbeitsstand.

Tests: QuantityPrecisionTest +6 (AP53-01…04, 4.2 Rundung/Untergrenze/Obergrenze, ml→0 g). Suite 384 grün / 1.592 Assertions.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Kevin Adametz 2026-09-10 07:25:11 +00:00
parent b8180a06a1
commit 6bd867cbe7
18 changed files with 424 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Admin/Inventory/StockDisposalController.php
View file

@ -127,8 +127,8 @@ class StockDisposalController extends Controller
if ($quantity > $remaining) {
throw ValidationException::withMessages([
'quantity' => __('Die Menge (:qty g) übersteigt den Restbestand (:rest g) — Bestand hat sich zwischenzeitlich geändert.', [
'qty' => number_format($quantity, 2, ',', '.'),
'rest' => number_format(max(0, $remaining), 2, ',', '.'),
'qty' => formatWawiQuantity($quantity),
'rest' => formatWawiQuantity(max(0, $remaining)),
]),
]);
}

11
app/Http/Requests/Inventory/ReceiveStockEntryRequest.php
View file

@ -2,6 +2,7 @@
namespace App\Http\Requests\Inventory;
use App\Services\InventoryService;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
@ -19,7 +20,7 @@ class ReceiveStockEntryRequest extends FormRequest
{
return [
'received_at' => ['required', 'date'],
'received_quantity' => ['required', 'numeric', 'min:0.000001'],
'received_quantity' => ['required', 'numeric', 'min:0.001', 'max:'.InventoryService::QUANTITY_MAX],
'batch_number' => ['nullable', 'string', 'max:100'],
'best_before' => ['nullable', 'date'],
'quality_id' => ['nullable', 'integer', 'exists:material_qualities,id'],
@ -29,7 +30,7 @@ class ReceiveStockEntryRequest extends FormRequest
protected function prepareForValidation(): void
{
$this->merge([
'received_quantity' => reFormatWawiNumber($this->input('received_quantity')),
'received_quantity' => normalizeWawiQuantity($this->input('received_quantity')),
]);
}
@ -37,6 +38,12 @@ class ReceiveStockEntryRequest extends FormRequest
{
$validator->after(function (Validator $validator): void {
$stockEntry = $this->route('stockEntry') ?? $this->route('stock_entry');
// Prüfung AP-53 (4.2): ml-Eingang muss umgerechnet mindestens 0,001 g ergeben.
if ($stockEntry && $stockEntry->purchase_unit === 'ml' && (float) $stockEntry->density_used > 0
&& is_numeric($this->input('received_quantity'))
&& roundWawiQuantity((float) $this->input('received_quantity') * (float) $stockEntry->density_used) <= 0) {
$validator->errors()->add('received_quantity', __('Die Menge ergibt umgerechnet weniger als 0,001 g — bitte mindestens 0,001 g erfassen.'));
}
if ($stockEntry && $stockEntry->entry_type === 'ingredient') {
if (empty($this->input('batch_number'))) {
$validator->errors()->add('batch_number', __('Bitte eine Chargennummer angeben.'));

9
app/Http/Requests/Inventory/StoreProductionRequest.php
View file

@ -3,6 +3,7 @@
namespace App\Http\Requests\Inventory;
use App\Models\Product;
use App\Services\InventoryService;
use Illuminate\Foundation\Http\FormRequest;
class StoreProductionRequest extends FormRequest
@ -72,6 +73,14 @@ class StoreProductionRequest extends FormRequest
$n = reFormatWawiNumber((string) $value);
if (! is_numeric($n) || (float) $n <= 0) {
$fail(__('Die Menge je Chargen-Zeile muss größer als 0 sein.'));
return;
}
// Prüfung AP-53 (4.2): unterhalb der Speicherauflösung (0,001 g) bzw. über decimal(12,3).
if (roundWawiQuantity($n) <= 0) {
$fail(__('Die Menge je Chargen-Zeile muss mindestens 0,001 g betragen.'));
} elseif ((float) $n > InventoryService::QUANTITY_MAX) {
$fail(__('Die Menge je Chargen-Zeile ist zu groß (max. 999.999.999,999 g).'));
}
}],
// AP-28: Produktionsergebnis — bucht den Produktbestand; Planung oben ist unverbindlich.

12
app/Http/Requests/Inventory/StoreStockDisposalRequest.php
View file

@ -28,7 +28,7 @@ class StoreStockDisposalRequest extends FormRequest
'packaging_item_id' => ['nullable', 'integer', 'exists:packaging_items,id'],
'stock_entry_id' => ['nullable', 'integer', 'exists:stock_entries,id'],
'location_id' => ['required', 'integer', 'exists:locations,id'],
'quantity' => ['required', 'numeric', 'min:0.001'],
'quantity' => ['required', 'numeric', 'min:0.001', 'max:'.InventoryService::QUANTITY_MAX],
'reason' => ['required', 'string', 'max:100'],
'note' => ['nullable', 'string', 'max:255'],
'disposed_at' => ['required', 'date'],
@ -57,7 +57,7 @@ class StoreStockDisposalRequest extends FormRequest
}
$this->merge([
'quantity' => reFormatWawiNumber($this->input('quantity')),
'quantity' => normalizeWawiQuantity($this->input('quantity')),
'disposed_at' => $disposedAt,
]);
}
@ -96,8 +96,8 @@ class StoreStockDisposalRequest extends FormRequest
->remainingByLocationForIngredient($ingredientId)[$locationId] ?? 0.0;
if ($quantity > $remaining) {
$validator->errors()->add('quantity', __('Die Menge (:qty g) übersteigt den Restbestand am gewählten Lagerort (:rest g).', [
'qty' => number_format($quantity, 2, ',', '.'),
'rest' => number_format(max(0, $remaining), 2, ',', '.'),
'qty' => formatWawiQuantity($quantity),
'rest' => formatWawiQuantity(max(0, $remaining)),
]));
}
}
@ -119,8 +119,8 @@ class StoreStockDisposalRequest extends FormRequest
$remaining = $available !== null ? roundWawiQuantity((float) $available->getAttribute('remaining_quantity')) : 0.0;
if ($quantity > $remaining) {
$validator->errors()->add('quantity', __('Die Menge (:qty g) übersteigt den Restbestand der Charge (:rest g).', [
'qty' => number_format($quantity, 2, ',', '.'),
'rest' => number_format(max(0, $remaining), 2, ',', '.'),
'qty' => formatWawiQuantity($quantity),
'rest' => formatWawiQuantity(max(0, $remaining)),
]));
}
}

8
app/Http/Requests/Inventory/StoreStockEntryRequest.php
View file

@ -3,6 +3,7 @@
namespace App\Http\Requests\Inventory;
use App\Models\Ingredient;
use App\Services\InventoryService;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use Illuminate\Validation\Validator;
@ -26,7 +27,7 @@ class StoreStockEntryRequest extends FormRequest
'supplier_id' => ['required', 'integer', 'exists:suppliers,id'],
'location_id' => ['required', 'integer', 'exists:locations,id'],
'ordered_at' => ['required', 'date'],
'ordered_quantity' => ['required', 'numeric', 'min:0.000001'],
'ordered_quantity' => ['required', 'numeric', 'min:0.001', 'max:'.InventoryService::QUANTITY_MAX],
'ordered_unit' => ['nullable', Rule::in(['gram', 'ml'])],
'quality_id' => ['nullable', 'integer', 'exists:material_qualities,id'],
'tax_rate_id' => ['nullable', 'integer', 'exists:tax_rates,id'],
@ -51,7 +52,7 @@ class StoreStockEntryRequest extends FormRequest
protected function prepareForValidation(): void
{
$this->merge([
'ordered_quantity' => reFormatWawiNumber($this->input('ordered_quantity')),
'ordered_quantity' => normalizeWawiQuantity($this->input('ordered_quantity')),
'price_per_kg' => $this->filled('price_per_kg') ? reFormatWawiNumber($this->input('price_per_kg')) : null,
'price_per_kg_gross' => $this->filled('price_per_kg_gross') ? reFormatWawiNumber($this->input('price_per_kg_gross')) : null,
'price_total' => $this->filled('price_total') ? reFormatWawiNumber($this->input('price_total')) : null,
@ -74,6 +75,9 @@ class StoreStockEntryRequest extends FormRequest
$density = Ingredient::query()->whereKey($this->input('ingredient_id'))->value('density');
if ($density === null || (float) $density <= 0) {
$validator->errors()->add('ordered_quantity', __('Für diesen Rohstoff ist keine Dichte hinterlegt — bitte in Gramm erfassen oder zuerst die Dichte pflegen.'));
} elseif (is_numeric($this->input('ordered_quantity')) && roundWawiQuantity((float) $this->input('ordered_quantity') * (float) $density) <= 0) {
// Prüfung AP-53 (4.2): positive ml-Menge darf nach Umrechnung nicht auf 0,000 g fallen.
$validator->errors()->add('ordered_quantity', __('Die Menge ergibt umgerechnet weniger als 0,001 g — bitte mindestens 0,001 g erfassen.'));
}
}
$net = $this->input('price_per_kg');

8
app/Http/Requests/Inventory/UpdateStockEntryRequest.php
View file

@ -4,6 +4,7 @@ namespace App\Http\Requests\Inventory;
use App\Models\Ingredient;
use App\Models\StockEntry;
use App\Services\InventoryService;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use Illuminate\Validation\Validator;
@ -27,7 +28,7 @@ class UpdateStockEntryRequest extends FormRequest
'supplier_id' => ['required', 'integer', 'exists:suppliers,id'],
'location_id' => ['required', 'integer', 'exists:locations,id'],
'ordered_at' => ['required', 'date'],
'ordered_quantity' => ['required', 'numeric', 'min:0.000001'],
'ordered_quantity' => ['required', 'numeric', 'min:0.001', 'max:'.InventoryService::QUANTITY_MAX],
'ordered_unit' => ['nullable', Rule::in(['gram', 'ml'])],
'quality_id' => ['nullable', 'integer', 'exists:material_qualities,id'],
'tax_rate_id' => ['nullable', 'integer', 'exists:tax_rates,id'],
@ -52,7 +53,7 @@ class UpdateStockEntryRequest extends FormRequest
protected function prepareForValidation(): void
{
$this->merge([
'ordered_quantity' => reFormatWawiNumber($this->input('ordered_quantity')),
'ordered_quantity' => normalizeWawiQuantity($this->input('ordered_quantity')),
'price_per_kg' => $this->filled('price_per_kg') ? reFormatWawiNumber($this->input('price_per_kg')) : null,
'price_per_kg_gross' => $this->filled('price_per_kg_gross') ? reFormatWawiNumber($this->input('price_per_kg_gross')) : null,
'price_total' => $this->filled('price_total') ? reFormatWawiNumber($this->input('price_total')) : null,
@ -81,6 +82,9 @@ class UpdateStockEntryRequest extends FormRequest
}
if ($density === null || (float) $density <= 0) {
$validator->errors()->add('ordered_quantity', __('Für diesen Rohstoff ist keine Dichte hinterlegt — bitte in Gramm erfassen oder zuerst die Dichte pflegen.'));
} elseif (is_numeric($this->input('ordered_quantity')) && roundWawiQuantity((float) $this->input('ordered_quantity') * (float) $density) <= 0) {
// Prüfung AP-53 (4.2): positive ml-Menge darf nach Umrechnung nicht auf 0,000 g fallen.
$validator->errors()->add('ordered_quantity', __('Die Menge ergibt umgerechnet weniger als 0,001 g — bitte mindestens 0,001 g erfassen.'));
}
}
$net = $this->input('price_per_kg');