0310cdfbd6
Einheiten (neu):
- Tabelle units (name, kind=count|weight|volume, factor, is_builtin); eingebaut
Stueck/Gramm/Kilogramm/Milliliter/Liter, Admin kann eigene anlegen (z.B. Pfund=500g).
- Bestaende bleiben intern in kanonischer Basis (Stueck/Gramm/Milliliter);
Product.display_unit_id und Group.min_stock_unit_id als nullable FKs.
- Neuer Umrechnungs-Service (services/conversion.py) ersetzt die feste Einheitenlogik;
Ein-/Auslagern und Gruppen-Mindestbestand rechnen ueber den Faktor.
- Gruppen-Mindestbestand mit Einheit; Gruppenbestand summiert nur Produkte
passender Art. Neue Verwaltungsseite "Einheiten" (Admin).
- Schonende Migration beim Start: ADD COLUMN IF NOT EXISTS (Postgres), damit
bestehende Installationen ihre Daten behalten.
Chargen:
- PATCH /lots/{id} und DELETE /lots/{id}: Menge/MHD korrigieren, Charge loeschen
(wird als Korrektur-Bewegung protokolliert). Bearbeitung im Produktdetail.
Auslagern:
- Optionales lot_id: gezielt aus einer bestimmten Charge/MHD abbuchen statt FEFO;
Auswahl-Dropdown in der Auslagern-Seite.
Sonstiges: Roadmap aktualisiert, Tests fuer die Umrechnung.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
96 lines
3.2 KiB
Python
96 lines
3.2 KiB
Python
from fastapi import APIRouter, Depends, HTTPException, status
|
|
from sqlalchemy.orm import Session
|
|
|
|
from ..database import get_db
|
|
from ..deps import get_current_user, require_admin
|
|
from ..models import Group, Product, User
|
|
from ..schemas import GroupCreate, GroupOut, GroupUpdate
|
|
from ..services.conversion import BASE_OF_KIND
|
|
from ..services.stock import current_stock
|
|
|
|
router = APIRouter(prefix="/groups", tags=["groups"])
|
|
|
|
|
|
def _group_to_out(db: Session, group: Group) -> GroupOut:
|
|
out = GroupOut.model_validate(group)
|
|
products = db.query(Product).filter(Product.group_id == group.id).all()
|
|
out.product_count = len(products)
|
|
unit = group.min_stock_unit
|
|
if unit is not None:
|
|
# Bestand nur über Produkte gleicher Art, in der Gruppen-Einheit ausgedrückt.
|
|
base = BASE_OF_KIND[unit.kind]
|
|
matching = [p for p in products if p.base_unit == base]
|
|
stock_base = float(sum(current_stock(db, p.id) for p in matching))
|
|
out.stock = stock_base / unit.factor
|
|
out.min_stock_unit_name = unit.name
|
|
out.kind = unit.kind.value
|
|
else:
|
|
out.stock = float(sum(current_stock(db, p.id) for p in products))
|
|
return out
|
|
|
|
|
|
@router.get("", response_model=list[GroupOut])
|
|
def list_groups(
|
|
db: Session = Depends(get_db), _: User = Depends(get_current_user)
|
|
) -> list[GroupOut]:
|
|
groups = db.query(Group).order_by(Group.name).all()
|
|
return [_group_to_out(db, g) for g in groups]
|
|
|
|
|
|
@router.post("", response_model=GroupOut, status_code=status.HTTP_201_CREATED)
|
|
def create_group(
|
|
payload: GroupCreate,
|
|
db: Session = Depends(get_db),
|
|
_: User = Depends(require_admin),
|
|
) -> GroupOut:
|
|
if db.query(Group).filter(Group.name == payload.name).first():
|
|
raise HTTPException(status.HTTP_409_CONFLICT, "Gruppe existiert bereits")
|
|
group = Group(
|
|
name=payload.name,
|
|
min_stock=payload.min_stock,
|
|
min_stock_unit_id=payload.min_stock_unit_id,
|
|
)
|
|
db.add(group)
|
|
db.commit()
|
|
db.refresh(group)
|
|
return _group_to_out(db, group)
|
|
|
|
|
|
@router.patch("/{group_id}", response_model=GroupOut)
|
|
def update_group(
|
|
group_id: int,
|
|
payload: GroupUpdate,
|
|
db: Session = Depends(get_db),
|
|
_: User = Depends(require_admin),
|
|
) -> GroupOut:
|
|
group = db.get(Group, group_id)
|
|
if group is None:
|
|
raise HTTPException(status.HTTP_404_NOT_FOUND, "Gruppe nicht gefunden")
|
|
data = payload.model_dump(exclude_unset=True)
|
|
if "name" in data and data["name"]:
|
|
clash = (
|
|
db.query(Group)
|
|
.filter(Group.name == data["name"], Group.id != group_id)
|
|
.first()
|
|
)
|
|
if clash:
|
|
raise HTTPException(status.HTTP_409_CONFLICT, "Name bereits vergeben")
|
|
for field, value in data.items():
|
|
setattr(group, field, value)
|
|
db.commit()
|
|
db.refresh(group)
|
|
return _group_to_out(db, group)
|
|
|
|
|
|
@router.delete("/{group_id}", status_code=status.HTTP_204_NO_CONTENT)
|
|
def delete_group(
|
|
group_id: int,
|
|
db: Session = Depends(get_db),
|
|
_: User = Depends(require_admin),
|
|
) -> None:
|
|
group = db.get(Group, group_id)
|
|
if group is None:
|
|
raise HTTPException(status.HTTP_404_NOT_FOUND, "Gruppe nicht gefunden")
|
|
db.delete(group)
|
|
db.commit()
|