diff --git a/backend/app/api/plan.py b/backend/app/api/plan.py index f9b8907..7f8c2f3 100644 --- a/backend/app/api/plan.py +++ b/backend/app/api/plan.py @@ -1,4 +1,4 @@ -from fastapi import APIRouter, Depends, HTTPException, Query +from fastapi import APIRouter, Depends, HTTPException, Query, Body from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy import select, func, desc from typing import Optional @@ -192,6 +192,18 @@ async def commit_producing(plan_id: int, db: AsyncSession = Depends(get_db), _ = return Response.ok(PlanOut.model_validate(plan)) +@router.patch("/{plan_id}/runtime", response_model=Response[dict]) +async def save_runtime(plan_id: int, body: dict = Body(...), db: AsyncSession = Depends(get_db), _ = Depends(get_current_user)): + """持久化在产卷的实时数据快照到对应计划。""" + result = await db.execute(select(ProductionPlan).where(ProductionPlan.id == plan_id)) + plan = result.scalar_one_or_none() + if not plan: + raise HTTPException(status_code=404, detail="计划不存在") + if plan.status == "producing": + plan.run_data = body + return Response.ok({"ok": True}) + + @router.get("/saddle/current", response_model=Response[Optional[PlanOut]]) async def get_saddle(db: AsyncSession = Depends(get_db), _ = Depends(get_current_user)): """上卷鞍座当前计划（含实时速度/已生产长度），并推进联动。""" diff --git a/backend/app/database.py b/backend/app/database.py index 174976e..f5adbbf 100644 --- a/backend/app/database.py +++ b/backend/app/database.py @@ -67,6 +67,9 @@ async def _run_migrations(conn): "ALTER TABLE production_plans ADD COLUMN IF NOT EXISTS run_speed DOUBLE PRECISION DEFAULT 0", "ALTER TABLE production_plans ADD COLUMN IF NOT EXISTS run_length_m DOUBLE PRECISION DEFAULT 0", "ALTER TABLE production_plans ADD COLUMN IF NOT EXISTS produced_at TIMESTAMP", + "ALTER TABLE production_plans ADD COLUMN IF NOT EXISTS run_data JSONB", + "ALTER TABLE production_records ADD COLUMN IF NOT EXISTS process_data JSONB", + "ALTER TABLE qc_defect ADD COLUMN IF NOT EXISTS inherit_source VARCHAR(30)", # 状态列改为 VARCHAR 以适配新值 "ALTER TABLE production_plans ALTER COLUMN status TYPE VARCHAR(20) USING status::text", # production_records 新字段 diff --git a/backend/app/models/plan.py b/backend/app/models/plan.py index 5b6746f..9f5f954 100644 --- a/backend/app/models/plan.py +++ b/backend/app/models/plan.py @@ -43,6 +43,7 @@ class ProductionPlan(Base): run_speed = Column(Float, default=0, comment="当前线速度 m/min") run_length_m = Column(Float, default=0, comment="带头已生产长度 m") produced_at = Column(DateTime, comment="生产完成时间") + run_data = Column(JSON, comment="生产期间实时数据快照") # 兼容历史字段 shift = Column(String(10), comment="班次") diff --git a/backend/app/models/production.py b/backend/app/models/production.py index 44816e5..84ede7a 100644 --- a/backend/app/models/production.py +++ b/backend/app/models/production.py @@ -1,4 +1,4 @@ -from sqlalchemy import Column, Integer, String, Float, DateTime, Text, ForeignKey, func +from sqlalchemy import Column, Integer, String, Float, DateTime, Text, ForeignKey, JSON, func from app.database import Base @@ -30,6 +30,7 @@ class ProductionRecord(Base): length_per_ton = Column(Float, comment="吨钢长度 m/t") offline_time = Column(DateTime, comment="下线时间") status = Column(String(20), default="UNWEIGH", comment="状态: UNWEIGH/PRODUCT") + process_data = Column(JSON, comment="生产阶段实时数据快照") # 兼容历史字段 shift_date = Column(DateTime) diff --git a/backend/app/models/quality.py b/backend/app/models/quality.py index 3d7dfff..fbd1b93 100644 --- a/backend/app/models/quality.py +++ b/backend/app/models/quality.py @@ -57,6 +57,7 @@ class QcDefect(Base): side_middle = Column(Boolean, default=False, comment="中间") side_drive = Column(Boolean, default=False, comment="驱动侧") is_main = Column(Boolean, default=False, comment="主缺陷") + inherit_source = Column(String(30), nullable=True, comment="继承来源卷号") image_url = Column(String(255), nullable=True, comment="缺陷图片URL") # 兼容旧字段 diff --git a/backend/app/schemas/plan.py b/backend/app/schemas/plan.py index f6da6ad..cccf8e2 100644 --- a/backend/app/schemas/plan.py +++ b/backend/app/schemas/plan.py @@ -86,6 +86,7 @@ class PlanOut(BaseModel): run_speed: Optional[float] = 0 run_length_m: Optional[float] = 0 produced_at: Optional[datetime] = None + run_data: Optional[dict] = None class Config: from_attributes = True diff --git a/backend/app/schemas/production.py b/backend/app/schemas/production.py index 212dd15..659b142 100644 --- a/backend/app/schemas/production.py +++ b/backend/app/schemas/production.py @@ -94,6 +94,7 @@ class ProductionRecordOut(BaseModel): inlet_width: Optional[float] = None quality_grade: Optional[str] = None operator: Optional[str] = None + process_data: Optional[dict] = None created_at: datetime class Config: diff --git a/backend/app/schemas/quality.py b/backend/app/schemas/quality.py index 7136e06..9d83671 100644 --- a/backend/app/schemas/quality.py +++ b/backend/app/schemas/quality.py @@ -98,6 +98,7 @@ class QcDefectBase(BaseModel): side_middle: Optional[bool] = False side_drive: Optional[bool] = False is_main: Optional[bool] = False + inherit_source: Optional[str] = None image_url: Optional[str] = None defect_code: Optional[str] = None defect_type: Optional[str] = None @@ -130,6 +131,7 @@ class QcDefectUpdate(BaseModel): side_middle: Optional[bool] = None side_drive: Optional[bool] = None is_main: Optional[bool] = None + inherit_source: Optional[str] = None image_url: Optional[str] = None defect_code: Optional[str] = None defect_type: Optional[str] = None @@ -156,6 +158,7 @@ class QcDefectOut(BaseModel): side_middle: Optional[bool] = None side_drive: Optional[bool] = None is_main: Optional[bool] = None + inherit_source: Optional[str] = None image_url: Optional[str] = None production_line: Optional[str] = None position: Optional[str] = None diff --git a/backend/app/services/line_service.py b/backend/app/services/line_service.py index 6900587..2231900 100644 --- a/backend/app/services/line_service.py +++ b/backend/app/services/line_service.py @@ -148,6 +148,7 @@ async def _produce(db: AsyncSession, plan: ProductionPlan): inlet_width=plan.incoming_width, quality_grade="A", operator="系统", + process_data=plan.run_data, ) db.add(rec) logger.info(f"生产完成并产生实绩: {plan.cold_coil_no or plan.plan_no}") diff --git a/frontend/src/api/index.js b/frontend/src/api/index.js index 287d8e7..5e9c478 100644 --- a/frontend/src/api/index.js +++ b/frontend/src/api/index.js @@ -27,6 +27,7 @@ export const movePlan = (id, position) => request.patch(`/plan/${id}/move`, null export const getPositions = () => request.get('/plan/positions/all') export const commitProducing = id => request.patch(`/plan/${id}/commit`) // 投入生产 export const getSaddle = () => request.get('/plan/saddle/current') +export const saveRuntime = (id, data) => request.patch(`/plan/${id}/runtime`, data) export const seedPlans = (count = 50) => request.post('/plan/seed', null, { params: { count } }) export const getLastPlanTemplate = () => request.get('/plan/last-template') diff --git a/frontend/src/views/Material.vue b/frontend/src/views/Material.vue index a8a642c..d026fa2 100644 --- a/frontend/src/views/Material.vue +++ b/frontend/src/views/Material.vue @@ -337,7 +337,7 @@