0e6b3b1811
按 ROADMAP §3.1 治理批次推进的后端设计审查整改:
- 批次 0(安全):/api/status/{task_id} 补 JWT 鉴权与任务归属校验;
pythonocc_available 真实探测;bcrypt 超 72 字节显式拒绝;
SECRET_KEY/RUSTFS_* 惰性校验,代码侧弱默认移除
- 批次 1(部署正确性):主处理链路改走 RustFS(分派入参 stp_file_id 化,
worker 按 object_key 下载);AUTO_MIGRATE 开关 + 迁移目录 alembic/→migrations/
修复包遮蔽(自动迁移此前从未真正生效);OCC 镜像改 conda 原生执行 +
基础镜像 tag 锁定;compose 关键项改 ${VAR:?} 强制显式配置
- 批次 2(任务一致性):删除 Redis 进程内存回退,PG 为任务状态单一事实源;
批量元数据入库(processing_tasks.batch_id,迁移 a3f8c2d91e47);
型腔失败任务标 failed 不再静默 completed;事务边界收口
(数据本体写 flush-only、失败先回滚再置 failed、进度更新保留即时 commit)
- 批次 3(API 与代码结构):592 行 advanced_router 拆为 design/cost/machining/
export 四子路由,请求体全量 Pydantic 化;ROUTE_MODULES + route_registry
(/api/health 呈现 degraded,DEBUG fail fast);纯计算端点统一 to_thread;
StorageIntegrationService 按职责三拆;MAX_FILE_SIZE 接线生效、
celery 复用 Settings.redis_url;管理员重置密码改 JSON body(端到端断裂修复);
openapi.json 重导出(76 paths)+ 前端 gen:api
- 批次 4(架构演进):共享 ORM 按模块拆分(shared/models/base.py + identity.py、
moldinsight/models/、inventory/models/,删除三条无使用方的跨模块
relationship,跨模块桥接收敛为裸 FK 硬规则,无兼容 facade);
OCC executor 重建补 cancel_futures=True(消除旧队列被慢恢复线程
并行消化的数据竞争);OCC 吞吐方案设计先行
(docs/topics/performance/OCC_THROUGHPUT.md);顺手清偿 D15
(vite.config.ts 未用参数致 npm run build 失败)
测试基线:125 passed, 2 skipped(pytest + sqlite+aiosqlite;归属边界、
路由契约、配置治理、鉴权回归等随批新增)
文档同步:STATUS / TECH_DEBT / ROADMAP / ARCHITECTURE / API_CONTRACT /
OPERATIONS / AGENTS
Co-Authored-By: Claude Code <noreply@anthropic.com>
115 lines
4.1 KiB
Python
115 lines
4.1 KiB
Python
"""销售订单路由层 - 薄路由
|
|
|
|
业务逻辑下沉至 inventory.services.sales_order_service,路由只做参数校验与响应组装。
|
|
路由前缀: /api/sales-orders
|
|
"""
|
|
from fastapi import APIRouter, Depends, Query
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from typing import Optional
|
|
|
|
from shared.database.database import get_db_session
|
|
from shared.services.auth_service import get_current_active_user
|
|
from shared.models.identity import User
|
|
from ..schemas import (
|
|
SalesOrderCreate,
|
|
SalesOrderResponse,
|
|
SalesOrderDetailResponse,
|
|
SalesOrderProductionPlanResponse,
|
|
SalesOrderIssueRequest,
|
|
SalesOrderIssueResponse,
|
|
SalesOrderStatusUpdate,
|
|
MaterialConsumptionRequest,
|
|
PaginatedResponse,
|
|
)
|
|
from ..services.sales_order_service import sales_order_service
|
|
|
|
router = APIRouter(prefix="/sales-orders", tags=["销售订单"])
|
|
|
|
|
|
@router.get("", response_model=PaginatedResponse[SalesOrderResponse])
|
|
async def list_sales_orders(
|
|
status: Optional[str] = None,
|
|
skip: int = Query(0, ge=0),
|
|
limit: int = Query(20, ge=1, le=100),
|
|
db_session: AsyncSession = Depends(get_db_session),
|
|
current_user: User = Depends(get_current_active_user)
|
|
):
|
|
return await sales_order_service.list_orders(db_session, status, skip, limit)
|
|
|
|
|
|
@router.post("", response_model=SalesOrderResponse, status_code=201)
|
|
async def create_sales_order(
|
|
order_data: SalesOrderCreate,
|
|
db_session: AsyncSession = Depends(get_db_session),
|
|
current_user: User = Depends(get_current_active_user)
|
|
):
|
|
return await sales_order_service.create_order(db_session, order_data, current_user)
|
|
|
|
|
|
@router.get("/{order_id}", response_model=SalesOrderDetailResponse)
|
|
async def get_sales_order_detail(
|
|
order_id: int,
|
|
db_session: AsyncSession = Depends(get_db_session),
|
|
current_user: User = Depends(get_current_active_user)
|
|
):
|
|
return await sales_order_service.get_detail(db_session, order_id)
|
|
|
|
|
|
@router.put("/{order_id}", response_model=SalesOrderResponse)
|
|
async def update_sales_order(
|
|
order_id: int,
|
|
order_data: SalesOrderCreate,
|
|
db_session: AsyncSession = Depends(get_db_session),
|
|
current_user: User = Depends(get_current_active_user)
|
|
):
|
|
return await sales_order_service.update_order(db_session, order_id, order_data, current_user)
|
|
|
|
|
|
@router.patch("/{order_id}/status", response_model=SalesOrderResponse)
|
|
async def update_sales_order_status(
|
|
order_id: int,
|
|
payload: SalesOrderStatusUpdate,
|
|
db_session: AsyncSession = Depends(get_db_session),
|
|
current_user: User = Depends(get_current_active_user)
|
|
):
|
|
return await sales_order_service.update_status(db_session, order_id, payload, current_user)
|
|
|
|
|
|
@router.delete("/{order_id}")
|
|
async def delete_sales_order(
|
|
order_id: int,
|
|
db_session: AsyncSession = Depends(get_db_session),
|
|
current_user: User = Depends(get_current_active_user)
|
|
):
|
|
return await sales_order_service.delete_order(db_session, order_id, current_user)
|
|
|
|
|
|
@router.post("/{order_id}/consume-materials")
|
|
async def consume_materials(
|
|
order_id: int,
|
|
request: MaterialConsumptionRequest,
|
|
db_session: AsyncSession = Depends(get_db_session),
|
|
current_user: User = Depends(get_current_active_user)
|
|
):
|
|
"""记录销售订单的物料消耗(在已发料基础上记录额外消耗,如报废/超耗)"""
|
|
return await sales_order_service.consume_materials(db_session, order_id, request, current_user)
|
|
|
|
|
|
@router.get("/{order_id}/production-plan", response_model=SalesOrderProductionPlanResponse)
|
|
async def get_sales_order_production_plan(
|
|
order_id: int,
|
|
db_session: AsyncSession = Depends(get_db_session),
|
|
current_user: User = Depends(get_current_active_user)
|
|
):
|
|
return await sales_order_service.get_production_plan(db_session, order_id)
|
|
|
|
|
|
@router.post("/{order_id}/issue-materials", response_model=SalesOrderIssueResponse)
|
|
async def issue_sales_order_materials(
|
|
order_id: int,
|
|
payload: SalesOrderIssueRequest,
|
|
db_session: AsyncSession = Depends(get_db_session),
|
|
current_user: User = Depends(get_current_active_user)
|
|
):
|
|
return await sales_order_service.issue_materials(db_session, order_id, payload, current_user)
|