提交
This commit is contained in:
1 parent
ad8f8d696f
commit
41aa90aa05
115 files changed
+29626
-10210
No files matched your search
@@ -1,13 +1,20 @@
|
||||
"""出库放行审核 API"""
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.menu_guard import require_admin_or_super_admin
|
||||
from app.core.menu_guard import require_admin_or_super_admin, require_menu_code
|
||||
from app.core.response import error_response, success_response
|
||||
from app.crud import outbound_release_review as svc
|
||||
from app.models.models import SysUser
|
||||
from app.schemas.outbound_release_review import (
|
||||
OutboundBatchReviewBody,
|
||||
OutboundReviewSubmitBody,
|
||||
)
|
||||
from app.schemas.outbound_release_material import OutboundReleaseMaterialSaveBody
|
||||
from app.crud import outbound_release_material as orm_svc
|
||||
|
||||
router = APIRouter(prefix="/web/admin", tags=["出库放行审核"])
|
||||
|
||||
@@ -22,86 +29,169 @@ def _get_tenant_no(db: Session, user: dict) -> str:
|
||||
return sys_user.tenant_no
|
||||
|
||||
|
||||
class CreateBody(BaseModel):
|
||||
scheduleId: str
|
||||
def _get_current_user_id(user: dict) -> str:
|
||||
user_id = user.get("user_id")
|
||||
if not user_id:
|
||||
raise PermissionError("用户身份信息缺失")
|
||||
return str(user_id)
|
||||
|
||||
|
||||
class UpdateBody(BaseModel):
|
||||
id: str
|
||||
reviewConclusion: str
|
||||
reviewRemark: str = ""
|
||||
|
||||
|
||||
class IdBody(BaseModel):
|
||||
id: str
|
||||
|
||||
|
||||
@router.post("/pilot-release-review/create")
|
||||
async def create_review(
|
||||
body: CreateBody,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
@router.get("/pilot-release-reviews")
|
||||
async def list_pilot_release_reviews(
|
||||
page: int = Query(1, ge=1),
|
||||
pageSize: int = Query(10, ge=1, le=100),
|
||||
keyword: Optional[str] = None,
|
||||
reviewConclusion: Optional[str] = None,
|
||||
scheduleStatus: Optional[str] = None,
|
||||
qcStatus: Optional[str] = None,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:outboundReleaseReview:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
result = svc.create_release_review(
|
||||
result = svc.list_reviews_paginated(
|
||||
db,
|
||||
schedule_id=body.scheduleId,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user.get("user_id"),
|
||||
create_dept_id=user.get("region_id", ""),
|
||||
keyword=keyword,
|
||||
review_conclusion=reviewConclusion,
|
||||
schedule_status=scheduleStatus,
|
||||
qc_status=qcStatus,
|
||||
page=page,
|
||||
page_size=pageSize,
|
||||
user_info=user,
|
||||
)
|
||||
db.commit()
|
||||
return success_response(result, message="创建成功")
|
||||
except ValueError as e:
|
||||
return success_response(result)
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except Exception as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/pilot-release-review/list")
|
||||
async def list_reviews(
|
||||
scheduleId: str = Query(...),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
result = svc.list_reviews_by_schedule(
|
||||
db, schedule_id=scheduleId, tenant_no=tenant_no
|
||||
)
|
||||
return success_response(result)
|
||||
|
||||
|
||||
@router.put("/pilot-release-review/update")
|
||||
async def update_review(
|
||||
body: UpdateBody,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
@router.get("/pilot-release-reviews/{schedule_id}/detail")
|
||||
async def get_pilot_release_review_detail(
|
||||
schedule_id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:outboundReleaseReview:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
result = svc.update_review_conclusion(
|
||||
detail = svc.get_schedule_detail(db, schedule_id, tenant_no)
|
||||
if not detail:
|
||||
return error_response(404, "输注计划不存在")
|
||||
return success_response(detail)
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except Exception as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.put("/pilot-release-reviews/{schedule_id}/review")
|
||||
async def submit_single_review(
|
||||
schedule_id: str,
|
||||
body: OutboundReviewSubmitBody,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
user_id = _get_current_user_id(user)
|
||||
result = svc.review_schedule(
|
||||
db,
|
||||
review_id=body.id,
|
||||
schedule_id,
|
||||
conclusion=body.reviewConclusion,
|
||||
remark=body.reviewRemark,
|
||||
attachments=body.reviewAttachments,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user.get("user_id"),
|
||||
user_id=user_id,
|
||||
)
|
||||
return success_response(result, message="更新成功")
|
||||
db.commit()
|
||||
return success_response(result)
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
except Exception as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.delete("/pilot-release-review/delete")
|
||||
async def delete_review(
|
||||
body: IdBody,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
@router.put("/pilot-release-reviews/batch-review")
|
||||
async def batch_review(
|
||||
body: OutboundBatchReviewBody,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
svc.delete_release_review(
|
||||
db, review_id=body.id, tenant_no=tenant_no, user_id=user.get("user_id")
|
||||
user_id = _get_current_user_id(user)
|
||||
result = svc.batch_review(
|
||||
db,
|
||||
body.scheduleIds,
|
||||
conclusion=body.reviewConclusion,
|
||||
remark=body.reviewRemark,
|
||||
attachments=body.reviewAttachments,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
)
|
||||
return success_response(None, message="删除成功")
|
||||
db.commit()
|
||||
return success_response(result)
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
except Exception as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/pilot-release-reviews/{schedule_id}/outbound-materials")
|
||||
async def get_outbound_release_materials(
|
||||
schedule_id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:outboundReleaseReview:list")),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
result = orm_svc.get_outbound_material(db, schedule_id, tenant_no)
|
||||
return success_response(result)
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except Exception as e:
|
||||
if hasattr(e, "status_code") and getattr(e, "status_code") == 404:
|
||||
return error_response(404, str(getattr(e, "detail", e)))
|
||||
return error_response(400, str(getattr(e, "detail", e)))
|
||||
|
||||
|
||||
@router.put("/pilot-release-reviews/{schedule_id}/outbound-materials")
|
||||
async def save_outbound_release_materials(
|
||||
schedule_id: str,
|
||||
body: OutboundReleaseMaterialSaveBody,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
user_id = _get_current_user_id(user)
|
||||
sys_user = db.query(SysUser).filter(SysUser.id == user_id).first()
|
||||
dept_id = (sys_user.dept_id or "") if sys_user else ""
|
||||
result = orm_svc.save_outbound_material(
|
||||
db,
|
||||
schedule_id,
|
||||
paper_attachments=body.paperAttachments,
|
||||
paper_materials=[p.model_dump(by_alias=True) for p in body.paperMaterials],
|
||||
remark=body.remark,
|
||||
cells=[c.model_dump(by_alias=True) for c in body.cells],
|
||||
qc_materials=[m.model_dump(by_alias=True) for m in body.qcMaterials],
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
create_dept_id=dept_id,
|
||||
)
|
||||
db.commit()
|
||||
return success_response(result)
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except Exception as e:
|
||||
db.rollback()
|
||||
if hasattr(e, "status_code"):
|
||||
code = int(getattr(e, "status_code", 400))
|
||||
detail = getattr(e, "detail", str(e))
|
||||
return error_response(code, detail if isinstance(detail, str) else str(detail))
|
||||
return error_response(400, str(getattr(e, "detail", e)))
|
||||
@@ -733,9 +733,8 @@ async def api_create_outbound_production(
|
||||
user_id=user.get("user_id"),
|
||||
create_dept_id=user.get("dept_id", ""),
|
||||
)
|
||||
pilot_application.mark_schedule_complete(
|
||||
db, schedule_id=body.scheduleId, tenant_no=tenant_no, user_id=user.get("user_id")
|
||||
)
|
||||
db.commit()
|
||||
db.refresh(wo)
|
||||
return success_response(pwo_svc._wo_to_dict(wo), message="创建出库生产工单成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
@@ -9,7 +9,9 @@ from app.core.database import get_db
|
||||
from app.core.menu_guard import require_admin_or_super_admin
|
||||
from app.core.response import error_response, success_response
|
||||
from app.crud import pilot_infusion_schedule_mgmt as crud
|
||||
from app.crud import outbound_handover as handover_crud
|
||||
from app.models.models import SysUser
|
||||
from app.schemas.outbound_handover import OutboundHandoverSaveBody
|
||||
|
||||
router = APIRouter(prefix="/web/admin", tags=["中试输注计划管理"])
|
||||
|
||||
@@ -200,3 +202,62 @@ async def api_update(
|
||||
return success_response(result, message="更新成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/pilot-infusion-schedule-mgmt/{schedule_id}/outbound-handover")
|
||||
async def api_get_outbound_handover(
|
||||
schedule_id: str,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
result = handover_crud.get_outbound_handover(db, schedule_id, tenant_no)
|
||||
return success_response(result)
|
||||
except PermissionError as e:
|
||||
return error_response(403, str(e))
|
||||
except Exception as e:
|
||||
if hasattr(e, "status_code") and getattr(e, "status_code") == 404:
|
||||
return error_response(404, str(getattr(e, "detail", e)))
|
||||
return error_response(400, str(getattr(e, "detail", e)))
|
||||
|
||||
|
||||
@router.put("/pilot-infusion-schedule-mgmt/{schedule_id}/outbound-handover")
|
||||
async def api_save_outbound_handover(
|
||||
schedule_id: str,
|
||||
body: OutboundHandoverSaveBody,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
user_id = user.get("user_id") or ""
|
||||
sys_user = db.query(SysUser).filter(SysUser.id == user_id).first()
|
||||
dept_id = (sys_user.dept_id or "") if sys_user else ""
|
||||
om = body.outboundMaterial
|
||||
result = handover_crud.save_outbound_handover(
|
||||
db,
|
||||
schedule_id,
|
||||
outbound_material={
|
||||
"remark": om.remark,
|
||||
"cells": [c.model_dump(by_alias=True) for c in om.cells],
|
||||
"qcMaterials": [m.model_dump(by_alias=True) for m in om.qcMaterials],
|
||||
"paperMaterials": [p.model_dump(by_alias=True) for p in om.paperMaterials],
|
||||
},
|
||||
handover=body.handover.model_dump(by_alias=True),
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
create_dept_id=dept_id,
|
||||
)
|
||||
db.commit()
|
||||
return success_response(result, message="出库交接已保存")
|
||||
except PermissionError as e:
|
||||
db.rollback()
|
||||
return error_response(403, str(e))
|
||||
except Exception as e:
|
||||
db.rollback()
|
||||
if hasattr(e, "status_code"):
|
||||
code = int(getattr(e, "status_code", 400))
|
||||
detail = getattr(e, "detail", str(e))
|
||||
return error_response(code, detail if isinstance(detail, str) else str(detail))
|
||||
return error_response(400, str(getattr(e, "detail", e)))
|
||||
Reference in new issue
Block a user