diff --git a/backend/app/schemas/production.py b/backend/app/schemas/production.py index d468435..212dd15 100644 --- a/backend/app/schemas/production.py +++ b/backend/app/schemas/production.py @@ -81,6 +81,19 @@ class ProductionRecordOut(BaseModel): offline_time: Optional[datetime] = None status: Optional[str] = None remark: Optional[str] = None + # 生产阶段数据 + shift_date: Optional[datetime] = None + start_time: Optional[datetime] = None + end_time: Optional[datetime] = None + process_length: Optional[float] = None + process_weight: Optional[float] = None + avg_speed: Optional[float] = None + max_speed: Optional[float] = None + acid_consumption: Optional[float] = None + inlet_thickness: Optional[float] = None + inlet_width: Optional[float] = None + quality_grade: Optional[str] = None + operator: Optional[str] = None created_at: datetime class Config: diff --git a/backend/app/services/line_service.py b/backend/app/services/line_service.py index ac4e739..6900587 100644 --- a/backend/app/services/line_service.py +++ b/backend/app/services/line_service.py @@ -212,13 +212,25 @@ async def detect_downtime(db: AsyncSession): logger.info("自动检测到停机，已新增待补充停机记录") +async def auto_commit_saddle(db: AsyncSession): + """产线空闲(无在产卷)且上卷鞍座有预备卷 → 自动投入生产（无需人工点击）。""" + res = await db.execute(select(ProductionPlan).where(ProductionPlan.status == "producing")) + if res.scalars().first() is not None: + return # 产线占用：鞍座预备卷等待上一卷生产完成 + saddle = await _saddle_plan(db) + if saddle is None: + return + await commit_plan(db, saddle) + + async def tick(db: AsyncSession): - """引擎单步：推进在产卷 + 停机检测（在线为人工触发，不自动上线）。""" + """引擎单步：推进在产卷 → 产线空闲则自动投入鞍座预备卷 → 停机检测。""" await advance_production(db) + await auto_commit_saddle(db) await detect_downtime(db) -async def run_engine_loop(interval_s: int = 15): +async def run_engine_loop(interval_s: int = 5): """后台循环，使联动在无人查看时也能自动推进。""" import asyncio from app.database import AsyncSessionLocal diff --git a/frontend/src/views/CostManagement.vue b/frontend/src/views/CostManagement.vue index ea6dfd9..e35093b 100644 --- a/frontend/src/views/CostManagement.vue +++ b/frontend/src/views/CostManagement.vue @@ -20,7 +20,7 @@
{{ curMeta.item_name }}耗量统计
-
暂无数据，请调整时间范围或点击「新增」录入
+
暂无数据
diff --git a/frontend/src/views/EntryTracking.vue b/frontend/src/views/EntryTracking.vue index 5a6dea0..a941ddc 100644 --- a/frontend/src/views/EntryTracking.vue +++ b/frontend/src/views/EntryTracking.vue @@ -52,10 +52,9 @@
预备生产 - 点击右上「投入生产」→ 进入生产中并转入物料跟踪
-
空闲 — 把在线计划移动到「上卷鞍座」预备生产
+
空闲
@@ -103,7 +102,7 @@ ✕
-
选择目标位置（只有「上卷鞍座」会进入生产环节）
+
选择目标位置
在线计划（入口队列） 在线 {{ onlinePlans.length }} / 生产中 {{ producingPlan ? 1 : 0 }} - 点击「移动」把队列卷推到入口并开始生产
diff --git a/frontend/src/views/Production.vue b/frontend/src/views/Production.vue index 9b2ae99..286c6df 100644 --- a/frontend/src/views/Production.vue +++ b/frontend/src/views/Production.vue @@ -56,7 +56,9 @@ - + {{ row.sub_coil_no || row.coil_no }} {{ row.hot_coil_no || '—' }} {{ row.shift || '—' }} @@ -78,7 +80,7 @@ {{ fmt(row.length_per_ton) }} {{ fmtTime(row.offline_time) }} {{ statusLabel(row.status) }} - + 编辑 质保书 @@ -91,6 +93,32 @@
+ +
+
生产阶段数据 — {{ selectedRow.sub_coil_no || selectedRow.coil_no }}
+
+
班期{{ fmtTime(selectedRow.shift_date) }}
+
开始时间{{ fmtTime(selectedRow.start_time) }}
+
结束时间{{ fmtTime(selectedRow.end_time) }}
+
下线时间{{ fmtTime(selectedRow.offline_time) }}
+ +
过程长度{{ fmt(selectedRow.process_length, 0) }} m
+
过程重量{{ fmt(selectedRow.process_weight, 3) }} t
+
平均速度{{ fmt(selectedRow.avg_speed, 0) }} m/min
+
最高速度{{ fmt(selectedRow.max_speed, 0) }} m/min
+ +
入口厚度{{ fmt(selectedRow.inlet_thickness) }} mm
+
入口宽度{{ fmt(selectedRow.inlet_width, 0) }} mm
+
酸耗{{ fmt(selectedRow.acid_consumption) }} kg
+
质量等级{{ selectedRow.quality_grade || '—' }}
+ +
成品长度{{ fmt(selectedRow.product_length, 0) }} m
+
吨钢长度{{ fmt(selectedRow.length_per_ton) }} m/t
+
成品质量{{ fmt(selectedRow.product_quality) }} %
+
操作员{{ selectedRow.operator || '—' }}
+
+
+
@@ -258,6 +286,7 @@ export default { query: { page: 1, page_size: 50, coil_no: '', shift: '', status: '', start_date: '', end_date: '' }, dialogVisible: false, editRow: null, form: { status: 'UNWEIGH' }, certVisible: false, certRow: {}, + selectedRow: null, } }, computed: { @@ -285,6 +314,7 @@ export default { }, fmt(v, n = 2) { return v != null ? Number(v).toFixed(n) : '—' }, fmtTime(t) { return t ? t.slice(0, 16).replace('T', ' ') : '—' }, + selectRow(row) { this.selectedRow = this.selectedRow && this.selectedRow.id === row.id ? null : row }, statusLabel(s) { return STATUS_MAP[s]?.label || s || '—' }, statusBadge(s) { return STATUS_MAP[s]?.badge || 'badge-gray' }, openDialog(row = null) { @@ -319,6 +349,11 @@ export default {