Kevin Adametz
b8180a06a1
Kundennachtrag 09.09.2026: Ist-Mengen je Charge in der Produktion sollen auf das Milligramm eingegeben werden können (z. B. 0,125 g). Bisher rundeten Datenbank (decimal 12,2), Bestandslogik, Anzeige und Toleranzsockel auf zwei Stellen; „0,125" wurde still zu 0,13, „0.125" nach der Punkt-Regel zu 125 g. - Migration 2026_09_09_100000: production_ingredients.quantity_used, stock_entries.ordered_quantity/received_quantity, stock_disposals.quantity → decimal(12,3); Casts decimal:3. Auf der Dev-DB (Live-Kopie) ausgeführt, 53/78/7 Zeilen unverändert. - InventoryService::QUANTITY_DECIMALS = 3; roundWawiQuantity() ersetzt alle round(…, 2) in InventoryService, ProductionService, StockDisposalController/-Request, StockEntryRepository/-Controller, RawMaterialStockController. - formatWawiQuantity($v, $min = 2): bis drei Stellen, mindestens zwei — Produktionsdetail, Einkauf Liste/Detail/Formular, Ausschuss-Liste, Chargen-Rest im Rohstoff-Detail. - Eingaberegel (reFormatWawiNumber, JS parseGerman/parseNumber): zusätzlich „0.xxx" als Dezimalzahl; „1.500" bleibt 1500. Produktions-JS: fmt() bis drei Stellen, fmtInput() schreibt gespeicherte Zahlen deutsch ins Feld (1,125 statt 1.125 = 1125). - Soll-Ist-Toleranz: Sockel 0,05 → 0,005 g; Ausschuss min 0,001. - Doku: Hinweise (Neu/geändert), Leitfaden Version 3.1 mit Abschnitt 26, Plan V7 AP-53, README (Deploy-Checkliste, Suite 378). Tests: QuantityPrecisionTest (6) — Parsing, Anzeige, Produktion 0,125 g exakt + Rest 9,875 g, Entwurf 1,125 wiederöffnen, Toleranz Kleinmengen, Ausschuss 0,005 g. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
190 lines
9.7 KiB
PHP
190 lines
9.7 KiB
PHP
@php
|
||
/** @var \App\Models\StockEntry $model */
|
||
$isEdit = $model->exists;
|
||
@endphp
|
||
|
||
<div class="form-group">
|
||
<label for="entry_type">{{ __('Art') }} <span class="text-danger">*</span></label>
|
||
<select name="entry_type" id="entry_type" class="form-control @error('entry_type') is-invalid @enderror" required>
|
||
@foreach ($entryTypeLabels as $value => $label)
|
||
<option value="{{ $value }}" @selected(old('entry_type', $model->entry_type ?? 'ingredient') === $value)>{{ $label }}</option>
|
||
@endforeach
|
||
</select>
|
||
@error('entry_type')
|
||
<div class="invalid-feedback">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
|
||
<div id="stock-entry-ingredient-block" class="form-group" style="display:none;">
|
||
<label for="ingredient_id">{{ __('Inhaltsstoff') }} <span class="text-danger">*</span></label>
|
||
<div class="light-style">
|
||
<select name="ingredient_id" id="ingredient_id" class="w-100"
|
||
data-search-url="{{ route('admin.inventory.api.ingredients.search') }}">
|
||
@if ($model->ingredient_id && $model->ingredient)
|
||
{{-- N-06: fehlt die Stammdaten-Dichte inzwischen, gilt der Dichte-Snapshot der Bestellung --}}
|
||
<option value="{{ $model->ingredient_id }}" data-density="{{ $model->ingredient->density ?? $model->density_used }}" selected>{{ $model->ingredient->name }}@if ($model->ingredient->inci)
|
||
({{ $model->ingredient->inci }})
|
||
@endif
|
||
</option>
|
||
@elseif(old('ingredient_id'))
|
||
<option value="{{ old('ingredient_id') }}" selected>{{ old('ingredient_id') }}</option>
|
||
@endif
|
||
</select>
|
||
</div>
|
||
@error('ingredient_id')
|
||
<div class="text-danger small">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
|
||
<div id="stock-entry-quality-block" class="form-group" style="display:none;">
|
||
<label for="quality_id">{{ __('Rohstoffqualität') }} <span class="text-danger">*</span></label>
|
||
<select name="quality_id" id="quality_id" class="form-control @error('quality_id') is-invalid @enderror">
|
||
<option value="">{{ __('Bitte wählen') }}</option>
|
||
@foreach ($materialQualities as $mq)
|
||
<option value="{{ $mq->id }}" @selected((string) old('quality_id', $model->quality_id) === (string) $mq->id)>{{ $mq->name }}</option>
|
||
@endforeach
|
||
</select>
|
||
@error('quality_id')
|
||
<div class="invalid-feedback">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
|
||
<div id="stock-entry-packaging-block" class="form-group" style="display:none;">
|
||
<label for="packaging_item_id">{{ __('Verpackungsartikel') }} <span class="text-danger">*</span></label>
|
||
<div class="light-style">
|
||
<select name="packaging_item_id" id="packaging_item_id" class="w-100"
|
||
data-search-url="{{ route('admin.inventory.api.packaging-items.search') }}">
|
||
@if ($model->packaging_item_id && $model->packagingItem)
|
||
<option value="{{ $model->packaging_item_id }}" selected>{{ $model->packagingItem->name }}</option>
|
||
@elseif(old('packaging_item_id'))
|
||
<option value="{{ old('packaging_item_id') }}" selected>{{ old('packaging_item_id') }}</option>
|
||
@endif
|
||
</select>
|
||
</div>
|
||
@error('packaging_item_id')
|
||
<div class="text-danger small">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
|
||
<div class="form-group">
|
||
<label for="supplier_id">{{ __('Lieferant') }} <span class="text-danger">*</span></label>
|
||
<select name="supplier_id" id="supplier_id" class="form-control @error('supplier_id') is-invalid @enderror"
|
||
required>
|
||
<option value="">{{ __('Bitte wählen') }}</option>
|
||
@foreach ($suppliers as $sup)
|
||
<option value="{{ $sup->id }}" @selected((string) old('supplier_id', $model->supplier_id) === (string) $sup->id)>{{ $sup->name }}</option>
|
||
@endforeach
|
||
</select>
|
||
@error('supplier_id')
|
||
<div class="invalid-feedback">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
|
||
<div class="form-group">
|
||
<label for="location_id">{{ __('Lagerort') }} <span class="text-danger">*</span></label>
|
||
<select name="location_id" id="location_id" class="form-control @error('location_id') is-invalid @enderror"
|
||
required>
|
||
<option value="">{{ __('Bitte wählen') }}</option>
|
||
@foreach ($locations as $loc)
|
||
<option value="{{ $loc->id }}" @selected((string) old('location_id', $model->location_id) === (string) $loc->id)>{{ $loc->name }}</option>
|
||
@endforeach
|
||
</select>
|
||
@error('location_id')
|
||
<div class="invalid-feedback">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
|
||
<div class="form-group">
|
||
<label for="ordered_at">{{ __('Bestelldatum') }} <span class="text-danger">*</span></label>
|
||
<input type="text" name="ordered_at" id="ordered_at" autocomplete="off"
|
||
class="form-control datepicker-base @error('ordered_at') is-invalid @enderror"
|
||
value="{{ old('ordered_at', $model->ordered_at ? $model->ordered_at->format('d.m.Y') : '') }}" required>
|
||
@error('ordered_at')
|
||
<div class="invalid-feedback">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
|
||
@php
|
||
// AP-42: in ml erfasste Rohstoffe im Formular auch in ml anzeigen (Rückrechnung
|
||
// über die gespeicherte Dichte); Bestand bleibt intern in Gramm.
|
||
$orderedIsMl = $model->purchase_unit === 'ml' && $model->density_used;
|
||
$orderedDisplay = $model->ordered_quantity !== null
|
||
? formatWawiQuantity($orderedIsMl ? $model->ordered_quantity / $model->density_used : $model->ordered_quantity)
|
||
: '';
|
||
@endphp
|
||
<div class="form-group">
|
||
<label for="ordered_quantity">{{ __('Bestellte Menge') }} <span class="text-danger">*</span></label>
|
||
<div class="input-group">
|
||
<input type="text" name="ordered_quantity" id="ordered_quantity"
|
||
class="form-control @error('ordered_quantity') is-invalid @enderror"
|
||
value="{{ old('ordered_quantity', $orderedDisplay) }}"
|
||
required>
|
||
<div class="input-group-append" id="ordered-unit-wrap" style="display:none;">
|
||
<select name="ordered_unit" id="ordered_unit" class="form-control">
|
||
<option value="gram" @selected(old('ordered_unit', $orderedIsMl ? 'ml' : 'gram') === 'gram')>g</option>
|
||
<option value="ml" @selected(old('ordered_unit', $orderedIsMl ? 'ml' : 'gram') === 'ml')>ml</option>
|
||
</select>
|
||
</div>
|
||
</div>
|
||
<small class="text-muted" id="ordered-quantity-hint">{{ __('Bei Rohstoff in Gramm, bei Verpackung in Stück.') }}</small>
|
||
@error('ordered_quantity')
|
||
<div class="invalid-feedback d-block">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
|
||
<div id="price-per-kg-block" style="display:none;">
|
||
<div class="form-group">
|
||
<label for="tax_rate_id">{{ __('Umsatzsteuer') }}</label>
|
||
<select name="tax_rate_id" id="tax_rate_id" class="form-control @error('tax_rate_id') is-invalid @enderror">
|
||
<option value="" data-percent="0">{{ __('— keine Angabe —') }}</option>
|
||
@foreach ($taxRates as $taxRate)
|
||
<option value="{{ $taxRate->id }}" data-percent="{{ $taxRate->percent }}"
|
||
@selected((string) old('tax_rate_id', $model->tax_rate_id) === (string) $taxRate->id)>
|
||
{{ $taxRate->name }} ({{ \App\Services\Util::formatNumber($taxRate->percent) }} %)
|
||
</option>
|
||
@endforeach
|
||
</select>
|
||
<small class="text-muted">{{ __('Steuersatz zur Umrechnung zwischen Netto und Brutto.') }}</small>
|
||
@error('tax_rate_id')
|
||
<div class="invalid-feedback">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
|
||
<div class="form-row">
|
||
<div class="form-group col-md-6">
|
||
<label for="price_per_kg">{{ __('Netto-Preis pro kg') }} <span class="text-danger">*</span></label>
|
||
<div class="input-group">
|
||
<input type="text" name="price_per_kg" id="price_per_kg"
|
||
class="form-control @error('price_per_kg') is-invalid @enderror"
|
||
value="{{ old('price_per_kg', $model->price_per_kg !== null ? \App\Services\Util::formatNumber($model->price_per_kg) : '') }}">
|
||
<div class="input-group-append"><span class="input-group-text">€</span></div>
|
||
@error('price_per_kg')
|
||
<div class="invalid-feedback">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
</div>
|
||
<div class="form-group col-md-6">
|
||
<label for="price_per_kg_gross">{{ __('Brutto-Preis pro kg') }}</label>
|
||
<div class="input-group">
|
||
<input type="text" name="price_per_kg_gross" id="price_per_kg_gross"
|
||
class="form-control @error('price_per_kg_gross') is-invalid @enderror"
|
||
value="{{ old('price_per_kg_gross', $model->price_per_kg_gross !== null ? \App\Services\Util::formatNumber($model->price_per_kg_gross) : '') }}">
|
||
<div class="input-group-append"><span class="input-group-text">€</span></div>
|
||
@error('price_per_kg_gross')
|
||
<div class="invalid-feedback">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|
||
</div>
|
||
</div>
|
||
<small class="text-muted d-block mb-2">{{ __('Netto oder Brutto genügt – der jeweils andere Wert wird automatisch berechnet.') }}</small>
|
||
</div>
|
||
|
||
<div id="price-total-block" class="form-group" style="display:none;">
|
||
<label for="price_total">{{ __('Gesamtpreis netto') }} <span class="text-danger">*</span></label>
|
||
<input type="text" name="price_total" id="price_total"
|
||
class="form-control @error('price_total') is-invalid @enderror"
|
||
value="{{ old('price_total', $model->price_total !== null ? \App\Services\Util::formatNumber($model->price_total) : '') }}">
|
||
@error('price_total')
|
||
<div class="invalid-feedback">{{ $message }}</div>
|
||
@enderror
|
||
</div>
|