duxingchen
71e660b428
业务调整：车间驳回不必须拍照（编号错误、选错工序等场景无需照片举证）。 - schemas/task.py: TaskRejectRequest.images 由必填(min_length=1)改为 default_factory=list，保留 max_length=9 与 URL 总长保护；reason 增加 mode="before" 的 strip 校验器，堵住纯空格凑长度绕过 min_length 的口子 （顺带保证落库的 reject_reason 不带首尾空白） - task_service.py: 驳回时把原因+图片写入 TaskRecord 挂到被驳回任务下， 修复前端时间线看不到驳回详情的问题；转交时把交接备注也挂一条记录到 下家任务，补齐接手人的上下文视角 - task_service.py: create_task / receive_task 写入 overall_status 后调用 sync_product_status 对齐 status 字段
191 lines
7.2 KiB
Python
191 lines
7.2 KiB
Python
"""任务 Pydantic Schemas — 支持无限嵌套子任务、裂变转交、驳回返工"""
|
||
from __future__ import annotations
|
||
import uuid
|
||
from datetime import datetime
|
||
from typing import Optional
|
||
from pydantic import BaseModel, Field, field_validator
|
||
|
||
|
||
# ============================================================
|
||
# 请求模型
|
||
# ============================================================
|
||
|
||
class TaskCreate(BaseModel):
|
||
"""创建任务"""
|
||
product_id: uuid.UUID = Field(..., description="所属产品ID")
|
||
parent_task_id: uuid.UUID | None = Field(None, description="父任务ID(用于嵌套子任务/裂变分支)")
|
||
task_name: str = Field(..., max_length=200, description="任务名称")
|
||
assignee_id: str | None = Field(None, max_length=64, description="负责人ID(逻辑外键→老系统)")
|
||
notify_parent_on_complete: bool = Field(False, description="完成后是否通知父任务")
|
||
is_rework: bool = Field(False, description="是否为返工任务")
|
||
remark: str | None = Field(None, max_length=2000, description="初始描述/交接备注")
|
||
|
||
model_config = {"from_attributes": True}
|
||
|
||
|
||
class TaskUpdate(BaseModel):
|
||
"""更新任务"""
|
||
task_name: str | None = Field(None, max_length=200)
|
||
assignee_id: str | None = Field(None, max_length=64)
|
||
status: str | None = Field(None, max_length=50, description="任务状态")
|
||
notify_parent_on_complete: bool | None = Field(None)
|
||
|
||
model_config = {"from_attributes": True}
|
||
|
||
|
||
class TaskCompleteRequest(BaseModel):
|
||
"""完成任务请求 — 携带转交信息（保留兼容旧版单步转交）"""
|
||
operator_id: str | None = Field(None, max_length=64, description="操作人ID")
|
||
next_assignee_id: str | None = Field(None, max_length=64, description="下一步任务负责人ID")
|
||
next_task_name: str | None = Field(None, max_length=200, description="下一步任务名称")
|
||
remark: str | None = Field(None, description="完成备注")
|
||
|
||
|
||
class SubtaskCreate(BaseModel):
|
||
"""创建子任务"""
|
||
task_name: str = Field(..., max_length=200, description="子任务名称")
|
||
assignee_id: str | None = Field(None, max_length=64, description="负责人ID")
|
||
notify_parent_on_complete: bool = Field(False, description="完成后是否通知父任务")
|
||
|
||
|
||
class TaskRejectRequest(BaseModel):
|
||
"""品质驳回请求 — 驳回原因必填；异常图片【选填】
|
||
（编号错误、工序选错等场景无需拍照举证，故不强制传图）"""
|
||
reason: str = Field(..., min_length=1, max_length=500, description="驳回原因（必填）")
|
||
images: list[str] = Field(
|
||
default_factory=list, max_length=9,
|
||
description="异常图片 URL 列表（选填，可传空数组，最多 9 张）",
|
||
)
|
||
|
||
@field_validator("reason", mode="before")
|
||
@classmethod
|
||
def _strip_reason(cls, v):
|
||
"""先 strip 再交给 min_length 校验：否则纯空格（' '）能凑够长度绕过必填。
|
||
顺带保证落库的 Task.reject_reason / TaskRecord.remark 不带首尾空白。
|
||
非字符串原样返回，让 Pydantic 抛出正常的类型错误。"""
|
||
return v.strip() if isinstance(v, str) else v
|
||
|
||
@field_validator("images")
|
||
@classmethod
|
||
def _validate_images(cls, v: list[str]) -> list[str]:
|
||
"""剥离空串（前端可能提交 [''] 之类的占位），并做总长度上限校验，
|
||
避免落库时才撞上 TaskRecord.images 的 String(4000) 上限。图片选填，允许为空。"""
|
||
urls = [u.strip() for u in v if u and u.strip()]
|
||
if sum(len(u) for u in urls) > 3500:
|
||
raise ValueError("异常图片 URL 总长度超限，请减少图片数量")
|
||
return urls
|
||
|
||
|
||
class TaskTransferBranch(BaseModel):
|
||
"""裂变分支"""
|
||
task_name: str = Field(..., max_length=200, description="工序名称")
|
||
assignees: list[str] = Field(..., min_length=1, description="接收人列表")
|
||
|
||
|
||
class TaskTransferRequest(BaseModel):
|
||
"""完工裂变转交请求 — 支持多分支 next_tasks 和旧版单线兼容"""
|
||
next_assignees: list[str] | None = Field(None, description="[旧版] 下一道工序接收人列表")
|
||
next_task_name: str | None = Field(None, max_length=200, description="[旧版] 下一道工序名称")
|
||
next_tasks: list[TaskTransferBranch] | None = Field(None, description="[新版] 多分支任务列表")
|
||
note: str | None = Field(None, description="交接备注")
|
||
|
||
|
||
class TaskRecordCreate(BaseModel):
|
||
"""任务进度记录 — 备注 + 图片"""
|
||
remark: str = Field("", max_length=2000, description="备注文本")
|
||
images: list[str] = Field(default_factory=list, description="图片 URL 列表")
|
||
|
||
|
||
class TaskRecordResponse(BaseModel):
|
||
id: int
|
||
task_id: uuid.UUID
|
||
remark: str | None = None
|
||
images: list[str] = []
|
||
created_at: datetime | None = None
|
||
|
||
model_config = {"from_attributes": True}
|
||
|
||
@field_validator("images", mode="before")
|
||
@classmethod
|
||
def _parse_images(cls, v):
|
||
"""处理 DB 中 images 的 JSON 字符串 → list 反序列化（不污染 ORM 对象）"""
|
||
import json
|
||
if isinstance(v, str):
|
||
try:
|
||
return json.loads(v)
|
||
except (json.JSONDecodeError, TypeError):
|
||
return []
|
||
if v is None:
|
||
return []
|
||
return v
|
||
|
||
|
||
# ============================================================
|
||
# 响应模型
|
||
# ============================================================
|
||
|
||
class TaskSummaryResponse(BaseModel):
|
||
"""任务摘要 — 扫码时用，不含嵌套子任务"""
|
||
id: uuid.UUID
|
||
product_id: uuid.UUID
|
||
parent_task_id: uuid.UUID | None
|
||
task_name: str
|
||
assignee_id: str | None
|
||
status: str
|
||
notify_parent_on_complete: bool
|
||
is_rework: bool = False
|
||
task_type: str | None = None
|
||
remark: str | None = None
|
||
reject_reason: str | None = None
|
||
received_at: datetime | None = None
|
||
completed_at: datetime | None = None
|
||
created_at: datetime
|
||
created_by: str | None = None # 谁创建的（从task_logs追溯）
|
||
|
||
model_config = {"from_attributes": True}
|
||
|
||
|
||
class TaskResponse(BaseModel):
|
||
"""任务详情响应 — 递归包含所有子任务"""
|
||
id: uuid.UUID
|
||
product_id: uuid.UUID
|
||
product_sn: str = ""
|
||
product_material: str = ""
|
||
parent_task_id: uuid.UUID | None
|
||
task_name: str
|
||
assignee_id: str | None
|
||
status: str
|
||
notify_parent_on_complete: bool
|
||
is_rework: bool = False
|
||
task_type: str | None = None
|
||
remark: str | None = None
|
||
reject_reason: str | None = None
|
||
received_at: datetime | None = None
|
||
completed_at: datetime | None = None
|
||
created_at: datetime
|
||
child_tasks: list[TaskResponse] = []
|
||
records: list[TaskRecordResponse] = []
|
||
created_by: str | None = None # 谁创建的（从task_logs追溯）
|
||
|
||
model_config = {"from_attributes": True}
|
||
|
||
|
||
class TaskCompleteResponse(BaseModel):
|
||
"""任务完成响应"""
|
||
completed_task: TaskResponse
|
||
next_task: TaskResponse | None = None
|
||
message: str
|
||
|
||
|
||
class TaskTransferResponse(BaseModel):
|
||
"""裂变转交响应"""
|
||
completed_task: TaskResponse
|
||
created_tasks: list[TaskResponse] = []
|
||
message: str
|
||
|
||
|
||
class TaskListResponse(BaseModel):
|
||
"""任务列表响应"""
|
||
tasks: list[TaskResponse]
|
||
total: int
|