From 2fe90f052ac7bacb10ff0d48ecb92249b66946e7 Mon Sep 17 00:00:00 2001 From: wcq <744800102@qq.com> Date: Wed, 13 Dec 2023 11:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E6=94=B6=E5=8D=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/receive/mods/receive_order/router.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/mods/receive/mods/receive_order/router.py b/mods/receive/mods/receive_order/router.py index f1cc452..f8b9ebf 100644 --- a/mods/receive/mods/receive_order/router.py +++ b/mods/receive/mods/receive_order/router.py @@ -1,9 +1,12 @@ +from datetime import datetime + from fastapi import APIRouter, Depends, HTTPException from sqlalchemy.orm import Session from ...common import get_db from . import crud from . import schemas +from ...schemas import ReceiveOrderState router = APIRouter(tags=["接收单"], prefix='/receive_order') @@ -49,11 +52,14 @@ def receive_order_query(req: schemas.ReceiveOrderQueryReq, db: Session = Depends return schemas.ReceiveOrderQueryRes(count=count, items=items) -@router.post("/all", summary="获取所有接收单", response_model=schemas.ReceiveOrderAllRes) -def receive_order_all(req: schemas.ReceiveOrderAllReq, db: Session = Depends(get_db)): - query = crud.receive_order_all(db) - items = [schemas.ReceiveOrderInfo(**item.to_full_dict(include=req.include, - ex_include=req.ex_include, - relation_use_id=req.relation_use_id)) for item in query] - return schemas.ReceiveOrderAllRes(items=items) +@router.post("/finish_order", summary="完成接受单") +def finish_order(req: schemas.ReceiveOrderId, db: Session = Depends(get_db)): + item = crud.receive_order_get(db, req) + for file in item.files: + if not file.file_path: + raise HTTPException(status_code=303, detail='存在未收集文件') + item.state = ReceiveOrderState.finish + item.finish_time = datetime.now() + db.commit() + return '成功' #########