yujiangandClaude Opus 5.5
3050ccdc4e
为 Web 端改版提供名称、统计和看板数据。只新增只读查询、扩展列表与详情 返回字段；写接口、托盘状态机和幂等键规则均未改动，未新增权限标识。 - 基础资料：列表补充名称与汇总，客户详情返回现场树，托盘详情返回最近流转， 托盘列表支持按流转阶段筛选和二维码精确匹配；新增现场、产线、隧道的上级 资料选项接口；Excel 导入支持 preview 只校验不写入 - 发货出库：列表支持 keyword、receiptState 筛选并补充名称、托盘数、包数和 菌种构成；详情明细补充托盘号、菌种、批次 - 首次入库：列表与详情补充名称、托盘数、托盘当前状态；新增 /summary - 托盘退回：列表支持 keyword 并补充名称与托盘汇总，详情补充托盘号和隧道； 新增 /summary、/site-options - 工厂装填：列表支持 keyword 并补充托盘号、仓库、操作人；新增 /summary、 /batches、/batches/detail - 客户现场使用：列表支持 keyword、fifoSkipped 并补充名称和被跳过的先到托盘号； 新增 /site-options、/site-board 以及 usage-fifo 的 /queue - 先到先用 DAO 抽出公共候选条件与排序，建议查询生成的 SQL 与改动前一致 - 新增各汇总 DAO 的单元测试，同步更新路由权限与模型字段契约测试 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
60 lines
2.5 KiB
Python
60 lines
2.5 KiB
Python
"""只读先进先出建议；不强行阻断会议要求的多批次混用。"""
|
|
|
|
from typing import Annotated
|
|
|
|
from fastapi import Query, Request, Response
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from common.aspect.db_seesion import DBSessionDependency
|
|
from common.aspect.interface_auth import UserInterfaceAuthDependency
|
|
from common.aspect.pre_auth import CurrentUserDependency, PreAuthDependency
|
|
from common.router import APIRouterPro
|
|
from common.vo import DataResponseModel
|
|
from module_admin.entity.vo.user_vo import CurrentUserModel
|
|
from module_business.dependency.test_batch_dependency import TestBatchScopeDependency
|
|
from module_business.domain.test_batch_scope import TestBatchScope
|
|
from module_business.entity.vo.usage_fifo_vo import UsageFifoQueueModel, UsageFifoRecommendationModel
|
|
from module_business.service.usage_fifo_service import UsageFifoService
|
|
from utils.response_util import ResponseUtil
|
|
|
|
usage_fifo_controller = APIRouterPro(
|
|
prefix='/business/usage-fifo',
|
|
tags=['业务管理-客户现场使用'],
|
|
dependencies=[PreAuthDependency()],
|
|
)
|
|
|
|
|
|
@usage_fifo_controller.get(
|
|
'/recommendation',
|
|
response_model=DataResponseModel[UsageFifoRecommendationModel],
|
|
dependencies=[UserInterfaceAuthDependency('business:usage:query')],
|
|
)
|
|
async def get_usage_fifo_recommendation(
|
|
request: Request,
|
|
qr_token: Annotated[str, Query(alias='qrToken', min_length=1, max_length=128, pattern=r'\S')],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
test_scope: Annotated[TestBatchScope, TestBatchScopeDependency()],
|
|
tunnel_id: Annotated[int | None, Query(alias='tunnelId', gt=0)] = None,
|
|
) -> Response:
|
|
result = await UsageFifoService.recommendation(
|
|
query_db, qr_token, current_user, test_scope, tunnel_id=tunnel_id,
|
|
)
|
|
return ResponseUtil.success(data=result)
|
|
|
|
|
|
@usage_fifo_controller.get(
|
|
'/queue',
|
|
response_model=DataResponseModel[UsageFifoQueueModel],
|
|
dependencies=[UserInterfaceAuthDependency('business:usage:query')],
|
|
)
|
|
async def get_usage_fifo_queue(
|
|
request: Request,
|
|
site_id: Annotated[int, Query(alias='siteId', gt=0, description='客户现场ID')],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
test_scope: Annotated[TestBatchScope, TestBatchScopeDependency()],
|
|
) -> Response:
|
|
result = await UsageFifoService.queue(query_db, site_id, current_user, test_scope)
|
|
return ResponseUtil.success(data=result)
|