mirror of
https://github.com/s-frick/effigenix.git
synced 2026-03-28 12:19:35 +01:00
feat(production,inventory): Produktionsergebnis automatisch einbuchen (US-7.2)
Event-Infrastruktur (DomainEvent, DomainEventPublisher) im Shared Kernel eingeführt. CompleteBatch publiziert BatchCompleted-Event mit articleId aus Recipe. ProductionDomainEventPublisher konvertiert in IntegrationEvent, BatchCompletedInventoryListener bucht automatisch StockBatch (PRODUCED) + StockMovement (PRODUCTION_OUTPUT) am PRODUCTION_AREA-Lagerort ein. TUI RecordConsumptionScreen: Rezeptbasierte Zutatenauswahl mit skalierten Soll-Mengen, Stock-Batch-Picker und Mengen-Vorbelegung.
This commit is contained in:
Sebastian Frick
parent
e9f2948e61
commit
aa7ac785bb
16 changed files with 797 additions and 117 deletions
|
|
@ -1,4 +1,4 @@
|
|||
import React, { useState } from 'react';
|
||||
import { useState, useEffect, useMemo, useCallback } from 'react';
|
||||
import { Box, Text, useInput } from 'ink';
|
||||
import { useNavigation } from '../../state/navigation-context.js';
|
||||
import { useBatches } from '../../hooks/useBatches.js';
|
||||
|
|
@ -6,95 +6,198 @@ import { FormInput } from '../shared/FormInput.js';
|
|||
import { LoadingSpinner } from '../shared/LoadingSpinner.js';
|
||||
import { ErrorDisplay } from '../shared/ErrorDisplay.js';
|
||||
import { UOM_VALUES, UOM_LABELS } from '@effigenix/api-client';
|
||||
import type { UoM } from '@effigenix/api-client';
|
||||
import type { UoM, RecipeDTO, ArticleDTO, StockBatchDTO, IngredientDTO } from '@effigenix/api-client';
|
||||
import { client } from '../../utils/api-client.js';
|
||||
|
||||
type Field = 'inputBatchId' | 'articleId' | 'quantityUsed' | 'quantityUnit';
|
||||
const FIELDS: Field[] = ['inputBatchId', 'articleId', 'quantityUsed', 'quantityUnit'];
|
||||
type Phase = 'loading' | 'pick-ingredient' | 'pick-batch' | 'edit-quantity' | 'submitting' | 'success' | 'error';
|
||||
|
||||
const FIELD_LABELS: Record<Field, string> = {
|
||||
inputBatchId: 'Input-Chargen-ID *',
|
||||
articleId: 'Artikel-ID *',
|
||||
quantityUsed: 'Verbrauchte Menge *',
|
||||
quantityUnit: 'Mengeneinheit * (←→ wechseln)',
|
||||
};
|
||||
interface AvailableBatch {
|
||||
stockBatch: StockBatchDTO;
|
||||
stockId: string;
|
||||
}
|
||||
|
||||
export function RecordConsumptionScreen() {
|
||||
const { params, back } = useNavigation();
|
||||
const { recordConsumption, loading, error, clearError } = useBatches();
|
||||
const { recordConsumption, error: submitError, clearError } = useBatches();
|
||||
|
||||
const batchId = params.batchId ?? '';
|
||||
const [values, setValues] = useState({ inputBatchId: '', articleId: '', quantityUsed: '' });
|
||||
|
||||
// Data state
|
||||
const [recipe, setRecipe] = useState<RecipeDTO | null>(null);
|
||||
const [articles, setArticles] = useState<ArticleDTO[]>([]);
|
||||
const [consumedArticleIds, setConsumedArticleIds] = useState<Set<string>>(new Set());
|
||||
const [plannedQuantity, setPlannedQuantity] = useState<number>(0);
|
||||
|
||||
// Selection state
|
||||
const [phase, setPhase] = useState<Phase>('loading');
|
||||
const [ingredientCursor, setIngredientCursor] = useState(0);
|
||||
const [selectedIngredient, setSelectedIngredient] = useState<IngredientDTO | null>(null);
|
||||
const [availableBatches, setAvailableBatches] = useState<AvailableBatch[]>([]);
|
||||
const [batchCursor, setBatchCursor] = useState(0);
|
||||
const [selectedBatch, setSelectedBatch] = useState<AvailableBatch | null>(null);
|
||||
|
||||
// Quantity edit state
|
||||
const [quantityValue, setQuantityValue] = useState('');
|
||||
const [uomIdx, setUomIdx] = useState(0);
|
||||
const [activeField, setActiveField] = useState<Field>('inputBatchId');
|
||||
const [fieldErrors, setFieldErrors] = useState<Partial<Record<Field, string>>>({});
|
||||
const [success, setSuccess] = useState(false);
|
||||
const [loadError, setLoadError] = useState<string | null>(null);
|
||||
|
||||
const setField = (field: keyof typeof values) => (value: string) => {
|
||||
setValues((v) => ({ ...v, [field]: value }));
|
||||
};
|
||||
const articleName = useCallback((id: string) => {
|
||||
const a = articles.find((art) => art.id === id);
|
||||
return a ? `${a.articleNumber} – ${a.name}` : id.substring(0, 18);
|
||||
}, [articles]);
|
||||
|
||||
const handleSubmit = async () => {
|
||||
const errors: Partial<Record<Field, string>> = {};
|
||||
if (!values.inputBatchId.trim()) errors.inputBatchId = 'Chargen-ID erforderlich.';
|
||||
if (!values.articleId.trim()) errors.articleId = 'Artikel-ID erforderlich.';
|
||||
if (!values.quantityUsed.trim()) errors.quantityUsed = 'Menge erforderlich.';
|
||||
setFieldErrors(errors);
|
||||
if (Object.keys(errors).length > 0) return;
|
||||
// Load batch, recipe, articles on mount
|
||||
useEffect(() => {
|
||||
async function load() {
|
||||
try {
|
||||
const [batchData, articleList] = await Promise.all([
|
||||
client.batches.getById(batchId),
|
||||
client.articles.list(),
|
||||
]);
|
||||
setArticles(articleList);
|
||||
setPlannedQuantity(parseFloat(batchData.plannedQuantity ?? '0'));
|
||||
|
||||
const result = await recordConsumption(batchId, {
|
||||
inputBatchId: values.inputBatchId.trim(),
|
||||
articleId: values.articleId.trim(),
|
||||
quantityUsed: values.quantityUsed.trim(),
|
||||
quantityUnit: UOM_VALUES[uomIdx] as string,
|
||||
});
|
||||
if (result) {
|
||||
setSuccess(true);
|
||||
setTimeout(() => back(), 1500);
|
||||
// Track already consumed articles
|
||||
const consumed = new Set((batchData.consumptions ?? []).map((c) => c.articleId ?? ''));
|
||||
setConsumedArticleIds(consumed);
|
||||
|
||||
if (!batchData.recipeId) {
|
||||
setLoadError('Charge hat keine Rezept-ID.');
|
||||
setPhase('error');
|
||||
return;
|
||||
}
|
||||
|
||||
const recipeData = await client.recipes.getById(batchData.recipeId);
|
||||
setRecipe(recipeData);
|
||||
setPhase('pick-ingredient');
|
||||
} catch (err) {
|
||||
setLoadError(err instanceof Error ? err.message : 'Fehler beim Laden');
|
||||
setPhase('error');
|
||||
}
|
||||
}
|
||||
};
|
||||
void load();
|
||||
}, [batchId]);
|
||||
|
||||
const handleFieldSubmit = (field: Field) => (_value: string) => {
|
||||
const idx = FIELDS.indexOf(field);
|
||||
if (idx < FIELDS.length - 1) {
|
||||
setActiveField(FIELDS[idx + 1] ?? field);
|
||||
} else {
|
||||
void handleSubmit();
|
||||
// Calculate scaled quantity for an ingredient
|
||||
const scaledQuantity = useCallback((ingredient: IngredientDTO): string => {
|
||||
if (!recipe) return ingredient.quantity;
|
||||
const recipeOutput = parseFloat(recipe.outputQuantity);
|
||||
if (!recipeOutput || recipeOutput === 0) return ingredient.quantity;
|
||||
const ingredientQty = parseFloat(ingredient.quantity);
|
||||
const scale = plannedQuantity / recipeOutput;
|
||||
return (ingredientQty * scale).toFixed(2).replace(/\.?0+$/, '');
|
||||
}, [recipe, plannedQuantity]);
|
||||
|
||||
// Ingredients sorted by position
|
||||
const sortedIngredients = useMemo(() => {
|
||||
if (!recipe) return [];
|
||||
return [...recipe.ingredients].sort((a, b) => a.position - b.position);
|
||||
}, [recipe]);
|
||||
|
||||
// Load available batches for selected ingredient's article
|
||||
const loadBatchesForArticle = useCallback(async (articleId: string) => {
|
||||
try {
|
||||
const stocks = await client.stocks.list({ articleId });
|
||||
const batches: AvailableBatch[] = [];
|
||||
for (const stock of stocks) {
|
||||
for (const sb of stock.batches) {
|
||||
if (sb.status === 'AVAILABLE' || sb.status === 'EXPIRING_SOON') {
|
||||
batches.push({ stockBatch: sb, stockId: stock.id });
|
||||
}
|
||||
}
|
||||
}
|
||||
setAvailableBatches(batches);
|
||||
setBatchCursor(0);
|
||||
} catch {
|
||||
setAvailableBatches([]);
|
||||
}
|
||||
};
|
||||
}, []);
|
||||
|
||||
// Handle input based on current phase
|
||||
useInput((_input, key) => {
|
||||
if (loading || success) return;
|
||||
if (phase === 'loading' || phase === 'submitting' || phase === 'success') return;
|
||||
|
||||
if (activeField === 'quantityUnit') {
|
||||
if (key.escape) {
|
||||
if (phase === 'edit-quantity') {
|
||||
setPhase('pick-batch');
|
||||
return;
|
||||
}
|
||||
if (phase === 'pick-batch') {
|
||||
setPhase('pick-ingredient');
|
||||
return;
|
||||
}
|
||||
back();
|
||||
return;
|
||||
}
|
||||
|
||||
if (phase === 'pick-ingredient') {
|
||||
if (key.upArrow) setIngredientCursor((c) => Math.max(0, c - 1));
|
||||
if (key.downArrow) setIngredientCursor((c) => Math.min(sortedIngredients.length - 1, c + 1));
|
||||
if (key.return && sortedIngredients[ingredientCursor]) {
|
||||
const ing = sortedIngredients[ingredientCursor]!;
|
||||
setSelectedIngredient(ing);
|
||||
void loadBatchesForArticle(ing.articleId);
|
||||
setPhase('pick-batch');
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (phase === 'pick-batch') {
|
||||
if (key.upArrow) setBatchCursor((c) => Math.max(0, c - 1));
|
||||
if (key.downArrow) setBatchCursor((c) => Math.min(availableBatches.length - 1, c + 1));
|
||||
if (key.return && availableBatches[batchCursor]) {
|
||||
const batch = availableBatches[batchCursor]!;
|
||||
setSelectedBatch(batch);
|
||||
// Pre-fill quantity from recipe (scaled)
|
||||
if (selectedIngredient) {
|
||||
setQuantityValue(scaledQuantity(selectedIngredient));
|
||||
const uomIndex = UOM_VALUES.indexOf(selectedIngredient.uom as UoM);
|
||||
setUomIdx(uomIndex >= 0 ? uomIndex : 0);
|
||||
}
|
||||
setPhase('edit-quantity');
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (phase === 'edit-quantity') {
|
||||
if (key.leftArrow || key.rightArrow) {
|
||||
const dir = key.rightArrow ? 1 : -1;
|
||||
setUomIdx((i) => (i + dir + UOM_VALUES.length) % UOM_VALUES.length);
|
||||
return;
|
||||
}
|
||||
if (key.return) {
|
||||
void handleSubmit();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (key.tab || key.downArrow) {
|
||||
setActiveField((f) => {
|
||||
const idx = FIELDS.indexOf(f);
|
||||
return FIELDS[(idx + 1) % FIELDS.length] ?? f;
|
||||
});
|
||||
}
|
||||
if (key.upArrow) {
|
||||
setActiveField((f) => {
|
||||
const idx = FIELDS.indexOf(f);
|
||||
return FIELDS[(idx - 1 + FIELDS.length) % FIELDS.length] ?? f;
|
||||
});
|
||||
}
|
||||
if (key.escape) back();
|
||||
});
|
||||
|
||||
if (loading) return <LoadingSpinner label="Verbrauch wird erfasst..." />;
|
||||
const handleSubmit = async () => {
|
||||
if (!selectedIngredient || !selectedBatch || !quantityValue.trim()) return;
|
||||
setPhase('submitting');
|
||||
const result = await recordConsumption(batchId, {
|
||||
inputBatchId: selectedBatch.stockBatch.batchId ?? '',
|
||||
articleId: selectedIngredient.articleId,
|
||||
quantityUsed: quantityValue.trim(),
|
||||
quantityUnit: UOM_VALUES[uomIdx] as string,
|
||||
});
|
||||
if (result) {
|
||||
setPhase('success');
|
||||
setTimeout(() => back(), 1500);
|
||||
} else {
|
||||
setPhase('edit-quantity');
|
||||
}
|
||||
};
|
||||
|
||||
if (success) {
|
||||
// ── Render ──
|
||||
|
||||
if (phase === 'loading') return <LoadingSpinner label="Lade Rezeptdaten..." />;
|
||||
if (phase === 'submitting') return <LoadingSpinner label="Verbrauch wird erfasst..." />;
|
||||
|
||||
if (phase === 'error') {
|
||||
return (
|
||||
<Box flexDirection="column" paddingY={1}>
|
||||
<ErrorDisplay message={loadError ?? 'Unbekannter Fehler'} onDismiss={() => back()} />
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
if (phase === 'success') {
|
||||
return (
|
||||
<Box flexDirection="column" paddingY={1}>
|
||||
<Text color="green" bold>Verbrauch erfolgreich erfasst.</Text>
|
||||
|
|
@ -102,51 +205,107 @@ export function RecordConsumptionScreen() {
|
|||
);
|
||||
}
|
||||
|
||||
const uomLabel = UOM_LABELS[UOM_VALUES[uomIdx] as UoM] ?? UOM_VALUES[uomIdx];
|
||||
const uomLabel = (u: string) => UOM_LABELS[u as UoM] ?? u;
|
||||
|
||||
return (
|
||||
<Box flexDirection="column" gap={1}>
|
||||
<Text color="cyan" bold>Verbrauch erfassen</Text>
|
||||
<Text color="gray" dimColor>Charge: {batchId}</Text>
|
||||
{error && <ErrorDisplay message={error} onDismiss={clearError} />}
|
||||
// ── Phase: Pick Ingredient ──
|
||||
if (phase === 'pick-ingredient') {
|
||||
return (
|
||||
<Box flexDirection="column" gap={1}>
|
||||
<Text color="cyan" bold>Verbrauch erfassen – Zutat wählen</Text>
|
||||
{submitError && <ErrorDisplay message={submitError} onDismiss={clearError} />}
|
||||
|
||||
<Box flexDirection="column" gap={1} width={60}>
|
||||
<FormInput
|
||||
label={FIELD_LABELS.inputBatchId}
|
||||
value={values.inputBatchId}
|
||||
onChange={setField('inputBatchId')}
|
||||
onSubmit={handleFieldSubmit('inputBatchId')}
|
||||
focus={activeField === 'inputBatchId'}
|
||||
{...(fieldErrors.inputBatchId ? { error: fieldErrors.inputBatchId } : {})}
|
||||
/>
|
||||
<FormInput
|
||||
label={FIELD_LABELS.articleId}
|
||||
value={values.articleId}
|
||||
onChange={setField('articleId')}
|
||||
onSubmit={handleFieldSubmit('articleId')}
|
||||
focus={activeField === 'articleId'}
|
||||
{...(fieldErrors.articleId ? { error: fieldErrors.articleId } : {})}
|
||||
/>
|
||||
<FormInput
|
||||
label={FIELD_LABELS.quantityUsed}
|
||||
value={values.quantityUsed}
|
||||
onChange={setField('quantityUsed')}
|
||||
onSubmit={handleFieldSubmit('quantityUsed')}
|
||||
focus={activeField === 'quantityUsed'}
|
||||
{...(fieldErrors.quantityUsed ? { error: fieldErrors.quantityUsed } : {})}
|
||||
/>
|
||||
<Box flexDirection="column">
|
||||
<Text color={activeField === 'quantityUnit' ? 'cyan' : 'gray'}>
|
||||
{FIELD_LABELS.quantityUnit}: <Text bold color="white">{activeField === 'quantityUnit' ? `< ${uomLabel} >` : uomLabel}</Text>
|
||||
</Text>
|
||||
<Box flexDirection="column" borderStyle="round" borderColor="gray" paddingX={1}>
|
||||
{sortedIngredients.map((ing, i) => {
|
||||
const consumed = consumedArticleIds.has(ing.articleId);
|
||||
const scaled = scaledQuantity(ing);
|
||||
const color = consumed ? 'gray' : (i === ingredientCursor ? 'cyan' : 'white');
|
||||
return (
|
||||
<Box key={ing.id}>
|
||||
<Text color={color}>
|
||||
{i === ingredientCursor ? '▶ ' : ' '}
|
||||
{`${ing.position}. `.padEnd(4)}
|
||||
{articleName(ing.articleId).padEnd(35)}
|
||||
{`${scaled} ${uomLabel(ing.uom)}`.padEnd(20)}
|
||||
{consumed ? '✓ erfasst' : ''}
|
||||
</Text>
|
||||
</Box>
|
||||
);
|
||||
})}
|
||||
</Box>
|
||||
</Box>
|
||||
|
||||
<Box marginTop={1}>
|
||||
<Text color="gray" dimColor>
|
||||
Tab/↑↓ Feld wechseln · ←→ Einheit · Enter bestätigen/speichern · Escape Abbrechen
|
||||
</Text>
|
||||
<Text color="gray" dimColor>↑↓ wählen · Enter auswählen · Escape zurück</Text>
|
||||
</Box>
|
||||
</Box>
|
||||
);
|
||||
);
|
||||
}
|
||||
|
||||
// ── Phase: Pick Batch ──
|
||||
if (phase === 'pick-batch' && selectedIngredient) {
|
||||
return (
|
||||
<Box flexDirection="column" gap={1}>
|
||||
<Text color="cyan" bold>Verbrauch erfassen – Input-Charge wählen</Text>
|
||||
<Text color="gray">Zutat: {articleName(selectedIngredient.articleId)} · Soll: {scaledQuantity(selectedIngredient)} {uomLabel(selectedIngredient.uom)}</Text>
|
||||
|
||||
{availableBatches.length === 0 ? (
|
||||
<Box paddingY={1}>
|
||||
<Text color="yellow">Keine verfügbaren Chargen für diesen Artikel.</Text>
|
||||
</Box>
|
||||
) : (
|
||||
<Box flexDirection="column" borderStyle="round" borderColor="gray" paddingX={1}>
|
||||
<Box>
|
||||
<Text color="gray" bold>{' Chargen-ID'.padEnd(24)}{'Menge'.padEnd(18)}{'MHD'.padEnd(14)}Status</Text>
|
||||
</Box>
|
||||
{availableBatches.map((ab, i) => {
|
||||
const sb = ab.stockBatch;
|
||||
const color = i === batchCursor ? 'cyan' : 'white';
|
||||
return (
|
||||
<Box key={`${ab.stockId}-${sb.id}`}>
|
||||
<Text color={color}>
|
||||
{i === batchCursor ? '▶ ' : ' '}
|
||||
{(sb.batchId ?? '').padEnd(22)}
|
||||
{`${sb.quantityAmount ?? ''} ${uomLabel(sb.quantityUnit ?? '')}`.padEnd(18)}
|
||||
{(sb.expiryDate ?? '').padEnd(14)}
|
||||
{sb.status ?? ''}
|
||||
</Text>
|
||||
</Box>
|
||||
);
|
||||
})}
|
||||
</Box>
|
||||
)}
|
||||
|
||||
<Text color="gray" dimColor>↑↓ wählen · Enter auswählen · Escape zurück</Text>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
// ── Phase: Edit Quantity ──
|
||||
if (phase === 'edit-quantity' && selectedIngredient && selectedBatch) {
|
||||
const currentUomLabel = UOM_LABELS[UOM_VALUES[uomIdx] as UoM] ?? UOM_VALUES[uomIdx];
|
||||
return (
|
||||
<Box flexDirection="column" gap={1}>
|
||||
<Text color="cyan" bold>Verbrauch erfassen – Menge bestätigen</Text>
|
||||
<Text color="gray">Zutat: {articleName(selectedIngredient.articleId)}</Text>
|
||||
<Text color="gray">Charge: {selectedBatch.stockBatch.batchId} ({selectedBatch.stockBatch.quantityAmount} {uomLabel(selectedBatch.stockBatch.quantityUnit ?? '')} verfügbar)</Text>
|
||||
{submitError && <ErrorDisplay message={submitError} onDismiss={clearError} />}
|
||||
|
||||
<Box flexDirection="column" gap={1} width={60}>
|
||||
<FormInput
|
||||
label="Verbrauchte Menge *"
|
||||
value={quantityValue}
|
||||
onChange={setQuantityValue}
|
||||
onSubmit={() => void handleSubmit()}
|
||||
focus={true}
|
||||
/>
|
||||
<Box flexDirection="column">
|
||||
<Text color="cyan">
|
||||
Mengeneinheit * (←→ wechseln): <Text bold color="white">{`< ${currentUomLabel} >`}</Text>
|
||||
</Text>
|
||||
</Box>
|
||||
</Box>
|
||||
|
||||
<Text color="gray" dimColor>←→ Einheit · Enter speichern · Escape zurück</Text>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue