功能：新增托盘二维码与用户分配

2026-07-26 11:48:22 +08:00
parent f3eda856b0
commit 6851499be2
7 changed files with 1635 additions and 2 deletions
@@ -0,0 +1,133 @@
+from typing import Annotated
+
+from fastapi import Path, Query, Request, Response
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from common.annotation.log_annotation import Log
+from common.aspect.db_seesion import DBSessionDependency
+from common.aspect.interface_auth import UserInterfaceAuthDependency
+from common.aspect.pre_auth import CurrentUserDependency, PreAuthDependency
+from common.enums import BusinessType
+from common.router import APIRouterPro
+from common.vo import DataResponseModel, PageResponseModel, ResponseBaseModel
+from module_admin.entity.vo.user_vo import CurrentUserModel
+from module_business.entity.vo.master_vo import (
+    DeletePalletModel,
+    PalletCreateModel,
+    PalletEditModel,
+    PalletModel,
+    PalletPageQueryModel,
+)
+from module_business.service.pallet_service import PalletService
+from utils.response_util import ResponseUtil
+
+pallet_controller = APIRouterPro(
+    prefix='/master/pallet', tags=['基础资料-托盘管理'], dependencies=[PreAuthDependency()]
+)
+
+
+@pallet_controller.get(
+    '/list',
+    summary='获取托盘分页列表接口',
+    description='用于获取托盘分页列表',
+    response_model=PageResponseModel[PalletModel],
+    dependencies=[UserInterfaceAuthDependency('master:pallet:list')],
+)
+async def get_master_pallet_list(
+    request: Request,
+    pallet_page_query: Annotated[PalletPageQueryModel, Query()],
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+) -> Response:
+    result = await PalletService.list_pallet(query_db, pallet_page_query, is_page=True)
+    return ResponseUtil.success(model_content=result)
+
+
+@pallet_controller.get(
+    '/{pallet_id}/qrcode',
+    summary='补打托盘二维码接口',
+    description='使用托盘原有固定标识重新生成二维码',
+    response_class=Response,
+    responses={200: {'content': {'image/png': {}}}},
+    dependencies=[UserInterfaceAuthDependency('master:pallet:print')],
+)
+async def query_master_pallet_qrcode(
+    request: Request,
+    pallet_id: Annotated[int, Path(gt=0, description='托盘ID')],
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+) -> Response:
+    png = await PalletService.get_pallet_qrcode(query_db, pallet_id)
+    return Response(content=png, media_type='image/png')
+
+
+@pallet_controller.get(
+    '/{pallet_id}',
+    summary='获取托盘详情接口',
+    description='用于获取指定托盘的详细信息',
+    response_model=DataResponseModel[PalletModel],
+    dependencies=[UserInterfaceAuthDependency('master:pallet:query')],
+)
+async def query_detail_master_pallet(
+    request: Request,
+    pallet_id: Annotated[int, Path(gt=0, description='托盘ID')],
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+) -> Response:
+    result = await PalletService.detail_pallet(query_db, pallet_id)
+    return ResponseUtil.success(data=result)
+
+
+@pallet_controller.post(
+    '',
+    summary='新增托盘接口',
+    description='用于新增托盘及初始库存',
+    response_model=ResponseBaseModel,
+    dependencies=[UserInterfaceAuthDependency('master:pallet:add')],
+)
+@Log(title='托盘管理', business_type=BusinessType.INSERT)
+async def add_master_pallet(
+    request: Request,
+    add_pallet: PalletCreateModel,
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+    current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
+) -> Response:
+    result = await PalletService.add_pallet(query_db, add_pallet, current_user.user.user_name)
+    return ResponseUtil.success(msg=result.message)
+
+
+@pallet_controller.put(
+    '',
+    summary='编辑托盘接口',
+    description='仅编辑托盘容量、资产状态和备注',
+    response_model=ResponseBaseModel,
+    dependencies=[UserInterfaceAuthDependency('master:pallet:edit')],
+)
+@Log(title='托盘管理', business_type=BusinessType.UPDATE)
+async def edit_master_pallet(
+    request: Request,
+    edit_pallet: PalletEditModel,
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+    current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
+) -> Response:
+    result = await PalletService.edit_pallet(query_db, edit_pallet, current_user.user.user_name)
+    return ResponseUtil.success(msg=result.message)
+
+
+@pallet_controller.delete(
+    '/{pallet_ids}',
+    summary='删除托盘接口',
+    description='用于删除尚未入库且没有流转事件的托盘',
+    response_model=ResponseBaseModel,
+    dependencies=[UserInterfaceAuthDependency('master:pallet:remove')],
+)
+@Log(title='托盘管理', business_type=BusinessType.DELETE)
+async def delete_master_pallet(
+    request: Request,
+    pallet_ids: Annotated[
+        str,
+        Path(pattern=r'^[1-9]\d*(,[1-9]\d*)*$', description='需要删除的托盘ID'),
+    ],
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+    current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
+) -> Response:
+    delete_pallet = DeletePalletModel(palletIds=[int(pallet_id) for pallet_id in pallet_ids.split(',')])
+    result = await PalletService.remove_pallet(query_db, delete_pallet)
+    return ResponseUtil.success(msg=result.message)
@@ -12,13 +12,61 @@ from common.enums import BusinessType
 from common.router import APIRouterPro
 from common.vo import DataResponseModel, PageResponseModel, ResponseBaseModel
 from module_admin.entity.vo.user_vo import CurrentUserModel
-from module_business.entity.vo.master_vo import DeleteSiteModel, SiteModel, SitePageQueryModel
+from module_business.entity.vo.master_vo import (
+    BusinessUserOptionModel,
+    DeleteSiteModel,
+    SiteModel,
+    SitePageQueryModel,
+    UserAssignModel,
+)
 from module_business.service.master_service import MasterService
+from module_business.service.pallet_service import PalletService
 from utils.response_util import ResponseUtil

+ASSIGN_LOG = Log
+ASSIGN_CURRENT_USER = CurrentUserDependency
+
 site_controller = APIRouterPro(
    prefix='/master/site', tags=['基础资料-客户现场管理'], dependencies=[PreAuthDependency()]
 )
+site_user_controller = APIRouterPro(
+    prefix='/master/site', tags=['基础资料-客户现场用户分配'], dependencies=[PreAuthDependency()]
+)
+
+
+@site_user_controller.get(
+    '/{site_id}/users',
+    summary='获取客户现场可分配用户接口',
+    description='获取启用且未删除的用户及客户现场分配状态',
+    response_model=DataResponseModel[list[BusinessUserOptionModel]],
+    dependencies=[UserInterfaceAuthDependency('master:site:assign')],
+)
+async def get_master_site_users(
+    request: Request,
+    site_id: Annotated[int, Path(gt=0, description='客户现场ID')],
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+) -> Response:
+    users = await PalletService.list_site_users(query_db, site_id)
+    return ResponseUtil.success(data=users)
+
+
+@site_user_controller.put(
+    '/{site_id}/users',
+    summary='分配客户现场用户接口',
+    description='完整替换客户现场的用户关联',
+    response_model=ResponseBaseModel,
+    dependencies=[UserInterfaceAuthDependency('master:site:assign')],
+)
+@ASSIGN_LOG(title='客户现场用户分配', business_type=BusinessType.GRANT)
+async def assign_master_site_users(
+    request: Request,
+    site_id: Annotated[int, Path(gt=0, description='客户现场ID')],
+    assignment: UserAssignModel,
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+    current_user: Annotated[CurrentUserModel, ASSIGN_CURRENT_USER()],
+) -> Response:
+    result = await PalletService.assign_site_users(query_db, site_id, assignment)
+    return ResponseUtil.success(msg=result.message)


@site_controller.get(
@@ -12,13 +12,61 @@ from common.enums import BusinessType
 from common.router import APIRouterPro
 from common.vo import DataResponseModel, PageResponseModel, ResponseBaseModel
 from module_admin.entity.vo.user_vo import CurrentUserModel
-from module_business.entity.vo.master_vo import DeleteWarehouseModel, WarehouseModel, WarehousePageQueryModel
+from module_business.entity.vo.master_vo import (
+    BusinessUserOptionModel,
+    DeleteWarehouseModel,
+    UserAssignModel,
+    WarehouseModel,
+    WarehousePageQueryModel,
+)
 from module_business.service.master_service import MasterService
+from module_business.service.pallet_service import PalletService
 from utils.response_util import ResponseUtil

+ASSIGN_LOG = Log
+ASSIGN_CURRENT_USER = CurrentUserDependency
+
 warehouse_controller = APIRouterPro(
    prefix='/master/warehouse', tags=['基础资料-仓库管理'], dependencies=[PreAuthDependency()]
 )
+warehouse_user_controller = APIRouterPro(
+    prefix='/master/warehouse', tags=['基础资料-仓库用户分配'], dependencies=[PreAuthDependency()]
+)
+
+
+@warehouse_user_controller.get(
+    '/{warehouse_id}/users',
+    summary='获取仓库可分配用户接口',
+    description='获取启用且未删除的用户及仓库分配状态',
+    response_model=DataResponseModel[list[BusinessUserOptionModel]],
+    dependencies=[UserInterfaceAuthDependency('master:warehouse:assign')],
+)
+async def get_master_warehouse_users(
+    request: Request,
+    warehouse_id: Annotated[int, Path(gt=0, description='仓库ID')],
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+) -> Response:
+    users = await PalletService.list_warehouse_users(query_db, warehouse_id)
+    return ResponseUtil.success(data=users)
+
+
+@warehouse_user_controller.put(
+    '/{warehouse_id}/users',
+    summary='分配仓库用户接口',
+    description='完整替换仓库的用户关联',
+    response_model=ResponseBaseModel,
+    dependencies=[UserInterfaceAuthDependency('master:warehouse:assign')],
+)
+@ASSIGN_LOG(title='仓库用户分配', business_type=BusinessType.GRANT)
+async def assign_master_warehouse_users(
+    request: Request,
+    warehouse_id: Annotated[int, Path(gt=0, description='仓库ID')],
+    assignment: UserAssignModel,
+    query_db: Annotated[AsyncSession, DBSessionDependency()],
+    current_user: Annotated[CurrentUserModel, ASSIGN_CURRENT_USER()],
+) -> Response:
+    result = await PalletService.assign_warehouse_users(query_db, warehouse_id, assignment)
+    return ResponseUtil.success(msg=result.message)


@warehouse_controller.get(