From 82bb06c9efcfa21354bce321b609738018e1f9ec Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Mon, 15 Jun 2026 14:01:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(market):=20=E6=96=B0=E5=A2=9E=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E6=A8=A1=E5=9D=97=20API=20=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增 /web/admin/my-material-usages 接口,获取当前用户的物料领用记录。 路由前缀 /web/admin,标签为"市场"。 Co-authored-by: Cursor --- backend/app/api/__init__.py | 2 ++ backend/app/api/market.py | 48 +++++++++++++++++++++++++++++++++++++ backend/app/main.py | 3 ++- 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 backend/app/api/market.py diff --git a/backend/app/api/__init__.py b/backend/app/api/__init__.py index 61521cb6..d2d12570 100644 --- a/backend/app/api/__init__.py +++ b/backend/app/api/__init__.py @@ -30,6 +30,7 @@ from app.api.outbound_release_review import router as outbound_release_review_ro from app.api.clinical_payment import router as clinical_payment_router from app.api.env_detect import router as env_detect_router from app.api.cleanroom_garment import router as cleanroom_garment_router +from app.api.market import router as market_router __all__ = [ "public_router", @@ -63,4 +64,5 @@ __all__ = [ "clinical_payment_router", "env_detect_router", "cleanroom_garment_router", + "market_router", ] diff --git a/backend/app/api/market.py b/backend/app/api/market.py new file mode 100644 index 00000000..b3efc849 --- /dev/null +++ b/backend/app/api/market.py @@ -0,0 +1,48 @@ +"""市场模块 API(市场物料领用记录)""" +from typing import Optional + +from fastapi import APIRouter, Depends, Query +from pydantic import BaseModel +from sqlalchemy.orm import Session + +from app.api.sample_reception import _get_current_user_id, _get_tenant_no, _page_payload +from app.core.database import get_db +from app.core.menu_guard import require_menu_code +from app.core.response import success_response +from app.crud import material as mat_svc + +router = APIRouter(prefix="/web/admin", tags=["市场"]) + + +@router.get("/my-material-usages") +async def get_my_material_usage_list( + page: int = Query(1, ge=1), + page_size: int = Query(10, ge=1, le=100, alias="pageSize"), + keyword: Optional[str] = None, + material_id: Optional[str] = None, + material_type: Optional[str] = None, + change_type: Optional[str] = None, + start_time: Optional[str] = None, + end_time: Optional[str] = None, + user: dict = Depends(require_menu_code("market:material-usage:list")), + db: Session = Depends(get_db), +): + """获取当前用户的物料领用记录""" + tenant_no = _get_tenant_no(db, user) + user_id = _get_current_user_id(user) + + records, total = mat_svc.get_my_usages( + db=db, + current_user_id=user_id, + tenant_no=tenant_no, + page=page, + page_size=page_size, + keyword=keyword, + material_id=material_id, + material_type=material_type, + change_type=change_type, + start_time=start_time, + end_time=end_time, + ) + + return success_response(_page_payload(records, total, page, page_size)) diff --git a/backend/app/main.py b/backend/app/main.py index 97715aca..53dff77f 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -13,7 +13,7 @@ from app.core.database import SessionLocal from app.core.api_request_log_middleware import ApiRequestLogMiddleware from app.core.api_crypto_middleware import ApiCryptoMiddleware from app.models import models # noqa: F401 -from app.api import public_router, menu_router, admin_router, workflow_router, basic_info_router, collection_protocol_router, leave_router, operations_router, ethnic_router, sample_reception_router, qc_router, research_donation_router, production_router, pilot_service_router, insurance_company_router, material_router, storage_release_review_router, sample_sms_notification_router, storage_entry_sms_notification_router, qc_sms_notification_router, protocol_sample_collection_router, research_donation_sample_collection_router, pilot_application_router, pilot_checkup_router, pilot_delivery_router, pilot_infusion_confirm_router, pilot_infusion_schedule_mgmt_router, outbound_release_review_router, clinical_payment_router, env_detect_router, cleanroom_garment_router +from app.api import public_router, menu_router, admin_router, workflow_router, basic_info_router, collection_protocol_router, leave_router, operations_router, ethnic_router, sample_reception_router, qc_router, research_donation_router, production_router, pilot_service_router, insurance_company_router, material_router, storage_release_review_router, sample_sms_notification_router, storage_entry_sms_notification_router, qc_sms_notification_router, protocol_sample_collection_router, research_donation_sample_collection_router, pilot_application_router, pilot_checkup_router, pilot_delivery_router, pilot_infusion_confirm_router, pilot_infusion_schedule_mgmt_router, outbound_release_review_router, clinical_payment_router, env_detect_router, cleanroom_garment_router, market_router @asynccontextmanager @@ -129,6 +129,7 @@ app.include_router(outbound_release_review_router, prefix=settings.API_V1_PREFIX app.include_router(clinical_payment_router, prefix=settings.API_V1_PREFIX) app.include_router(env_detect_router, prefix=settings.API_V1_PREFIX) app.include_router(cleanroom_garment_router, prefix=settings.API_V1_PREFIX) +app.include_router(market_router, prefix=settings.API_V1_PREFIX) def _mask_secret(value: str) -> str: