From b0c048d9aab5a28d3c116ad9f99eb3d95a981bb1 Mon Sep 17 00:00:00 2001 From: SunYF <123@hard_man.com> Date: Tue, 20 Oct 2026 16:36:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E5=BC=8F=E6=A0=A1=E9=AA=8C=E9=94=99=E8=AF=AF=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=8F=8A=E5=B7=A5=E4=BD=8D=E6=8A=A5=E8=AD=A6=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增 ErrorListDialog 组件用于统一展示结构化校验错误信息,实现报错一次收全;新增工位报警语音播报功能,通过浏览器 SpeechSynthesis 播放本工位相关报警;调整物料类别及序列号字段文案,移除「其他」类别;新增工单实际开始字段及采集方式配置;优化 AGV 及 PlcSend 页签刷新逻辑;新增看板物料追溯及工位报警接口;删除 PLC 强制写 M 位及相关测试代码;同步数据库字段注释及补丁。 --- bj_power_dashboard/src/App.tsx | 6 + .../src/components/MaterialQuery.tsx | 156 ++++ bj_power_dashboard/src/config.ts | 7 +- .../src/hooks/useSpeechAlarm.ts | 31 + bj_power_dashboard/src/mock.ts | 19 +- .../src/pages/ProductionBoard.tsx | 28 +- .../src/pages/WarehouseBoard.tsx | 43 +- .../src/services/dashboardService.ts | 6 + bj_power_dashboard/src/types.ts | 23 + bj_power_dashboard/tsconfig.tsbuildinfo | 2 +- bj_power_mes/common/httpx/response.go | 24 + bj_power_mes/ent/material.go | 2 +- bj_power_mes/ent/migrate/schema.go | 6 +- bj_power_mes/ent/mutation.go | 131 +-- bj_power_mes/ent/processstep.go | 15 +- bj_power_mes/ent/processstep/processstep.go | 10 - bj_power_mes/ent/processstep/where.go | 15 - bj_power_mes/ent/processstep_create.go | 25 - bj_power_mes/ent/processstep_update.go | 34 - bj_power_mes/ent/runtime.go | 22 +- bj_power_mes/ent/workorder.go | 16 +- bj_power_mes/ent/workorder/where.go | 55 ++ bj_power_mes/ent/workorder/workorder.go | 8 + bj_power_mes/ent/workorder_create.go | 18 + bj_power_mes/ent/workorder_update.go | 52 ++ bj_power_mes/frontend/src/App.vue | 5 +- .../src/components/ErrorListDialog.vue | 57 ++ bj_power_mes/frontend/src/help.js | 73 +- bj_power_mes/frontend/src/pages/Agv.vue | 9 +- bj_power_mes/frontend/src/pages/DailyPlan.vue | 10 +- .../frontend/src/pages/LineManagement.vue | 8 +- .../frontend/src/pages/PlcMonitor.vue | 296 +++--- bj_power_mes/frontend/src/pages/PlcSend.vue | 3 +- .../frontend/src/pages/ProcessCard.vue | 4 +- .../frontend/src/pages/ProcessFlow.vue | 24 +- .../frontend/src/pages/ProductProcess.vue | 126 ++- .../frontend/src/pages/ProductType.vue | 2 +- bj_power_mes/frontend/src/pages/Station.vue | 55 +- bj_power_mes/frontend/src/pages/Trace.vue | 44 +- .../frontend/src/pages/VirtualStation.vue | 137 ++- bj_power_mes/frontend/src/pages/WorkOrder.vue | 269 +++++- bj_power_mes/frontend/src/utils/request.js | 16 + bj_power_mes/frontend/src/utils/verror.js | 15 + bj_power_mes/internal/db/db.go | 10 + bj_power_mes/internal/handler/perm.go | 4 + .../internal/handler/processcard_workorder.go | 14 +- bj_power_mes/internal/handler/processflow.go | 9 +- .../internal/handler/production/alert.go | 17 + .../handler/production/plc_monitor.go | 27 +- .../handler/production/plc_torque_scan.go | 40 +- .../internal/handler/production/production.go | 16 +- .../production/station_alert_stream.go | 52 ++ .../internal/handler/production/workorder.go | 80 +- .../handler/production/workpiece_semi.go | 28 +- .../internal/handler/productprocess.go | 20 +- .../internal/handler/productprocess_card.go | 8 +- .../internal/handler/routes_production.go | 32 +- bj_power_mes/internal/logic/alert.go | 50 +- bj_power_mes/internal/logic/dailyplan.go | 281 ++++-- bj_power_mes/internal/logic/dashboard.go | 80 +- .../internal/logic/dashboard_front.go | 45 +- .../internal/logic/dashboard_types.go | 42 +- bj_power_mes/internal/logic/materialsync.go | 56 +- bj_power_mes/internal/logic/plc_monitor.go | 114 +-- bj_power_mes/internal/logic/processflow.go | 137 ++- bj_power_mes/internal/logic/product.go | 10 +- bj_power_mes/internal/logic/productprocess.go | 193 +++- bj_power_mes/internal/logic/route.go | 46 +- bj_power_mes/internal/logic/seed.go | 3 +- bj_power_mes/internal/logic/torque.go | 26 +- bj_power_mes/internal/logic/workorder.go | 327 +++++-- bj_power_mes/internal/logic/workpiece.go | 38 +- bj_power_mes/internal/plc/mock.go | 22 - bj_power_mes/internal/plc/plc.go | 6 +- bj_power_mes/internal/plc/route.go | 24 - bj_power_mes/internal/plc/tcp.go | 29 - bj_power_mes/internal/plc/tcp_test.go | 44 - bj_power_mes/internal/verr/verr.go | 67 ++ bj_power_mes/internal/wmsclient/client.go | 36 + bj_power_mes/public/index.html | 4 +- bj_power_mes/schema/material.go | 4 +- bj_power_mes/schema/process_step.go | 3 +- bj_power_mes/schema/work_order.go | 2 + bj_power_wms/ent/material.go | 4 +- bj_power_wms/ent/migrate/schema.go | 6 +- bj_power_wms/ent/outboundorder.go | 2 +- bj_power_wms/frontend/src/App.vue | 6 + .../src/components/ErrorListDialog.vue | 57 ++ .../src/components/MaterialSelect.vue | 4 +- bj_power_wms/frontend/src/help.js | 8 +- bj_power_wms/frontend/src/pages/BaseData.vue | 21 +- bj_power_wms/frontend/src/utils/request.js | 10 + bj_power_wms/frontend/src/utils/verror.js | 15 + bj_power_wms/internal/db/db.go | 5 + bj_power_wms/internal/handler/inbound.go | 3 - bj_power_wms/internal/handler/internalapi.go | 111 +++ bj_power_wms/internal/handler/material.go | 229 +++-- bj_power_wms/internal/handler/response.go | 24 + bj_power_wms/internal/handler/routes.go | 6 +- bj_power_wms/internal/verr/verr.go | 67 ++ bj_power_wms/schema/material.go | 9 +- bj_power_wms/schema/outbound_order.go | 2 +- bj_power_wms/web/static/index.html | 4 +- .../frontend/src/api/index.js | 6 + bj_power_workstation/frontend/src/help.js | 10 +- .../frontend/src/store/station.js | 8 +- .../frontend/src/utils/speech.js | 35 + .../frontend/src/views/Main.vue | 98 +- .../src/views/panels/OfflinePanel.vue | 3 +- .../frontend/src/views/panels/OnlinePanel.vue | 12 +- .../frontend/src/views/panels/WorkPanel.vue | 114 +++ .../internal/alertstream/alertstream.go | 155 ++++ .../internal/handler/alerts_stream.go | 47 + .../internal/handler/routes.go | 5 + .../internal/handler/station_alerts.go | 42 + bj_power_workstation/internal/mes/client.go | 35 +- .../internal/svc/service_context.go | 16 +- bj_power_workstation/main.go | 21 +- bj_power_workstation/web/static/index.html | 2 +- sql/_mes_catalog.tsv | 846 +++++++++--------- sql/backup_pg_databases.ps1 | 102 +++ sql/db_comments_mes.sql | 7 +- sql/备份部署说明.md | 73 ++ 产线API.md | 16 +- 技术协议要点.md | 42 + 部署手册.md | 1 + 126 files changed, 4603 insertions(+), 1639 deletions(-) create mode 100644 bj_power_dashboard/src/components/MaterialQuery.tsx create mode 100644 bj_power_dashboard/src/hooks/useSpeechAlarm.ts create mode 100644 bj_power_mes/frontend/src/components/ErrorListDialog.vue create mode 100644 bj_power_mes/frontend/src/utils/verror.js create mode 100644 bj_power_mes/internal/handler/production/station_alert_stream.go create mode 100644 bj_power_mes/internal/verr/verr.go create mode 100644 bj_power_wms/frontend/src/components/ErrorListDialog.vue create mode 100644 bj_power_wms/frontend/src/utils/verror.js create mode 100644 bj_power_wms/internal/verr/verr.go create mode 100644 bj_power_workstation/frontend/src/utils/speech.js create mode 100644 bj_power_workstation/internal/alertstream/alertstream.go create mode 100644 bj_power_workstation/internal/handler/alerts_stream.go create mode 100644 bj_power_workstation/internal/handler/station_alerts.go create mode 100644 sql/backup_pg_databases.ps1 create mode 100644 sql/备份部署说明.md create mode 100644 技术协议要点.md diff --git a/bj_power_dashboard/src/App.tsx b/bj_power_dashboard/src/App.tsx index cfc9852..a48d6f5 100644 --- a/bj_power_dashboard/src/App.tsx +++ b/bj_power_dashboard/src/App.tsx @@ -1,16 +1,21 @@ import { useState } from 'react'; import { Layout, Tag, Spin } from '@douyinfe/semi-ui'; import { useDashboardData } from './hooks/useDashboardData'; +import { useSpeechAlarm } from './hooks/useSpeechAlarm'; import { ProductionBoard } from './pages/ProductionBoard'; import { WarehouseBoard } from './pages/WarehouseBoard'; import { LineModel } from './pages/LineModel'; import { ErrorRetry } from './components/ErrorRetry'; +import { MaterialQuery } from './components/MaterialQuery'; export function App() { const { data: dashboard, mode, error, retry } = useDashboardData(); const loading = !dashboard && !error; const [now, setNow] = useState(() => new Date()); + // D2 语音播报:监听报警事件(无播音设备静默降级) + useSpeechAlarm(dashboard?.alarms ?? []); + // 时钟 setTimeout(() => setNow(new Date()), 1000); @@ -22,6 +27,7 @@ export function App() { {mode === 'polling' && 轮询刷新} {mode === 'demo' && 演示数据} {mode === 'init' && 连接中} + {now.toLocaleTimeString('zh-CN')} {now.toLocaleDateString('zh-CN', { weekday: 'long' })} diff --git a/bj_power_dashboard/src/components/MaterialQuery.tsx b/bj_power_dashboard/src/components/MaterialQuery.tsx new file mode 100644 index 0000000..a338b48 --- /dev/null +++ b/bj_power_dashboard/src/components/MaterialQuery.tsx @@ -0,0 +1,156 @@ +import { useState } from 'react'; +import { Button, Modal, Input, Table, Tag, Typography, Space } from '@douyinfe/semi-ui'; +import { config } from '../config'; + +interface MaterialInfo { + code: string; + name: string; + spec: string; + type: string; + unit: string; + manageMode: number; + snMode: number; +} + +interface InvRow { + zone: string; + shelf: string; + layer: string; + position: string; + quality: string; + qty: number; + batch: string; +} + +/** + * C7 物料追溯查询入口:复用 WMS 物料档案 + 库存查询接口(经 MES 代理 /api/internal/dashboard/material-query)。 + * 大屏以展示为主,此入口作为「查询」悬浮窗(不污染主展示区)。 + */ +export function MaterialQuery() { + const [visible, setVisible] = useState(false); + const [code, setCode] = useState(''); + const [batch, setBatch] = useState(''); + const [loading, setLoading] = useState(false); + const [error, setError] = useState(''); + const [found, setFound] = useState(null); + const [material, setMaterial] = useState(null); + const [inventory, setInventory] = useState([]); + + async function doQuery() { + const c = code.trim(); + if (!c) { + setError('请输入物料编码'); + return; + } + setLoading(true); + setError(''); + setFound(null); + setMaterial(null); + setInventory([]); + try { + const base = config.mesBaseUrl || ''; + const url = + `${base}/api/internal/dashboard/material-query?code=${encodeURIComponent(c)}` + + (batch.trim() ? `&batch=${encodeURIComponent(batch.trim())}` : ''); + const res = await fetch(url, { headers: { 'X-API-TOKEN': config.internalToken } }); + if (!res.ok) throw new Error(`HTTP ${res.status}`); + const j = (await res.json()) as { data?: { available?: boolean; found?: boolean; material?: MaterialInfo; inventory?: InvRow[] } }; + const d = j.data; + if (!d || d.available === false) { + setError('MES/WMS 服务不可用,暂无法查询'); + setFound(false); + return; + } + setFound(!!d.found); + setMaterial(d.material || null); + setInventory(d.inventory || []); + } catch (e) { + setError(e instanceof Error ? e.message : '查询失败'); + } finally { + setLoading(false); + } + } + + const invColumns = [ + { title: '库位', dataIndex: 'zone', render: (v: string, r: InvRow) => `${v || '-'} / ${r.shelf || ''} / ${r.layer || ''} / ${r.position || ''}` }, + { title: '批次', dataIndex: 'batch' }, + { + title: '质量状态', + dataIndex: 'quality', + render: (q: string) => { + const color = q === '合格' ? 'green' : q === '不合格' ? 'red' : 'grey'; + return {q || '未检'}; + }, + }, + { title: '数量', dataIndex: 'qty' }, + ]; + + return ( + <> + + setVisible(false)} + footer={ + + } + width={640} + > + + setCode(v)} + onEnterPress={doQuery} + style={{ width: 260 }} + /> + setBatch(v)} + onEnterPress={doQuery} + style={{ width: 200 }} + /> + + + {error && ( + + {error} + + )} + + {found === false && ( + 未查询到该物料档案。 + )} + + {material && ( +
+ 物料档案 + + {material.name || material.code}({material.code}) · 规格 {material.spec || '-'} · 单位{' '} + {material.unit || '-'} + +
+ )} + + {inventory.length > 0 && ( +
+ 在库库存 + (r ? `${r.zone}-${r.shelf}-${r.layer}-${r.position}-${r.batch}` : '')} + /> + + )} + + + ); +} diff --git a/bj_power_dashboard/src/config.ts b/bj_power_dashboard/src/config.ts index 90af28e..cb1720f 100644 --- a/bj_power_dashboard/src/config.ts +++ b/bj_power_dashboard/src/config.ts @@ -15,8 +15,11 @@ export const config = { mesBaseUrl: import.meta.env.VITE_MES_BASE_URL || DEFAULT_MES_BASE_URL, /** 内部服务间鉴权 Token(请求头 X-API-TOKEN) */ internalToken: 'Hardman_2026', - /** SSE 失效时降级为 HTTP 轮询的间隔(毫秒) */ - pollIntervalMs: 10_000, + /** + * SSE 失效时降级为 HTTP 轮询的间隔(毫秒)。 + * 纯轮询 5s 是兜底上限;SSE 实时通道可用时由事件驱动刷新(收到 dashboard.updated 即拉快照),不依赖轮询周期。 + */ + pollIntervalMs: 5_000, /** * 强制演示模式:为 true 时完全不连 MES,直接用演示数据。 * 用于离线开发 / 现场无 MES 的场景。 diff --git a/bj_power_dashboard/src/hooks/useSpeechAlarm.ts b/bj_power_dashboard/src/hooks/useSpeechAlarm.ts new file mode 100644 index 0000000..cc26623 --- /dev/null +++ b/bj_power_dashboard/src/hooks/useSpeechAlarm.ts @@ -0,0 +1,31 @@ +import { useEffect, useRef } from 'react'; +import type { AlarmItem } from '../types'; + +/** + * D2 语音播报:监听报警项,新出现的报警用浏览器 SpeechSynthesis 播报(中文)。 + * 无播音设备 / 浏览器不支持 speechSynthesis:静默降级(不报错、不影响展示)。 + * 与「报喜不报忧」一致:报警只语音、不渲染到屏幕。 + */ +export function useSpeechAlarm(alarms: AlarmItem[]) { + const prevIds = useRef>(new Set()); + const supported = + typeof window !== 'undefined' && typeof window.speechSynthesis !== 'undefined'; + + useEffect(() => { + if (!supported) return; // 静默降级 + const current = new Set(alarms.map((a) => a.id)); + for (const a of alarms) { + if (prevIds.current.has(a.id)) continue; // 仅播报新出现的报警 + try { + const utter = new SpeechSynthesisUtterance(`报警提示:${a.target},${a.message}`); + utter.lang = 'zh-CN'; + utter.rate = 1; + utter.volume = 1; + window.speechSynthesis.speak(utter); + } catch { + // 静默降级:无播音设备 / 权限被拒 + } + } + prevIds.current = current; + }, [alarms, supported]); +} diff --git a/bj_power_dashboard/src/mock.ts b/bj_power_dashboard/src/mock.ts index df3c127..61fc089 100644 --- a/bj_power_dashboard/src/mock.ts +++ b/bj_power_dashboard/src/mock.ts @@ -183,6 +183,7 @@ export function getDemoData(): DashboardData { inLine: 42, deviceOnline: 24, deviceTotal: 24, + cycleTime: 4.5, stationSummary: { running: 10, idle: 2, offline: 0, alarm: 0 }, }, warehouse: { @@ -190,13 +191,17 @@ export function getDemoData(): DashboardData { materialTypes: 46, inboundToday: 1320, outboundToday: 890, + locationUsed: 86, + locationTotal: 120, + pendingInbound: 3, + pendingOutbound: 2, movements: [ - { id: 'm1', time: '09:12', type: 'in', material: '电路板 PCBA-01', qty: 200, operator: '李工' }, - { id: 'm2', time: '09:28', type: 'out', material: '装配螺丝 M6', qty: 500, operator: '王工' }, - { id: 'm3', time: '10:05', type: 'in', material: '外壳上盖-铝合金', qty: 120, operator: '李工' }, - { id: 'm4', time: '10:41', type: 'out', material: '密封圈 硅胶', qty: 300, operator: '赵工' }, - { id: 'm5', time: '11:03', type: 'in', material: '端子排 T-38', qty: 80, operator: '李工' }, - { id: 'm6', time: '11:20', type: 'out', material: '装配螺栓 M8', qty: 460, operator: '王工' }, + { id: 'm1', time: '09:12', type: 'in', material: '电路板 PCBA-01', qty: 200, operator: '李工', batch: 'PCBA-01-20260922' }, + { id: 'm2', time: '09:28', type: 'out', material: '装配螺丝 M6', qty: 500, operator: '王工', batch: 'M6-20260920' }, + { id: 'm3', time: '10:05', type: 'in', material: '外壳上盖-铝合金', qty: 120, operator: '李工', batch: 'SJ-20260921' }, + { id: 'm4', time: '10:41', type: 'out', material: '密封圈 硅胶', qty: 300, operator: '赵工', batch: 'MFQ-20260918' }, + { id: 'm5', time: '11:03', type: 'in', material: '端子排 T-38', qty: 80, operator: '李工', batch: 'DZP-20260922' }, + { id: 'm6', time: '11:20', type: 'out', material: '装配螺栓 M8', qty: 460, operator: '王工', batch: 'M8-20260919' }, ], }, equipment: buildStations(), @@ -221,6 +226,8 @@ export function getDemoData(): DashboardData { }, traces, trends: { production: trends }, + // 报警项仅用于语音播报、屏幕不渲染;演示数据不造报警(看板报喜不报忧) + alarms: [], isDemo: true, }; } diff --git a/bj_power_dashboard/src/pages/ProductionBoard.tsx b/bj_power_dashboard/src/pages/ProductionBoard.tsx index a6c3b39..d1a22f5 100644 --- a/bj_power_dashboard/src/pages/ProductionBoard.tsx +++ b/bj_power_dashboard/src/pages/ProductionBoard.tsx @@ -56,15 +56,23 @@ export function ProductionBoard({ data }: { data: DashboardData }) { return (
- - - - +
+ + + + + 0 ? production.cycleTime.toFixed(1) : '—'} + label="生产节拍" + sub="相邻完工间隔均值(分)" + color={C.amber} + /> +
@@ -177,7 +185,7 @@ function Field({ label }: { label: string }) { return {label}; } -function Kpi({ value, label, sub, color }: { value: number; label: string; sub: string; color: string }) { +function Kpi({ value, label, sub, color }: { value: number | string; label: string; sub: string; color: string }) { return (
0 ? `${Math.round((w.locationUsed / w.locationTotal) * 100)}%` : '—'; + const columns = [ { title: '时间', dataIndex: 'time' }, { @@ -32,21 +37,37 @@ export function WarehouseBoard({ data }: { data: DashboardData }) { }, { title: '物料名称', dataIndex: 'material' }, { title: '数量', dataIndex: 'qty' }, + { title: '批次', dataIndex: 'batch', width: 140 }, { title: '操作人', dataIndex: 'operator' }, ]; return (
- - - - - - - -
- - +
+ + + + + + + +
+ + +
+
+ + +
+ 已用 {w.locationUsed} / 共 {w.locationTotal} +
+
+
+ + +
+ +
@@ -77,7 +98,7 @@ function BigNumber({ unit, color, }: { - value: number; + value: number | string; unit: string; color: string; }) { diff --git a/bj_power_dashboard/src/services/dashboardService.ts b/bj_power_dashboard/src/services/dashboardService.ts index 5b8db6a..5e6b8aa 100644 --- a/bj_power_dashboard/src/services/dashboardService.ts +++ b/bj_power_dashboard/src/services/dashboardService.ts @@ -248,6 +248,7 @@ function normalize(raw: Partial): DashboardData { inLine: p.inLine ?? 0, deviceOnline: p.deviceOnline ?? 0, deviceTotal: p.deviceTotal ?? 0, + cycleTime: p.cycleTime ?? 0, stationSummary: { running: p.stationSummary?.running ?? 0, idle: p.stationSummary?.idle ?? 0, @@ -260,6 +261,10 @@ function normalize(raw: Partial): DashboardData { materialTypes: w.materialTypes ?? 0, inboundToday: w.inboundToday ?? 0, outboundToday: w.outboundToday ?? 0, + locationUsed: w.locationUsed ?? 0, + locationTotal: w.locationTotal ?? 0, + pendingInbound: w.pendingInbound ?? 0, + pendingOutbound: w.pendingOutbound ?? 0, movements: w.movements ?? [], }, equipment: raw.equipment ?? [], @@ -284,6 +289,7 @@ function normalize(raw: Partial): DashboardData { }, traces: raw.traces ?? [], trends: raw.trends ?? { production: [] }, + alarms: raw.alarms ?? [], isDemo: false, }; } diff --git a/bj_power_dashboard/src/types.ts b/bj_power_dashboard/src/types.ts index 5b72711..fa32d53 100644 --- a/bj_power_dashboard/src/types.ts +++ b/bj_power_dashboard/src/types.ts @@ -50,6 +50,8 @@ export interface ProductionOverview { /** 设备在线数 / 总数 */ deviceOnline: number; deviceTotal: number; + /** 实际生产节拍(分钟):相邻完工间隔均值 */ + cycleTime: number; stationSummary: { running: number; idle: number; @@ -66,6 +68,8 @@ export interface StockMovement { material: string; qty: number; operator: string; + /** 批次号 */ + batch: string; } export interface WarehouseOverview { @@ -73,9 +77,26 @@ export interface WarehouseOverview { materialTypes: number; inboundToday: number; outboundToday: number; + /** 已用库位 / 总库位(库位利用率) */ + locationUsed: number; + locationTotal: number; + /** 待处理出入库任务:入库检未闭环 / 出库已出库待送达 */ + pendingInbound: number; + pendingOutbound: number; movements: StockMovement[]; } +/** 报警项(仅用于语音播报,不在屏幕渲染) */ +export interface AlarmItem { + id: string; + level: string; + type: string; + target: string; + message: string; + time: string; + status: string; +} + /** * 当前订单(屏1 核心卡片) * 展示:合同信息、负责人、工期、完成度、可追溯。 @@ -186,6 +207,8 @@ export interface DashboardData { /** 追溯轮播数据(最近完工工件) */ traces: TraceItem[]; trends: TrendData; + /** 报警项(仅用于语音播报,屏幕不渲染) */ + alarms: AlarmItem[]; /** 是否演示数据:真实业务数据为空时自动降级,角落低调标注 */ isDemo: boolean; } diff --git a/bj_power_dashboard/tsconfig.tsbuildinfo b/bj_power_dashboard/tsconfig.tsbuildinfo index 8d2fa0f..9a1e856 100644 --- a/bj_power_dashboard/tsconfig.tsbuildinfo +++ b/bj_power_dashboard/tsconfig.tsbuildinfo @@ -1 +1 @@ -{"root":["./src/app.tsx","./src/config.ts","./src/main.tsx","./src/mock.ts","./src/types.ts","./src/vite-env.d.ts","./src/components/echart.tsx","./src/components/errorretry.tsx","./src/hooks/usedashboarddata.ts","./src/pages/linemodel.tsx","./src/pages/productionboard.tsx","./src/pages/warehouseboard.tsx","./src/services/dashboardservice.ts","./vite.config.ts"],"version":"5.9.3"} \ No newline at end of file +{"root":["./src/app.tsx","./src/config.ts","./src/main.tsx","./src/mock.ts","./src/types.ts","./src/vite-env.d.ts","./src/components/echart.tsx","./src/components/errorretry.tsx","./src/components/materialquery.tsx","./src/hooks/usedashboarddata.ts","./src/hooks/usespeechalarm.ts","./src/pages/linemodel.tsx","./src/pages/productionboard.tsx","./src/pages/warehouseboard.tsx","./src/services/dashboardservice.ts","./vite.config.ts"],"version":"5.9.3"} \ No newline at end of file diff --git a/bj_power_mes/common/httpx/response.go b/bj_power_mes/common/httpx/response.go index ccfa981..2df103c 100644 --- a/bj_power_mes/common/httpx/response.go +++ b/bj_power_mes/common/httpx/response.go @@ -2,7 +2,11 @@ package httpx import ( "encoding/json" + "errors" + "fmt" "net/http" + + "bj_power_mes/internal/verr" ) // Resp 统一返回结构 @@ -38,6 +42,26 @@ func FailHTTP(w http.ResponseWriter, status int, message string) { writeJSON(w, status, Resp{Code: status, Message: message}) } +// FailValidation 收集式校验失败(HTTP 200,code=3015,data.errors 结构化清单; +// 前端拦截器识别 3015 后用 ErrorListDialog 一次弹全,不用 ElMessage 单条)。 +func FailValidation(w http.ResponseWriter, errs []verr.FieldError) { + writeJSON(w, http.StatusOK, Resp{ + Code: 3015, + Message: fmt.Sprintf("保存失败,共 %d 项需要处理", len(errs)), + Data: map[string]any{"errors": errs}, + }) +} + +// FailErr 统一错误出口:*verr.ValidationError → FailValidation 结构化;其他 error → 普通 Fail(3010)。 +func FailErr(w http.ResponseWriter, err error) { + var ve *verr.ValidationError + if errors.As(err, &ve) { + FailValidation(w, ve.Errors) + return + } + Fail(w, 3010, err.Error()) +} + // BadRequest 参数错误 func BadRequest(w http.ResponseWriter, message string) { writeJSON(w, http.StatusBadRequest, Resp{Code: 400, Message: message}) diff --git a/bj_power_mes/ent/material.go b/bj_power_mes/ent/material.go index 2cdf268..8195df3 100644 --- a/bj_power_mes/ent/material.go +++ b/bj_power_mes/ent/material.go @@ -27,7 +27,7 @@ type Material struct { Unit string `json:"unit,omitempty"` // 说明 Description string `json:"description,omitempty"` - // 物料类别 1原材料/3成品/4其他(半成品不是物料物料类别) + // 物料类别 1原材料/3成品(半成品不是物料类别,「其他」已移除) ItemType int `json:"itemType,omitempty"` // 类型 1结构件/2电气件/3其他(仅分类,不决定SN行为) ManageMode int `json:"manageMode,omitempty"` diff --git a/bj_power_mes/ent/migrate/schema.go b/bj_power_mes/ent/migrate/schema.go index bd66cc0..d9bc7c9 100644 --- a/bj_power_mes/ent/migrate/schema.go +++ b/bj_power_mes/ent/migrate/schema.go @@ -472,7 +472,7 @@ var ( {Name: "spec", Type: field.TypeString, Size: 128, Comment: "规格型号", Default: ""}, {Name: "unit", Type: field.TypeString, Size: 32, Comment: "计量单位", Default: ""}, {Name: "description", Type: field.TypeString, Size: 255, Comment: "说明", Default: ""}, - {Name: "item_type", Type: field.TypeInt, Comment: "物料类别 1原材料/3成品/4其他(半成品不是物料物料类别)", Default: 1}, + {Name: "item_type", Type: field.TypeInt, Comment: "物料类别 1原材料/3成品(半成品不是物料类别,「其他」已移除)", Default: 1}, {Name: "manage_mode", Type: field.TypeInt, Comment: "类型 1结构件/2电气件/3其他(仅分类,不决定SN行为)", Default: 1}, {Name: "sn_mode", Type: field.TypeInt, Comment: "是否逐件SN管理 0未选择(必填)/1序列号=是(录SN)/2序列号=否(不录SN)", Default: 0}, {Name: "template_code", Type: field.TypeString, Size: 64, Comment: "模板编码", Default: ""}, @@ -698,8 +698,7 @@ var ( {Name: "flow_id", Type: field.TypeInt, Nullable: true, Comment: "所属工艺流程图ID"}, {Name: "seq", Type: field.TypeInt, Comment: "步骤序号", Default: 1}, {Name: "name", Type: field.TypeString, Size: 128, Comment: "步骤名称"}, - {Name: "collect_type", Type: field.TypeString, Size: 20, Comment: "AUTO/MANUAL/NONE", Default: "NONE"}, - {Name: "is_torque", Type: field.TypeBool, Comment: "是否拧紧采集", Default: false}, + {Name: "collect_type", Type: field.TypeString, Size: 20, Comment: "采集方式 AUTO(拧紧枪自动)/MANUAL(手填)/SCAN(扫码,与手填等价采一串字符串)/NONE(仅记录)", Default: "NONE"}, {Name: "need_check", Type: field.TypeBool, Comment: "是否需要检测确认(报工前须检验通过)", Default: false}, {Name: "need_operator_sign", Type: field.TypeBool, Comment: "是否需要操作工签字(报工前须签字确认)", Default: false}, {Name: "need_inspector_sign", Type: field.TypeBool, Comment: "是否需要检验员签字(审核通过并签字后放行)", Default: false}, @@ -1142,6 +1141,7 @@ var ( {Name: "plan_end", Type: field.TypeTime, Nullable: true, Comment: "计划结束"}, {Name: "context", Type: field.TypeJSON, Nullable: true, Comment: "扩展字段", SchemaType: map[string]string{"postgres": "jsonb"}}, {Name: "completed_at", Type: field.TypeTime, Nullable: true}, + {Name: "actual_start", Type: field.TypeTime, Nullable: true, Comment: "实际开始"}, {Name: "created_at", Type: field.TypeTime}, {Name: "updated_at", Type: field.TypeTime, Nullable: true}, } diff --git a/bj_power_mes/ent/mutation.go b/bj_power_mes/ent/mutation.go index d6ebef3..ec0e2f4 100644 --- a/bj_power_mes/ent/mutation.go +++ b/bj_power_mes/ent/mutation.go @@ -18845,7 +18845,6 @@ type ProcessStepMutation struct { addseq *int name *string collectType *string - isTorque *bool needCheck *bool needOperatorSign *bool needInspectorSign *bool @@ -19163,42 +19162,6 @@ func (m *ProcessStepMutation) ResetCollectType() { m.collectType = nil } -// SetIsTorque sets the "isTorque" field. -func (m *ProcessStepMutation) SetIsTorque(b bool) { - m.isTorque = &b -} - -// IsTorque returns the value of the "isTorque" field in the mutation. -func (m *ProcessStepMutation) IsTorque() (r bool, exists bool) { - v := m.isTorque - if v == nil { - return - } - return *v, true -} - -// OldIsTorque returns the old "isTorque" field's value of the ProcessStep entity. -// If the ProcessStep object wasn't provided to the builder, the object is fetched from the database. -// An error is returned if the mutation operation is not UpdateOne, or the database query fails. -func (m *ProcessStepMutation) OldIsTorque(ctx context.Context) (v bool, err error) { - if !m.op.Is(OpUpdateOne) { - return v, errors.New("OldIsTorque is only allowed on UpdateOne operations") - } - if m.id == nil || m.oldValue == nil { - return v, errors.New("OldIsTorque requires an ID field in the mutation") - } - oldValue, err := m.oldValue(ctx) - if err != nil { - return v, fmt.Errorf("querying old value for OldIsTorque: %w", err) - } - return oldValue.IsTorque, nil -} - -// ResetIsTorque resets all changes to the "isTorque" field. -func (m *ProcessStepMutation) ResetIsTorque() { - m.isTorque = nil -} - // SetNeedCheck sets the "needCheck" field. func (m *ProcessStepMutation) SetNeedCheck(b bool) { m.needCheck = &b @@ -19563,7 +19526,7 @@ func (m *ProcessStepMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *ProcessStepMutation) Fields() []string { - fields := make([]string, 0, 13) + fields := make([]string, 0, 12) if m.flowId != nil { fields = append(fields, processstep.FieldFlowId) } @@ -19576,9 +19539,6 @@ func (m *ProcessStepMutation) Fields() []string { if m.collectType != nil { fields = append(fields, processstep.FieldCollectType) } - if m.isTorque != nil { - fields = append(fields, processstep.FieldIsTorque) - } if m.needCheck != nil { fields = append(fields, processstep.FieldNeedCheck) } @@ -19619,8 +19579,6 @@ func (m *ProcessStepMutation) Field(name string) (ent.Value, bool) { return m.Name() case processstep.FieldCollectType: return m.CollectType() - case processstep.FieldIsTorque: - return m.IsTorque() case processstep.FieldNeedCheck: return m.NeedCheck() case processstep.FieldNeedOperatorSign: @@ -19654,8 +19612,6 @@ func (m *ProcessStepMutation) OldField(ctx context.Context, name string) (ent.Va return m.OldName(ctx) case processstep.FieldCollectType: return m.OldCollectType(ctx) - case processstep.FieldIsTorque: - return m.OldIsTorque(ctx) case processstep.FieldNeedCheck: return m.OldNeedCheck(ctx) case processstep.FieldNeedOperatorSign: @@ -19709,13 +19665,6 @@ func (m *ProcessStepMutation) SetField(name string, value ent.Value) error { } m.SetCollectType(v) return nil - case processstep.FieldIsTorque: - v, ok := value.(bool) - if !ok { - return fmt.Errorf("unexpected type %T for field %s", value, name) - } - m.SetIsTorque(v) - return nil case processstep.FieldNeedCheck: v, ok := value.(bool) if !ok { @@ -19881,9 +19830,6 @@ func (m *ProcessStepMutation) ResetField(name string) error { case processstep.FieldCollectType: m.ResetCollectType() return nil - case processstep.FieldIsTorque: - m.ResetIsTorque() - return nil case processstep.FieldNeedCheck: m.ResetNeedCheck() return nil @@ -30438,6 +30384,7 @@ type WorkOrderMutation struct { planEnd *time.Time context *map[string]interface{} completedAt *time.Time + actualStart *time.Time createdAt *time.Time updatedAt *time.Time clearedFields map[string]struct{} @@ -31464,6 +31411,55 @@ func (m *WorkOrderMutation) ResetCompletedAt() { delete(m.clearedFields, workorder.FieldCompletedAt) } +// SetActualStart sets the "actualStart" field. +func (m *WorkOrderMutation) SetActualStart(t time.Time) { + m.actualStart = &t +} + +// ActualStart returns the value of the "actualStart" field in the mutation. +func (m *WorkOrderMutation) ActualStart() (r time.Time, exists bool) { + v := m.actualStart + if v == nil { + return + } + return *v, true +} + +// OldActualStart returns the old "actualStart" field's value of the WorkOrder entity. +// If the WorkOrder object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *WorkOrderMutation) OldActualStart(ctx context.Context) (v *time.Time, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldActualStart is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldActualStart requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldActualStart: %w", err) + } + return oldValue.ActualStart, nil +} + +// ClearActualStart clears the value of the "actualStart" field. +func (m *WorkOrderMutation) ClearActualStart() { + m.actualStart = nil + m.clearedFields[workorder.FieldActualStart] = struct{}{} +} + +// ActualStartCleared returns if the "actualStart" field was cleared in this mutation. +func (m *WorkOrderMutation) ActualStartCleared() bool { + _, ok := m.clearedFields[workorder.FieldActualStart] + return ok +} + +// ResetActualStart resets all changes to the "actualStart" field. +func (m *WorkOrderMutation) ResetActualStart() { + m.actualStart = nil + delete(m.clearedFields, workorder.FieldActualStart) +} + // SetCreatedAt sets the "createdAt" field. func (m *WorkOrderMutation) SetCreatedAt(t time.Time) { m.createdAt = &t @@ -31583,7 +31579,7 @@ func (m *WorkOrderMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *WorkOrderMutation) Fields() []string { - fields := make([]string, 0, 22) + fields := make([]string, 0, 23) if m.workOrderNo != nil { fields = append(fields, workorder.FieldWorkOrderNo) } @@ -31644,6 +31640,9 @@ func (m *WorkOrderMutation) Fields() []string { if m.completedAt != nil { fields = append(fields, workorder.FieldCompletedAt) } + if m.actualStart != nil { + fields = append(fields, workorder.FieldActualStart) + } if m.createdAt != nil { fields = append(fields, workorder.FieldCreatedAt) } @@ -31698,6 +31697,8 @@ func (m *WorkOrderMutation) Field(name string) (ent.Value, bool) { return m.Context() case workorder.FieldCompletedAt: return m.CompletedAt() + case workorder.FieldActualStart: + return m.ActualStart() case workorder.FieldCreatedAt: return m.CreatedAt() case workorder.FieldUpdatedAt: @@ -31751,6 +31752,8 @@ func (m *WorkOrderMutation) OldField(ctx context.Context, name string) (ent.Valu return m.OldContext(ctx) case workorder.FieldCompletedAt: return m.OldCompletedAt(ctx) + case workorder.FieldActualStart: + return m.OldActualStart(ctx) case workorder.FieldCreatedAt: return m.OldCreatedAt(ctx) case workorder.FieldUpdatedAt: @@ -31904,6 +31907,13 @@ func (m *WorkOrderMutation) SetField(name string, value ent.Value) error { } m.SetCompletedAt(v) return nil + case workorder.FieldActualStart: + v, ok := value.(time.Time) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetActualStart(v) + return nil case workorder.FieldCreatedAt: v, ok := value.(time.Time) if !ok { @@ -32029,6 +32039,9 @@ func (m *WorkOrderMutation) ClearedFields() []string { if m.FieldCleared(workorder.FieldCompletedAt) { fields = append(fields, workorder.FieldCompletedAt) } + if m.FieldCleared(workorder.FieldActualStart) { + fields = append(fields, workorder.FieldActualStart) + } if m.FieldCleared(workorder.FieldUpdatedAt) { fields = append(fields, workorder.FieldUpdatedAt) } @@ -32064,6 +32077,9 @@ func (m *WorkOrderMutation) ClearField(name string) error { case workorder.FieldCompletedAt: m.ClearCompletedAt() return nil + case workorder.FieldActualStart: + m.ClearActualStart() + return nil case workorder.FieldUpdatedAt: m.ClearUpdatedAt() return nil @@ -32135,6 +32151,9 @@ func (m *WorkOrderMutation) ResetField(name string) error { case workorder.FieldCompletedAt: m.ResetCompletedAt() return nil + case workorder.FieldActualStart: + m.ResetActualStart() + return nil case workorder.FieldCreatedAt: m.ResetCreatedAt() return nil diff --git a/bj_power_mes/ent/processstep.go b/bj_power_mes/ent/processstep.go index b81b0de..4d51114 100644 --- a/bj_power_mes/ent/processstep.go +++ b/bj_power_mes/ent/processstep.go @@ -24,10 +24,8 @@ type ProcessStep struct { Seq int `json:"seq,omitempty"` // 步骤名称 Name string `json:"name,omitempty"` - // AUTO/MANUAL/NONE + // 采集方式 AUTO(拧紧枪自动)/MANUAL(手填)/SCAN(扫码,与手填等价采一串字符串)/NONE(仅记录) CollectType string `json:"collectType,omitempty"` - // 是否拧紧采集 - IsTorque bool `json:"isTorque,omitempty"` // 是否需要检测确认(报工前须检验通过) NeedCheck bool `json:"needCheck,omitempty"` // 是否需要操作工签字(报工前须签字确认) @@ -54,7 +52,7 @@ func (*ProcessStep) scanValues(columns []string) ([]any, error) { switch columns[i] { case processstep.FieldAttachment: values[i] = new([]byte) - case processstep.FieldIsTorque, processstep.FieldNeedCheck, processstep.FieldNeedOperatorSign, processstep.FieldNeedInspectorSign, processstep.FieldNeedAudit: + case processstep.FieldNeedCheck, processstep.FieldNeedOperatorSign, processstep.FieldNeedInspectorSign, processstep.FieldNeedAudit: values[i] = new(sql.NullBool) case processstep.FieldID, processstep.FieldFlowId, processstep.FieldSeq: values[i] = new(sql.NullInt64) @@ -107,12 +105,6 @@ func (_m *ProcessStep) assignValues(columns []string, values []any) error { } else if value.Valid { _m.CollectType = value.String } - case processstep.FieldIsTorque: - if value, ok := values[i].(*sql.NullBool); !ok { - return fmt.Errorf("unexpected type %T for field isTorque", values[i]) - } else if value.Valid { - _m.IsTorque = value.Bool - } case processstep.FieldNeedCheck: if value, ok := values[i].(*sql.NullBool); !ok { return fmt.Errorf("unexpected type %T for field needCheck", values[i]) @@ -211,9 +203,6 @@ func (_m *ProcessStep) String() string { builder.WriteString("collectType=") builder.WriteString(_m.CollectType) builder.WriteString(", ") - builder.WriteString("isTorque=") - builder.WriteString(fmt.Sprintf("%v", _m.IsTorque)) - builder.WriteString(", ") builder.WriteString("needCheck=") builder.WriteString(fmt.Sprintf("%v", _m.NeedCheck)) builder.WriteString(", ") diff --git a/bj_power_mes/ent/processstep/processstep.go b/bj_power_mes/ent/processstep/processstep.go index dc53ee5..ca4c0bd 100644 --- a/bj_power_mes/ent/processstep/processstep.go +++ b/bj_power_mes/ent/processstep/processstep.go @@ -21,8 +21,6 @@ const ( FieldName = "name" // FieldCollectType holds the string denoting the collecttype field in the database. FieldCollectType = "collect_type" - // FieldIsTorque holds the string denoting the istorque field in the database. - FieldIsTorque = "is_torque" // FieldNeedCheck holds the string denoting the needcheck field in the database. FieldNeedCheck = "need_check" // FieldNeedOperatorSign holds the string denoting the needoperatorsign field in the database. @@ -50,7 +48,6 @@ var Columns = []string{ FieldSeq, FieldName, FieldCollectType, - FieldIsTorque, FieldNeedCheck, FieldNeedOperatorSign, FieldNeedInspectorSign, @@ -80,8 +77,6 @@ var ( DefaultCollectType string // CollectTypeValidator is a validator for the "collectType" field. It is called by the builders before save. CollectTypeValidator func(string) error - // DefaultIsTorque holds the default value on creation for the "isTorque" field. - DefaultIsTorque bool // DefaultNeedCheck holds the default value on creation for the "needCheck" field. DefaultNeedCheck bool // DefaultNeedOperatorSign holds the default value on creation for the "needOperatorSign" field. @@ -132,11 +127,6 @@ func ByCollectType(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldCollectType, opts...).ToFunc() } -// ByIsTorque orders the results by the isTorque field. -func ByIsTorque(opts ...sql.OrderTermOption) OrderOption { - return sql.OrderByField(FieldIsTorque, opts...).ToFunc() -} - // ByNeedCheck orders the results by the needCheck field. func ByNeedCheck(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldNeedCheck, opts...).ToFunc() diff --git a/bj_power_mes/ent/processstep/where.go b/bj_power_mes/ent/processstep/where.go index d44a4b5..92ef7da 100644 --- a/bj_power_mes/ent/processstep/where.go +++ b/bj_power_mes/ent/processstep/where.go @@ -74,11 +74,6 @@ func CollectType(v string) predicate.ProcessStep { return predicate.ProcessStep(sql.FieldEQ(FieldCollectType, v)) } -// IsTorque applies equality check predicate on the "isTorque" field. It's identical to IsTorqueEQ. -func IsTorque(v bool) predicate.ProcessStep { - return predicate.ProcessStep(sql.FieldEQ(FieldIsTorque, v)) -} - // NeedCheck applies equality check predicate on the "needCheck" field. It's identical to NeedCheckEQ. func NeedCheck(v bool) predicate.ProcessStep { return predicate.ProcessStep(sql.FieldEQ(FieldNeedCheck, v)) @@ -334,16 +329,6 @@ func CollectTypeContainsFold(v string) predicate.ProcessStep { return predicate.ProcessStep(sql.FieldContainsFold(FieldCollectType, v)) } -// IsTorqueEQ applies the EQ predicate on the "isTorque" field. -func IsTorqueEQ(v bool) predicate.ProcessStep { - return predicate.ProcessStep(sql.FieldEQ(FieldIsTorque, v)) -} - -// IsTorqueNEQ applies the NEQ predicate on the "isTorque" field. -func IsTorqueNEQ(v bool) predicate.ProcessStep { - return predicate.ProcessStep(sql.FieldNEQ(FieldIsTorque, v)) -} - // NeedCheckEQ applies the EQ predicate on the "needCheck" field. func NeedCheckEQ(v bool) predicate.ProcessStep { return predicate.ProcessStep(sql.FieldEQ(FieldNeedCheck, v)) diff --git a/bj_power_mes/ent/processstep_create.go b/bj_power_mes/ent/processstep_create.go index 127c98c..08b96b1 100644 --- a/bj_power_mes/ent/processstep_create.go +++ b/bj_power_mes/ent/processstep_create.go @@ -68,20 +68,6 @@ func (_c *ProcessStepCreate) SetNillableCollectType(v *string) *ProcessStepCreat return _c } -// SetIsTorque sets the "isTorque" field. -func (_c *ProcessStepCreate) SetIsTorque(v bool) *ProcessStepCreate { - _c.mutation.SetIsTorque(v) - return _c -} - -// SetNillableIsTorque sets the "isTorque" field if the given value is not nil. -func (_c *ProcessStepCreate) SetNillableIsTorque(v *bool) *ProcessStepCreate { - if v != nil { - _c.SetIsTorque(*v) - } - return _c -} - // SetNeedCheck sets the "needCheck" field. func (_c *ProcessStepCreate) SetNeedCheck(v bool) *ProcessStepCreate { _c.mutation.SetNeedCheck(v) @@ -235,10 +221,6 @@ func (_c *ProcessStepCreate) defaults() { v := processstep.DefaultCollectType _c.mutation.SetCollectType(v) } - if _, ok := _c.mutation.IsTorque(); !ok { - v := processstep.DefaultIsTorque - _c.mutation.SetIsTorque(v) - } if _, ok := _c.mutation.NeedCheck(); !ok { v := processstep.DefaultNeedCheck _c.mutation.SetNeedCheck(v) @@ -290,9 +272,6 @@ func (_c *ProcessStepCreate) check() error { return &ValidationError{Name: "collectType", err: fmt.Errorf(`ent: validator failed for field "ProcessStep.collectType": %w`, err)} } } - if _, ok := _c.mutation.IsTorque(); !ok { - return &ValidationError{Name: "isTorque", err: errors.New(`ent: missing required field "ProcessStep.isTorque"`)} - } if _, ok := _c.mutation.NeedCheck(); !ok { return &ValidationError{Name: "needCheck", err: errors.New(`ent: missing required field "ProcessStep.needCheck"`)} } @@ -374,10 +353,6 @@ func (_c *ProcessStepCreate) createSpec() (*ProcessStep, *sqlgraph.CreateSpec) { _spec.SetField(processstep.FieldCollectType, field.TypeString, value) _node.CollectType = value } - if value, ok := _c.mutation.IsTorque(); ok { - _spec.SetField(processstep.FieldIsTorque, field.TypeBool, value) - _node.IsTorque = value - } if value, ok := _c.mutation.NeedCheck(); ok { _spec.SetField(processstep.FieldNeedCheck, field.TypeBool, value) _node.NeedCheck = value diff --git a/bj_power_mes/ent/processstep_update.go b/bj_power_mes/ent/processstep_update.go index c4c5eb6..b560e73 100644 --- a/bj_power_mes/ent/processstep_update.go +++ b/bj_power_mes/ent/processstep_update.go @@ -105,20 +105,6 @@ func (_u *ProcessStepUpdate) SetNillableCollectType(v *string) *ProcessStepUpdat return _u } -// SetIsTorque sets the "isTorque" field. -func (_u *ProcessStepUpdate) SetIsTorque(v bool) *ProcessStepUpdate { - _u.mutation.SetIsTorque(v) - return _u -} - -// SetNillableIsTorque sets the "isTorque" field if the given value is not nil. -func (_u *ProcessStepUpdate) SetNillableIsTorque(v *bool) *ProcessStepUpdate { - if v != nil { - _u.SetIsTorque(*v) - } - return _u -} - // SetNeedCheck sets the "needCheck" field. func (_u *ProcessStepUpdate) SetNeedCheck(v bool) *ProcessStepUpdate { _u.mutation.SetNeedCheck(v) @@ -323,9 +309,6 @@ func (_u *ProcessStepUpdate) sqlSave(ctx context.Context) (_node int, err error) if value, ok := _u.mutation.CollectType(); ok { _spec.SetField(processstep.FieldCollectType, field.TypeString, value) } - if value, ok := _u.mutation.IsTorque(); ok { - _spec.SetField(processstep.FieldIsTorque, field.TypeBool, value) - } if value, ok := _u.mutation.NeedCheck(); ok { _spec.SetField(processstep.FieldNeedCheck, field.TypeBool, value) } @@ -456,20 +439,6 @@ func (_u *ProcessStepUpdateOne) SetNillableCollectType(v *string) *ProcessStepUp return _u } -// SetIsTorque sets the "isTorque" field. -func (_u *ProcessStepUpdateOne) SetIsTorque(v bool) *ProcessStepUpdateOne { - _u.mutation.SetIsTorque(v) - return _u -} - -// SetNillableIsTorque sets the "isTorque" field if the given value is not nil. -func (_u *ProcessStepUpdateOne) SetNillableIsTorque(v *bool) *ProcessStepUpdateOne { - if v != nil { - _u.SetIsTorque(*v) - } - return _u -} - // SetNeedCheck sets the "needCheck" field. func (_u *ProcessStepUpdateOne) SetNeedCheck(v bool) *ProcessStepUpdateOne { _u.mutation.SetNeedCheck(v) @@ -704,9 +673,6 @@ func (_u *ProcessStepUpdateOne) sqlSave(ctx context.Context) (_node *ProcessStep if value, ok := _u.mutation.CollectType(); ok { _spec.SetField(processstep.FieldCollectType, field.TypeString, value) } - if value, ok := _u.mutation.IsTorque(); ok { - _spec.SetField(processstep.FieldIsTorque, field.TypeBool, value) - } if value, ok := _u.mutation.NeedCheck(); ok { _spec.SetField(processstep.FieldNeedCheck, field.TypeBool, value) } diff --git a/bj_power_mes/ent/runtime.go b/bj_power_mes/ent/runtime.go index 7699cc4..4243785 100644 --- a/bj_power_mes/ent/runtime.go +++ b/bj_power_mes/ent/runtime.go @@ -1206,40 +1206,36 @@ func init() { processstep.DefaultCollectType = processstepDescCollectType.Default.(string) // processstep.CollectTypeValidator is a validator for the "collectType" field. It is called by the builders before save. processstep.CollectTypeValidator = processstepDescCollectType.Validators[0].(func(string) error) - // processstepDescIsTorque is the schema descriptor for isTorque field. - processstepDescIsTorque := processstepFields[5].Descriptor() - // processstep.DefaultIsTorque holds the default value on creation for the isTorque field. - processstep.DefaultIsTorque = processstepDescIsTorque.Default.(bool) // processstepDescNeedCheck is the schema descriptor for needCheck field. - processstepDescNeedCheck := processstepFields[6].Descriptor() + processstepDescNeedCheck := processstepFields[5].Descriptor() // processstep.DefaultNeedCheck holds the default value on creation for the needCheck field. processstep.DefaultNeedCheck = processstepDescNeedCheck.Default.(bool) // processstepDescNeedOperatorSign is the schema descriptor for needOperatorSign field. - processstepDescNeedOperatorSign := processstepFields[7].Descriptor() + processstepDescNeedOperatorSign := processstepFields[6].Descriptor() // processstep.DefaultNeedOperatorSign holds the default value on creation for the needOperatorSign field. processstep.DefaultNeedOperatorSign = processstepDescNeedOperatorSign.Default.(bool) // processstepDescNeedInspectorSign is the schema descriptor for needInspectorSign field. - processstepDescNeedInspectorSign := processstepFields[8].Descriptor() + processstepDescNeedInspectorSign := processstepFields[7].Descriptor() // processstep.DefaultNeedInspectorSign holds the default value on creation for the needInspectorSign field. processstep.DefaultNeedInspectorSign = processstepDescNeedInspectorSign.Default.(bool) // processstepDescNeedAudit is the schema descriptor for needAudit field. - processstepDescNeedAudit := processstepFields[9].Descriptor() + processstepDescNeedAudit := processstepFields[8].Descriptor() // processstep.DefaultNeedAudit holds the default value on creation for the needAudit field. processstep.DefaultNeedAudit = processstepDescNeedAudit.Default.(bool) // processstepDescAuditRole is the schema descriptor for auditRole field. - processstepDescAuditRole := processstepFields[10].Descriptor() + processstepDescAuditRole := processstepFields[9].Descriptor() // processstep.DefaultAuditRole holds the default value on creation for the auditRole field. processstep.DefaultAuditRole = processstepDescAuditRole.Default.(string) // processstep.AuditRoleValidator is a validator for the "auditRole" field. It is called by the builders before save. processstep.AuditRoleValidator = processstepDescAuditRole.Validators[0].(func(string) error) // processstepDescRemark is the schema descriptor for remark field. - processstepDescRemark := processstepFields[12].Descriptor() + processstepDescRemark := processstepFields[11].Descriptor() // processstep.DefaultRemark holds the default value on creation for the remark field. processstep.DefaultRemark = processstepDescRemark.Default.(string) // processstep.RemarkValidator is a validator for the "remark" field. It is called by the builders before save. processstep.RemarkValidator = processstepDescRemark.Validators[0].(func(string) error) // processstepDescCreatedAt is the schema descriptor for createdAt field. - processstepDescCreatedAt := processstepFields[13].Descriptor() + processstepDescCreatedAt := processstepFields[12].Descriptor() // processstep.DefaultCreatedAt holds the default value on creation for the createdAt field. processstep.DefaultCreatedAt = processstepDescCreatedAt.Default.(func() time.Time) // processstepDescID is the schema descriptor for id field. @@ -1809,11 +1805,11 @@ func init() { // workorder.StatusValidator is a validator for the "status" field. It is called by the builders before save. workorder.StatusValidator = workorderDescStatus.Validators[0].(func(string) error) // workorderDescCreatedAt is the schema descriptor for createdAt field. - workorderDescCreatedAt := workorderFields[21].Descriptor() + workorderDescCreatedAt := workorderFields[22].Descriptor() // workorder.DefaultCreatedAt holds the default value on creation for the createdAt field. workorder.DefaultCreatedAt = workorderDescCreatedAt.Default.(func() time.Time) // workorderDescUpdatedAt is the schema descriptor for updatedAt field. - workorderDescUpdatedAt := workorderFields[22].Descriptor() + workorderDescUpdatedAt := workorderFields[23].Descriptor() // workorder.DefaultUpdatedAt holds the default value on creation for the updatedAt field. workorder.DefaultUpdatedAt = workorderDescUpdatedAt.Default.(func() time.Time) // workorder.UpdateDefaultUpdatedAt holds the default value on update for the updatedAt field. diff --git a/bj_power_mes/ent/workorder.go b/bj_power_mes/ent/workorder.go index 399a8ed..71a66a0 100644 --- a/bj_power_mes/ent/workorder.go +++ b/bj_power_mes/ent/workorder.go @@ -58,6 +58,8 @@ type WorkOrder struct { Context map[string]interface{} `json:"context,omitempty"` // CompletedAt holds the value of the "completedAt" field. CompletedAt *time.Time `json:"completedAt,omitempty"` + // 实际开始 + ActualStart *time.Time `json:"actualStart,omitempty"` // CreatedAt holds the value of the "createdAt" field. CreatedAt time.Time `json:"createdAt,omitempty"` // UpdatedAt holds the value of the "updatedAt" field. @@ -76,7 +78,7 @@ func (*WorkOrder) scanValues(columns []string) ([]any, error) { values[i] = new(sql.NullInt64) case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldContractNo, workorder.FieldOwnershipType, workorder.FieldProjectNo, workorder.FieldProductSerial, workorder.FieldCreatedBy, workorder.FieldStatus: values[i] = new(sql.NullString) - case workorder.FieldDueDate, workorder.FieldPlanStart, workorder.FieldPlanEnd, workorder.FieldCompletedAt, workorder.FieldCreatedAt, workorder.FieldUpdatedAt: + case workorder.FieldDueDate, workorder.FieldPlanStart, workorder.FieldPlanEnd, workorder.FieldCompletedAt, workorder.FieldActualStart, workorder.FieldCreatedAt, workorder.FieldUpdatedAt: values[i] = new(sql.NullTime) default: values[i] = new(sql.UnknownType) @@ -227,6 +229,13 @@ func (_m *WorkOrder) assignValues(columns []string, values []any) error { _m.CompletedAt = new(time.Time) *_m.CompletedAt = value.Time } + case workorder.FieldActualStart: + if value, ok := values[i].(*sql.NullTime); !ok { + return fmt.Errorf("unexpected type %T for field actualStart", values[i]) + } else if value.Valid { + _m.ActualStart = new(time.Time) + *_m.ActualStart = value.Time + } case workorder.FieldCreatedAt: if value, ok := values[i].(*sql.NullTime); !ok { return fmt.Errorf("unexpected type %T for field createdAt", values[i]) @@ -344,6 +353,11 @@ func (_m *WorkOrder) String() string { builder.WriteString(v.Format(time.ANSIC)) } builder.WriteString(", ") + if v := _m.ActualStart; v != nil { + builder.WriteString("actualStart=") + builder.WriteString(v.Format(time.ANSIC)) + } + builder.WriteString(", ") builder.WriteString("createdAt=") builder.WriteString(_m.CreatedAt.Format(time.ANSIC)) builder.WriteString(", ") diff --git a/bj_power_mes/ent/workorder/where.go b/bj_power_mes/ent/workorder/where.go index 32de3fe..4168d0c 100644 --- a/bj_power_mes/ent/workorder/where.go +++ b/bj_power_mes/ent/workorder/where.go @@ -144,6 +144,11 @@ func CompletedAt(v time.Time) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldEQ(FieldCompletedAt, v)) } +// ActualStart applies equality check predicate on the "actualStart" field. It's identical to ActualStartEQ. +func ActualStart(v time.Time) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldEQ(FieldActualStart, v)) +} + // CreatedAt applies equality check predicate on the "createdAt" field. It's identical to CreatedAtEQ. func CreatedAt(v time.Time) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldEQ(FieldCreatedAt, v)) @@ -1159,6 +1164,56 @@ func CompletedAtNotNil() predicate.WorkOrder { return predicate.WorkOrder(sql.FieldNotNull(FieldCompletedAt)) } +// ActualStartEQ applies the EQ predicate on the "actualStart" field. +func ActualStartEQ(v time.Time) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldEQ(FieldActualStart, v)) +} + +// ActualStartNEQ applies the NEQ predicate on the "actualStart" field. +func ActualStartNEQ(v time.Time) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldNEQ(FieldActualStart, v)) +} + +// ActualStartIn applies the In predicate on the "actualStart" field. +func ActualStartIn(vs ...time.Time) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldIn(FieldActualStart, vs...)) +} + +// ActualStartNotIn applies the NotIn predicate on the "actualStart" field. +func ActualStartNotIn(vs ...time.Time) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldNotIn(FieldActualStart, vs...)) +} + +// ActualStartGT applies the GT predicate on the "actualStart" field. +func ActualStartGT(v time.Time) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldGT(FieldActualStart, v)) +} + +// ActualStartGTE applies the GTE predicate on the "actualStart" field. +func ActualStartGTE(v time.Time) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldGTE(FieldActualStart, v)) +} + +// ActualStartLT applies the LT predicate on the "actualStart" field. +func ActualStartLT(v time.Time) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldLT(FieldActualStart, v)) +} + +// ActualStartLTE applies the LTE predicate on the "actualStart" field. +func ActualStartLTE(v time.Time) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldLTE(FieldActualStart, v)) +} + +// ActualStartIsNil applies the IsNil predicate on the "actualStart" field. +func ActualStartIsNil() predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldIsNull(FieldActualStart)) +} + +// ActualStartNotNil applies the NotNil predicate on the "actualStart" field. +func ActualStartNotNil() predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldNotNull(FieldActualStart)) +} + // CreatedAtEQ applies the EQ predicate on the "createdAt" field. func CreatedAtEQ(v time.Time) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldEQ(FieldCreatedAt, v)) diff --git a/bj_power_mes/ent/workorder/workorder.go b/bj_power_mes/ent/workorder/workorder.go index c77453f..37f3c65 100644 --- a/bj_power_mes/ent/workorder/workorder.go +++ b/bj_power_mes/ent/workorder/workorder.go @@ -53,6 +53,8 @@ const ( FieldContext = "context" // FieldCompletedAt holds the string denoting the completedat field in the database. FieldCompletedAt = "completed_at" + // FieldActualStart holds the string denoting the actualstart field in the database. + FieldActualStart = "actual_start" // FieldCreatedAt holds the string denoting the createdat field in the database. FieldCreatedAt = "created_at" // FieldUpdatedAt holds the string denoting the updatedat field in the database. @@ -84,6 +86,7 @@ var Columns = []string{ FieldPlanEnd, FieldContext, FieldCompletedAt, + FieldActualStart, FieldCreatedAt, FieldUpdatedAt, } @@ -249,6 +252,11 @@ func ByCompletedAt(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldCompletedAt, opts...).ToFunc() } +// ByActualStart orders the results by the actualStart field. +func ByActualStart(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldActualStart, opts...).ToFunc() +} + // ByCreatedAt orders the results by the createdAt field. func ByCreatedAt(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldCreatedAt, opts...).ToFunc() diff --git a/bj_power_mes/ent/workorder_create.go b/bj_power_mes/ent/workorder_create.go index 40f0a6b..8b5a20c 100644 --- a/bj_power_mes/ent/workorder_create.go +++ b/bj_power_mes/ent/workorder_create.go @@ -268,6 +268,20 @@ func (_c *WorkOrderCreate) SetNillableCompletedAt(v *time.Time) *WorkOrderCreate return _c } +// SetActualStart sets the "actualStart" field. +func (_c *WorkOrderCreate) SetActualStart(v time.Time) *WorkOrderCreate { + _c.mutation.SetActualStart(v) + return _c +} + +// SetNillableActualStart sets the "actualStart" field if the given value is not nil. +func (_c *WorkOrderCreate) SetNillableActualStart(v *time.Time) *WorkOrderCreate { + if v != nil { + _c.SetActualStart(*v) + } + return _c +} + // SetCreatedAt sets the "createdAt" field. func (_c *WorkOrderCreate) SetCreatedAt(v time.Time) *WorkOrderCreate { _c.mutation.SetCreatedAt(v) @@ -604,6 +618,10 @@ func (_c *WorkOrderCreate) createSpec() (*WorkOrder, *sqlgraph.CreateSpec) { _spec.SetField(workorder.FieldCompletedAt, field.TypeTime, value) _node.CompletedAt = &value } + if value, ok := _c.mutation.ActualStart(); ok { + _spec.SetField(workorder.FieldActualStart, field.TypeTime, value) + _node.ActualStart = &value + } if value, ok := _c.mutation.CreatedAt(); ok { _spec.SetField(workorder.FieldCreatedAt, field.TypeTime, value) _node.CreatedAt = value diff --git a/bj_power_mes/ent/workorder_update.go b/bj_power_mes/ent/workorder_update.go index d367449..bba06c5 100644 --- a/bj_power_mes/ent/workorder_update.go +++ b/bj_power_mes/ent/workorder_update.go @@ -371,6 +371,26 @@ func (_u *WorkOrderUpdate) ClearCompletedAt() *WorkOrderUpdate { return _u } +// SetActualStart sets the "actualStart" field. +func (_u *WorkOrderUpdate) SetActualStart(v time.Time) *WorkOrderUpdate { + _u.mutation.SetActualStart(v) + return _u +} + +// SetNillableActualStart sets the "actualStart" field if the given value is not nil. +func (_u *WorkOrderUpdate) SetNillableActualStart(v *time.Time) *WorkOrderUpdate { + if v != nil { + _u.SetActualStart(*v) + } + return _u +} + +// ClearActualStart clears the value of the "actualStart" field. +func (_u *WorkOrderUpdate) ClearActualStart() *WorkOrderUpdate { + _u.mutation.ClearActualStart() + return _u +} + // SetUpdatedAt sets the "updatedAt" field. func (_u *WorkOrderUpdate) SetUpdatedAt(v time.Time) *WorkOrderUpdate { _u.mutation.SetUpdatedAt(v) @@ -590,6 +610,12 @@ func (_u *WorkOrderUpdate) sqlSave(ctx context.Context) (_node int, err error) { if _u.mutation.CompletedAtCleared() { _spec.ClearField(workorder.FieldCompletedAt, field.TypeTime) } + if value, ok := _u.mutation.ActualStart(); ok { + _spec.SetField(workorder.FieldActualStart, field.TypeTime, value) + } + if _u.mutation.ActualStartCleared() { + _spec.ClearField(workorder.FieldActualStart, field.TypeTime) + } if value, ok := _u.mutation.UpdatedAt(); ok { _spec.SetField(workorder.FieldUpdatedAt, field.TypeTime, value) } @@ -959,6 +985,26 @@ func (_u *WorkOrderUpdateOne) ClearCompletedAt() *WorkOrderUpdateOne { return _u } +// SetActualStart sets the "actualStart" field. +func (_u *WorkOrderUpdateOne) SetActualStart(v time.Time) *WorkOrderUpdateOne { + _u.mutation.SetActualStart(v) + return _u +} + +// SetNillableActualStart sets the "actualStart" field if the given value is not nil. +func (_u *WorkOrderUpdateOne) SetNillableActualStart(v *time.Time) *WorkOrderUpdateOne { + if v != nil { + _u.SetActualStart(*v) + } + return _u +} + +// ClearActualStart clears the value of the "actualStart" field. +func (_u *WorkOrderUpdateOne) ClearActualStart() *WorkOrderUpdateOne { + _u.mutation.ClearActualStart() + return _u +} + // SetUpdatedAt sets the "updatedAt" field. func (_u *WorkOrderUpdateOne) SetUpdatedAt(v time.Time) *WorkOrderUpdateOne { _u.mutation.SetUpdatedAt(v) @@ -1208,6 +1254,12 @@ func (_u *WorkOrderUpdateOne) sqlSave(ctx context.Context) (_node *WorkOrder, er if _u.mutation.CompletedAtCleared() { _spec.ClearField(workorder.FieldCompletedAt, field.TypeTime) } + if value, ok := _u.mutation.ActualStart(); ok { + _spec.SetField(workorder.FieldActualStart, field.TypeTime, value) + } + if _u.mutation.ActualStartCleared() { + _spec.ClearField(workorder.FieldActualStart, field.TypeTime) + } if value, ok := _u.mutation.UpdatedAt(); ok { _spec.SetField(workorder.FieldUpdatedAt, field.TypeTime, value) } diff --git a/bj_power_mes/frontend/src/App.vue b/bj_power_mes/frontend/src/App.vue index 7ac7f0a..b7eaa36 100644 --- a/bj_power_mes/frontend/src/App.vue +++ b/bj_power_mes/frontend/src/App.vue @@ -1,11 +1,14 @@ \ No newline at end of file + diff --git a/bj_power_mes/frontend/src/components/ErrorListDialog.vue b/bj_power_mes/frontend/src/components/ErrorListDialog.vue new file mode 100644 index 0000000..4ea00e4 --- /dev/null +++ b/bj_power_mes/frontend/src/components/ErrorListDialog.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/bj_power_mes/frontend/src/help.js b/bj_power_mes/frontend/src/help.js index 5e8db2b..8ae122f 100644 --- a/bj_power_mes/frontend/src/help.js +++ b/bj_power_mes/frontend/src/help.js @@ -26,7 +26,7 @@ export const helpProductType = { export const helpWorkOrder = { title: '工单管理(新建 / 编辑 / 删除工单)', overview: - '工单 = 一个"生产批次"的唯一载体,是生产执行和仓库出库挂靠的核心对象。\n\n全流程:先有产品型号(在「物料档案」里建档) → 建工单(选产品型号、定数量、勾选工艺组合) → 进"工艺"给工艺维护工艺步骤与物料清单 → 到"日排产"排哪天产多少 → 仓库按排产备料出库 → 产线装配/拧紧/报工 → 完工(成品 SN 系统自动生成,并自动回流 WMS 入库为"成品"物料类别)。\n产品工号会贯穿 备料单、工件追溯、操作日志 全链路。\n\n客户编号体系(三级归属):一级=合同号/科技项目号(二选一,即「归属类型+归属编号」)→ 二级=产品工号(原工单号,一个产品工号对应一个新建工单/一批)→ 三级=产品序号(工单内每台)。产品编码=图号(与产品型号编码同值,随型号自动带出)。原「工程编号」已被合同号顶替,页面不再展示/录入/查询。\n\n查询:支持按 产品工号 / 图号 / 产品名称(模糊) / 归属类型 / 归属编号 / 状态 组合筛选;操作列「详情」可查看工单字段汇总与该工单的工件SN列表(产品序号/SN/类型/状态/当前工位);删除:仅「已创建」且无排产、备料、生产数据的工单可删除,生产中或已完成的工单不可删除。', + '工单 = 一个"生产批次"的唯一载体,是生产执行和仓库出库挂靠的核心对象。\n\n全流程:先有产品型号(在「物料档案」里建档) → 建工单(选产品型号、定数量、勾选工艺组合) → 进"工艺"给工艺维护工艺步骤与物料清单 → 到"日排产"排哪天产多少 → 仓库按排产备料出库 → 产线装配/拧紧/报工 → 完工(成品 SN 系统自动生成,并自动回流 WMS 入库为"成品"物料类别)。\n产品工号会贯穿 备料单、工件追溯、操作日志 全链路。\n\n客户编号体系(三级归属):一级=合同号/科技项目号(二选一,即「归属类型+归属编号」)→ 二级=产品工号(原工单号,一个产品工号对应一个新建工单/一批)→ 三级=产品序号(工单内每台)。产品编码=图号(与产品型号编码同值,随型号自动带出)。原「工程编号」已被合同号顶替,页面不再展示/录入/查询。\n\n查询:支持按 产品工号 / 图号 / 产品名称(模糊) / 归属类型 / 归属编号 / 状态 组合筛选;操作列「详情」可查看工单字段汇总、工艺路线(按工位号升序去重展示各道工艺与步骤)与该工单的工件SN列表(产品序号/SN/类型/状态/当前工位);删除:仅「已创建」且无排产、备料、生产数据的工单可删除,生产中或已完成的工单不可删除。', sections: [ { title: '工单基本信息', @@ -41,15 +41,16 @@ export const helpWorkOrder = { { name: '数量', source: '手工填写整数。', purpose: '本工单生产总数量(合同台数),决定需求量与排产上限', fill: '整数 ≥1,如 100' }, { name: '工艺组合', source: '按工艺分组勾选工位(数据来自「工位绑定」页的工位↔工艺绑定)。保存为 [{flowId,stationNo}]。', purpose: '本工单的执行路线;自动排产/备料拆分/产线下发均按此组合派生', fill: '默认每个已绑定工艺的工位全选;至少选一道工艺;全不选某工艺则该工艺不进入组合;执行顺序=工位号升序,可跳过未选工位' }, { name: '状态', source: '新建时选"已创建",后续由流程推进。', purpose: '工单生命周期:创建→发布→生产→完成', fill: '新建时选"已创建";也可在列表操作列点「状态」快捷流转(发布/开工/完工)' }, - { name: '完成日期', source: '手工填写,完工时必填。', purpose: '记录工单实际完成日期,用于交付与绩效统计', fill: '完工流转时选择日期,必填' }, + { name: '要求完成日期', source: '手工填写,建单/编辑时必填。', purpose: '记录工单要求/承诺完成日期,用于交付与绩效统计;与「实际完成」(系统记录的真实完工时间)是两个独立字段', fill: '建单时选择日期,必填' }, + { name: '时间字段口径', source: '建单填写 + 系统自动记录。', purpose: '计划开始/计划完成=建单填写的计划区间;实际开始=首次"下发并开工"的时间(系统落库);实际完成=本工单全部工件报工完成、置"已完成"的时间(系统落库)。("完成日期"是要求/承诺完成日期,属上一条独立字段)', fill: '建单填计划开始/计划完成(选填);实际开始/实际完成由系统自动写,无需手填' }, { name: '创建人', source: '系统自动记录(当前登录账号)。', purpose: '追溯工单由谁创建', fill: '只读,自动带入' } ] }, { title: '工单详情', - overview: '列表操作列「详情」打开只读抽屉:上半部分为工单字段汇总(产品工号/图号/名称/归属/数量/状态/日期),下半部分为该工单的工件SN列表。\n工件SN列表数据来源=工件进线登记记录:产品序号为工单内顺序号,SN 为工件唯一序列号,类型(序列号=是/序列号=否)取自图号对应物料档案的「序列号」设置,状态与当前工位为实时生产进度。', + overview: '列表操作列「详情」打开只读抽屉:上半部分为工单字段汇总(产品工号/图号/名称/归属/数量/状态/日期),下半部分为该工单的工件SN列表。\n工件SN列表数据来源=工件进线登记记录:支持按状态筛选与分页(默认每页 100 条,后端分页),按产品序号升序(小号在前);产品序号取 SN 末段序号,SN 为工件唯一序列号,类型(序列号=是/序列号=否)取自图号对应物料档案的「序列号」设置,状态与当前工位为实时生产进度。', fields: [ - { name: '工件SN列表', source: '既有工件查询接口按工单号过滤,实时读取。', purpose: '核对该批每台产品的 SN、类型、状态与当前工位', fill: '只读,无需操作' } + { name: '工件SN列表', source: '工件查询接口按工单号过滤,后端 SQL 分页(默认 100/页,可切 100/200/500)+ 状态筛选,按 SN 升序(产品序号小号在前),实时读取。', purpose: '核对该批每台产品的 序号、SN、类型、状态与当前工位', fill: '只读;可用状态下拉筛选,翻页查看' } ] }, { @@ -178,6 +179,26 @@ export const helpVirtualStation = { { name: '工艺步骤', source: '工位绑定工艺的步骤模板(工艺页维护)。', purpose: '本工位要做什么、考核标准是什么', fill: '手填步骤逐项录入数值/结果;「检测确认」步骤需勾选;拧紧步骤由物理工位采集,本页只读' }, { name: '配料', source: '工艺物料清单(flow_material)中该工艺要求装配的物料 + 已绑记录(bind-panel 接口)。', purpose: '装机绑定强校验:序列号=是需绑满单台用量 SN、序列号=否至少绑一个批次号,缺料不允许报工', fill: '在录入框填批次号/SN(多个用逗号分隔),随报工一次性提交' }, { name: '完成报工', source: 'POST /station/report(与终端同一接口)。', purpose: '写实绩 + 步骤考核 + 装机绑定,原子提交', fill: '全部录入后点「完成报工」;报错按提示补齐' } + ], + sections: [ + { + title: '检测确认与操作工签字(业务说明)', + overview: '这两项是工艺步骤上的开关(在「工艺」页按步骤配置),决定操作员报工前必须完成什么。', + fields: [ + { + name: '检测确认', + source: '工艺步骤上配置的开关(工艺页「工艺步骤」行开启),本工位该步骤需要操作员自检确认。', + purpose: '步骤的「自检关」:该步做完后,操作员须先点「检测确认」声明已按考核标准自检合格,才能继续报工、流转到下一工位。确认后系统记录确认人与时间,作为本步合格的前置证据;未确认则报工被拦截。', + fill: '在该步骤的「检测确认」按钮上点一下即可,不用填数值,只声明"我已自检"。' + }, + { + name: '操作工签字', + source: '工艺步骤上配置的开关(工艺页开启),要求操作员在本步骤签字。', + purpose: '由本步骤的实际操作人(当前登录账号)签字,证明"这步是我做的、我确认合格"。签字按"操作工"身份留痕(谁签、何时签)。不签字则报工被拦截,工件不能流转到下一工位。', + fill: '报工前系统弹签字确认,默认当前登录人,点确认即可;签字是报工的前置条件,可与检测确认同时要求。' + } + ] + } ] } @@ -294,7 +315,7 @@ export const helpEventLog = { export const helpProcessFlow = { title: '工艺(作业指导,含工艺步骤与物料清单)', overview: - '页面分「工艺列表」「工艺配置」两个页签:列表查看全部工艺并做启用/停用/删除;配置页维护工艺基本信息、工艺步骤与物料清单(新增与编辑共用,不再弹窗套弹窗)。\n\n工艺 = 一份「菜谱」:只描述某个产品该怎么装配(工艺步骤名、采集方式、考核标准、所需物料),可被多个工位绑定,不隶属某个工位。\n\n概念统一说明:\n· 工位:产线上的物理工位(工位数以数据库为准),工位号即顺序号,相当于「灶台」。\n· 工艺:一份作业指导(PDF + 工艺步骤 + 物料清单);其启用状态决定是否参与生产。\n· 工艺步骤:工艺内包含多个步骤(如:装配完成、拧紧扭矩、测试)。\n· 物料清单:该工艺装配所需物料(物料编码/名称/规格/单位/管理方式/单台用量/损耗率),整表覆盖保存。\n\n绑定关系在「工位绑定」页维护:为某工位选择启用的工艺即绑定;一个工位只能绑定一个工艺。工单在「工单管理」勾选「工艺组合」确定执行路线(工位号升序)。\n\n数据链路:本页维护工艺+工艺步骤+物料清单+考核标准 → 工位绑定页绑定 → 工单勾选工艺组合 → 工位终端按工艺步骤采集 → 报工按考核标准自动判 合格/不合格 → 工件追溯/绩效报表可见。', + '页面分「工艺列表」「工艺配置」两个页签:列表查看全部工艺并做启用/停用/删除;配置页维护工艺基本信息、工艺步骤与物料清单(新增与编辑共用,不再弹窗套弹窗)。\n\n工艺 = 一份「菜谱」:只描述某个产品该怎么装配(工艺步骤名、采集方式、考核标准、所需物料),可被多个工位绑定,不隶属某个工位。\n\n概念统一说明:\n· 工位:产线上的物理工位(工位数以数据库为准),工位号即顺序号,相当于「灶台」。\n· 工艺:一份作业指导(PDF + 工艺步骤 + 物料清单);其启用状态决定是否参与生产。\n· 工艺步骤:工艺内包含多个步骤(如:装配完成、拧紧扭矩、测试)。\n· 物料清单:该工艺装配所需物料(物料编码/名称/规格/单位/序列号/单台用量/损耗率),整表覆盖保存。\n\n绑定关系在「工位绑定」页维护:为某工位选择启用的工艺即绑定;一个工位只能绑定一个工艺。工单在「工单管理」勾选「工艺组合」确定执行路线(工位号升序)。\n\n数据链路:本页维护工艺+工艺步骤+物料清单+考核标准 → 工位绑定页绑定 → 工单勾选工艺组合 → 工位终端按工艺步骤采集 → 报工按考核标准自动判 合格/不合格 → 工件追溯/绩效报表可见。', sections: [ { title: '工艺基本信息', @@ -303,19 +324,20 @@ export const helpProcessFlow = { { name: '状态', source: '下拉选择 启用/停用。也可在列表操作列点「启用/停用」快捷切换。', purpose: '启用=该工艺可被「工位绑定」页绑定到工位并参与生产;停用=不可绑定、不参与生产', fill: '启用后可在「工位绑定」页绑定到工位;停用后不可绑定' }, { name: '作业指导PDF', source: '本页上传。文件由 MES 服务器保存。', purpose: '该工艺的作业指导图,工位终端打开预览', fill: '选择 PDF 上传,成功后显示文件名可预览' }, - { name: '工艺步骤', source: '本页维护(步骤名/采集方式/是否拧紧/考核标准/签字)。', purpose: '工位终端报工时按此动态渲染参数输入', fill: '一个工艺可含多个工艺步骤,按序号顺序执行' }, - { name: '操作工签字确认', source: '每个工艺步骤开关。开启后写入 process_step.need_operator_sign=是。', purpose: '签字机制第一签:操作工报工前须在本步骤签字确认,否则报工被拦截', fill: '在步骤行打开开关;报工时工位终端弹「签字确认」采集签字人,落库到 step_sign_record(sign_role=OPERATOR)' }, - { name: '检验员签字确认', source: '每个工艺步骤开关。开启后写入 process_step.need_inspector_sign=是。', purpose: '签字机制第二签:该步骤须由检验员在巡检终端「待签任务」页签签字确认,流程方可放行', fill: '在步骤行打开开关;操作工签字后,检验员到【巡检终端-待签任务】逐行「签字确认」,落库 step_sign_record(sign_role=INSPECTOR),需开通 sys.inspect:sign 权限' }, + { name: '工艺步骤', source: '本页维护(步骤名/采集方式/考核标准/签字)。', purpose: '工位终端报工时按此动态渲染参数输入', fill: '一个工艺可含多个工艺步骤,按序号顺序执行' }, + { name: '操作工签字确认', source: '每个工艺步骤开关。开启后该步骤要求「操作工签字」。', purpose: '签字机制第一签:操作工报工前须在本步骤签字确认,否则报工被拦截', fill: '在步骤行打开开关;报工时工位终端弹「签字确认」采集签字人,签字记录按「操作工」身份留痕' }, + { name: '检验员签字确认', source: '每个工艺步骤开关。开启后该步骤要求「检验员签字」。', purpose: '签字机制第二签:该步骤须由检验员在巡检终端「待签任务」页签签字确认,流程方可放行', fill: '在步骤行打开开关;操作工签字后,检验员到【巡检终端-待签任务】逐行「签字确认」,签字记录按「检验员」身份留痕,需开通「巡检-签字确认」权限' }, { name: '步骤附件/图纸', source: '每个工艺步骤单独上传(绑定式)。文件由 MES 服务器保存。', purpose: '把图纸精确绑定到具体步骤,工位终端按当前步骤自动展示对应图纸', fill: '在步骤行上传该步骤图纸/附件(可多个);随步骤自动分发到工位终端' }, - { name: '物料清单', source: '本页维护:物料编码(下拉选择,取自物料档案)/名称/规格/单位/管理方式/单台用量/损耗率%,整表覆盖保存。', purpose: '该工艺装配所需物料;备料需求 = 各工位分产量 × 单台用量 × (1+损耗率%)', fill: '物料编码取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/管理方式自动带出、不可改;管理方式(序列号)来自物料档案:1=序列号=是(录SN)、2=序列号=否(不录SN)' } + { name: '物料清单', source: '本页维护:物料编码(下拉选择,取自物料档案)/名称/规格/单位/序列号/单台用量/损耗率%,整表覆盖保存。', purpose: '该工艺装配所需物料;备料需求 = 各工位分产量 × 单台用量 × (1+损耗率%)', fill: '物料编码取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/序列号自动带出、不可改;序列号来自物料档案:序列号=是(录SN)/序列号=否(不录SN)' } ] }, { - title: '采集方式(每个工艺步骤三选一)', + title: '采集方式(每个工艺步骤四选一)', overview: '决定该步骤的数值从哪里来。', fields: [ - { name: '拧紧枪自动', source: '拧紧枪设备自动回传。', purpose: '扭矩/角度等由拧紧枪采集,工人无需手输', fill: '选「拧紧枪自动」,并在「是否拧紧」打开开关' }, + { name: '拧紧枪自动', source: '拧紧枪设备自动回传。', purpose: '扭矩/角度等由拧紧枪采集,工人无需手输', fill: '选「拧紧枪自动」即可,无需再开其他开关(2026-10-19 起「是否拧紧」开关已删除,采集方式即唯一口径)' }, { name: '手填', source: '工人在工位终端手动输入数值。', purpose: '无法自动采集的参数(如尺寸、电压)由人工录入', fill: '选「手填」' }, + { name: '扫码', source: '工人用工位终端扫码枪/扫码框采集一串字符串。', purpose: '与「手填」等价(不区分二维码/条形码),只是录入方式改为扫码,采到的是一串字符串', fill: '选「扫码」,报工时扫入即可' }, { name: '仅记录', source: '无数据,只做操作步骤确认(如"装配完成")。', purpose: '记录该步骤已执行,不采集数值、不判定', fill: '选「仅记录」' } ] }, @@ -420,10 +442,10 @@ export const helpInspect = { overview: '集中展示「操作工已签字、待检验员签字确认」的工艺步骤(按 工单号+SN+工位+步骤 聚合)。此处签字 = 检验员第二签:操作工报工前已在工位终端/虚拟工位签字确认,检验员逐行点「签字确认」(可填意见),确认后该步骤的检验员签字落库,流程方可放行。需开通「巡检-签字确认」按钮权限(sys.inspect:sign)。', fields: [ - { name: '工单号/SN/工位', source: '来自步骤签字记录(step_sign_record),按 工单号+SN+工位+步骤 聚合。', purpose: '定位待签任务', fill: '只读' }, - { name: '步骤', source: '工艺步骤名称(该步骤配置了 needInspectorSign=是)。', purpose: '待检验员签字的步骤', fill: '只读' }, - { name: '操作工签字', source: '操作工报工前签字记录(signedBy/signedAt)。', purpose: '第一签留证', fill: '只读' }, - { name: '签字确认', source: '弹窗确认后调 POST /signs/inspector。', purpose: '检验员第二签,流程放行', fill: '可填意见,成功提示「已签字」' } + { name: '工单号/SN/工位', source: '来自步骤签字记录,按 工单号+SN+工位+步骤 聚合。', purpose: '定位待签任务', fill: '只读' }, + { name: '步骤', source: '工艺步骤名称(该步骤配置了「需检验员签字」)。', purpose: '待检验员签字的步骤', fill: '只读' }, + { name: '操作工签字', source: '操作工报工前的签字留痕(签字人与签字时间)。', purpose: '第一签留证', fill: '只读' }, + { name: '签字确认', source: '弹窗确认后提交,系统记录检验员签字与签字时间。', purpose: '检验员第二签,流程放行', fill: '可填意见,成功提示「已签字」' } ] }, { @@ -446,19 +468,19 @@ export const helpProcessCard = { { name: '工单号', source: '手工填写。', purpose: '直接查某工单的生产流程卡主卡', fill: '回车或点查询' }, { name: '成品SN', source: '手工填写。', purpose: '查某成品的 SN 追溯卡', fill: '回车或点查询' }, { name: '时间范围', source: '日历选择(月范围)。', purpose: '仅在型号筛选模式下过滤工单列表', fill: '默认上月;不选=全部时间' }, - { name: '工序实绩-审核人', source: '自动带出该工序的审核签字人(AUDITOR)及审核时间。', purpose: '工序级审核放行留痕', fill: '无则显示“-”' } + { name: '工序实绩-审核人', source: '自动带出该工序的审核签字人及审核时间。', purpose: '工序级审核放行留痕', fill: '无则显示“-”' } ] } export const helpAudit = { title: '待审核签字(工序级审核)', overview: - '本页是审核人的「待审任务」工作台:列出已满足前置签字条件的工艺步骤(操作工已签字;若该步骤配置了「需检验员签字」则检验员须 OK),由具审核角色(如班组长/工艺员)的人员复核。\n\n审核定位在**工序级、由工艺配置决定**:工艺步骤是否需审核(process_step.need_audit)及其审核角色(audit_role)在「工艺」页配置。\n\n两种操作:\n· 审核通过(result=OK)→ 该步骤放行;\n· 退回重做(result=NG)→ 撤销该步骤已有的操作工/检验员签字,退回操作工重做(进入新一轮签字)。\n\n审核只记录「审核人 + 审核时间」,不引入签名图片;签字区在「生产流程卡」页照实展示。', + '本页是审核人的「待审任务」工作台:列出已满足前置签字条件的工艺步骤(操作工已签字;若该步骤配置了「需检验员签字」则检验员须 OK),由具审核角色(如班组长/工艺员)的人员复核。\n\n审核定位在**工序级、由工艺配置决定**:工艺步骤是否需审核及其审核角色在「工艺」页配置。\n\n两种操作:\n· 审核通过 → 该步骤放行;\n· 退回重做 → 撤销该步骤已有的操作工/检验员签字,退回操作工重做(进入新一轮签字)。\n\n审核只记录「审核人 + 审核时间」,不引入签名图片;签字区在「生产流程卡」页照实展示。', fields: [ { name: '工单号 / 工件SN', source: '筛选条件。', purpose: '缩小待审范围', fill: '可空=全部' }, { name: '操作工 / 操作工签字时间', source: '自动带出该步骤操作工签字人及时间。', purpose: '审核前确认是谁做的', fill: '只读' }, - { name: '审核通过', source: '按钮。POST /signs/auditor(result=OK)。', purpose: '审核放行', fill: '点击即生效并刷新列表' }, - { name: '退回重做', source: '按钮。需填退回原因,POST /signs/auditor(result=NG)。', purpose: '审核不通过,退回操作工重做', fill: '撤销该步骤已有签字,进入新一轮' } + { name: '审核通过', source: '按钮。提交「通过」结论。', purpose: '审核放行', fill: '点击即生效并刷新列表' }, + { name: '退回重做', source: '按钮。需填退回原因,提交「退回」结论。', purpose: '审核不通过,退回操作工重做', fill: '撤销该步骤已有签字,进入新一轮' } ] } @@ -567,7 +589,7 @@ export const helpAttachment = { export const helpProducible = { title: '排产支撑', overview: - '把「库存还能撑多久」算清楚,给计划员排产/叫料决策用。数据来源:日排产(daily_plan,按排产日期窗口、剔除已取消排产)× 工单(work_order)× 工单工艺组合 × 工艺物料清单(flow_material)得到需求量,库存可用量实时来自 WMS(/api/internal/stock/check)。注意:物料需求跟着工单走(同成品不同工单可用不同工艺),且一律按日排产口径计算,工单起止日期仅作参考。\n\n本页两块:\n· 各成品可生产套数:只统计有未取消日排产的工单;按该工单工艺组合的物料单台含损耗用量 ÷ 对应物料 WMS 可用量取最小值,即当前库存最多还能装出多少台;短板说明列出限制它的物料(可用量 ÷ 单台用量 = 套数)。\n· 整体支撑:用 WMS 可用量对日排产做逐日消耗模拟,直到某物料不足,得出「还能满产多少天」「库存可支撑到哪天」「最先告罄的短板物料」;排产只排到 N 天时,第 N+1 天起用近3天平均日需求外推(封顶365天防死循环)。\n\n无排产计划时短板物料栏显示「无排产计划」;排产日全部满足且外推无有效需求时显示「充足」。本页只读,不落库。', + '把「库存还能撑多久」算清楚,给计划员排产/叫料决策用。数据来源:日排产(按排产日期窗口、剔除已取消排产)× 工单 × 工单工艺组合 × 工艺物料清单得到需求量,库存可用量实时来自 WMS。注意:物料需求跟着工单走(同成品不同工单可用不同工艺),且一律按日排产口径计算,工单起止日期仅作参考。\n\n本页两块:\n· 各成品可生产套数:只统计有未取消日排产的工单;按该工单工艺组合的物料单台含损耗用量 ÷ 对应物料 WMS 可用量取最小值,即当前库存最多还能装出多少台;短板说明列出限制它的物料(可用量 ÷ 单台用量 = 套数)。\n· 整体支撑:用 WMS 可用量对日排产做逐日消耗模拟,直到某物料不足,得出「还能满产多少天」「库存可支撑到哪天」「最先告罄的短板物料」;排产只排到 N 天时,第 N+1 天起用近3天平均日需求外推(封顶365天防死循环)。\n\n无排产计划时短板物料栏显示「无排产计划」;排产日全部满足且外推无有效需求时显示「充足」。本页只读,不落库。', fields: [ { name: '还能满产(天)', source: '逐日消耗模拟算得(/api/v1/production/producible-support)。', purpose: '一眼看出按当前排产节奏库存能撑几天', fill: '=0 表示今天/近期排产即缺料,需立即补料' }, { name: '库存可支撑到', source: '支撑天数 + 今日日期推算。', purpose: '给出最晚需要到货的日期', fill: '只读;格式 YYYY-MM-DD' }, @@ -580,14 +602,13 @@ export const helpProducible = { export const helpPlcMonitor = { title: 'PLC 手动监控', overview: - '本页用于人工查看产线 PLC 点位状态、手动下发路径指令(写入 MW 寄存器)以及执行强制写入(危险操作)。\n\n页面分四块:\n· 点位状态:读取 §4.1 的 48 位点位信号——工位托盘位 G1~G12、主线缓存位 C1~C15、接驳台托盘位 DOCK01~DOCK20、库房接驳台。● 表示有托盘、○ 表示空。打开页面自动读一次,不轮询;需最新状态点「刷新」。\n· 动作类信号:读取 §4.4 路由表覆盖的 MW800~MW886 当前值;非 0 即在途指令,按「源×100+目标」反解为「源 → 目标」。\n· 手动下发:选「源」(工位 G1~G12 / 主线位 C1~C15)→ 目标下拉按源类型动态过滤 → 系统自动算出 MW 地址与写入值(值=源×100+目标)→ 点「下发」二次确认后即写入 PLC。\n· 可写操作(强制写入,危险):直接强制写单个 M 位或 MW 寄存器,仅在停机/调试时使用。\n\n互斥保护:手动下发前系统检查是否存在在途指令(工位组合下发尚未收到完成信号)——若有则拒绝并提示,以免打断自动线。可写操作(强制写入)不受此约束,因此必须单独勾选确认后才允许执行。\n\n所有手动下发动作记入操作日志(event_log,类型 plc_manual_write);所有强制写入动作记入操作日志(event_log,类型 plc_manual_force,含对象/写前值/写后值/操作人/确认时间),均可在「操作日志」页按类型筛选追溯。', + '本页用于人工查看产线 PLC 点位状态、查看并清零卡住的在途指令、以及手动下发路径指令。\n\n页面从上到下分六块:\n· 顶部:刷新按钮 + 最后刷新时间(打开页面自动读一次,不轮询;需最新状态点「刷新」)。\n· 工位托盘位(只读)、主线缓存位(只读)、接驳台托盘位(只读):三块均为只读,展示各点位「●有件 / ○空」(PLC 实时读取,中文名如 工位1、缓存位5、接驳台1)。无任何按钮、无输入框;传感器位由 PLC 覆盖,无需也不可人工改动。\n· 在途指令:仅列出 PLC 中仍记录为「在途」(MW 非 0)的路径指令,显示为「源 → 目标」。若该指令已实际卡住、PLC 未自动清零,可点「强制清零」——二次确认并勾选「已确认现场安全且指令已实际卡住」后写 MW=0。正常自动线不应出现长期在途。\n· 手动下发:选「源」(工位1~12 / 缓存位1~15)→ 目标下拉按源类型动态过滤 → 系统自动预览「源 → 目标」→ 点「下发」二次确认后写入 PLC。\n\n互斥保护:手动下发前系统检查是否存在在途指令(尚未收到完成信号)——若有则拒绝并提示,以免打断自动线。\n\n所有手动下发动作记入操作日志(event_log,类型 plc_manual_write);所有强制清零动作记入操作日志(event_log,类型 plc_in_transit_clear),均可在「操作日志」页按类型筛选追溯。', fields: [ - { name: '源', source: '下拉选择。工位 G1~G12 或 主线位 C1~C15。', purpose: '路径起点', fill: '选择后目标下拉按源类型动态过滤' }, + { name: '源', source: '下拉选择。工位1~12 或 缓存位1~15。', purpose: '路径起点', fill: '选择后目标下拉按源类型动态过滤' }, { name: '目标', source: '下拉选择(按源类型动态过滤,仅显示 §4.4 合法组合)。', purpose: '路径终点', fill: '选源后才有可选目标' }, - { name: '预览', source: '系统按 §4.4 路由表自动算出。', purpose: '展示 MW 地址与写入值(如 MW872 = 305(C3 → C5))', fill: '只读;组合非法时提示' }, - { name: '下发', source: '按钮(二次确认)。', purpose: '确认后写入 PLC MW 寄存器并记操作日志', fill: '存在在途指令时会被拒绝' }, - { name: '强制写 M 位', source: '危险操作。可选 M 字节(0~65535)与位(0~7)。', purpose: '停机/调试时直接置/清某个 M 位', fill: '未勾选「确认执行强制写」不得执行;M 位可能被 PLC 程序循环覆盖' }, - { name: '强制写 MW', source: '危险操作。白名单:MW800~886 + MW4096~4099。', purpose: '停机/调试时直接写 16 位寄存器', fill: '未勾选「确认执行强制写」不得执行;越界地址由后端拒绝' } + { name: '预览', source: '系统按 §4.4 路由表自动算出。', purpose: '展示「源 → 目标」中文路径', fill: '只读;组合非法时提示' }, + { name: '下发', source: '按钮(二次确认)。', purpose: '确认后写入 PLC 路径指令并记操作日志', fill: '存在在途指令时会被拒绝' }, + { name: '在途指令 / 强制清零', source: '系统列出 PLC 当前 MW 非 0 的在途指令,每行一个「强制清零」按钮。', purpose: '清除卡住的在途指令(PLC 未自动清零时使用)', fill: '需二次确认并勾选「已确认现场安全且指令已实际卡住」;仅允许 §4.4 路由区地址,越界拒绝;传感器位无需人工改动' } ] } diff --git a/bj_power_mes/frontend/src/pages/Agv.vue b/bj_power_mes/frontend/src/pages/Agv.vue index 3d9fbcc..43b440a 100644 --- a/bj_power_mes/frontend/src/pages/Agv.vue +++ b/bj_power_mes/frontend/src/pages/Agv.vue @@ -180,6 +180,13 @@ async function loadMode() { } onMounted(() => { loadDocks(); loadTasks(); loadMode() }) + +// 切 tab 重新加载对应数据(2026-10-19:lazy 页签切回不 reload,状态/叫料单会停留在旧数据) +function onTabChange(name) { + if (name === 'docks') loadDocks() + else if (name === 'tasks') loadTasks() + else if (name === 'dispatch') loadMrs() +} - + @@ -283,8 +285,33 @@ async function bindFlow(row, fid) { try { await request.post('/stations', { id: row.id, stationNo: row.stationNo, name: row.name, stationType: row.stationType || 'LINE', flowId: fid }) ElMessage.success(fid ? '已绑定工艺' : '已解除绑定') - } catch { - // 拦截器已提示(如绑定到未启用的流程) + } catch (e) { + // 规则3(fail-open):PLC 离线未确认 → 后端返回 3021(拦截器不弹 toast),此处弹二次确认 + if (e && e.code === 3021) { + let confirmed = false + try { + await ElMessageBox.confirm( + `PLC 当前离线,无法确认工位${row.stationNo} 是否还有工件。请到现场确认工位已清空后再操作。`, + 'PLC 离线', + { type: 'warning', confirmButtonText: '已现场确认,继续', cancelButtonText: '取消' } + ) + confirmed = true + } catch { + confirmed = false + } + if (confirmed) { + try { + await request.post('/stations', { + id: row.id, stationNo: row.stationNo, name: row.name, + stationType: row.stationType || 'LINE', flowId: fid, plcOfflineConfirmed: true + }) + ElMessage.success(fid ? '已绑定工艺(PLC 离线已现场确认)' : '已解除绑定(PLC 离线已现场确认)') + } catch { + // 二次重发仍失败:拦截器已提示(如在途指令/托盘在位等硬拒绝) + } + } + } + // 其他错误拦截器已提示(如绑定到未启用的流程) } finally { await load() } diff --git a/bj_power_mes/frontend/src/pages/Trace.vue b/bj_power_mes/frontend/src/pages/Trace.vue index 759515d..b968282 100644 --- a/bj_power_mes/frontend/src/pages/Trace.vue +++ b/bj_power_mes/frontend/src/pages/Trace.vue @@ -7,12 +7,18 @@ + + + 追溯查询 按工单查询 重置 打印流程卡 + + 导出拧紧数据 + @@ -136,7 +142,7 @@ - + @@ -197,12 +203,15 @@ import { helpTrace } from '../help' const sn = ref('') const orderNo = ref('') +const operator = ref('') +const exporting = ref(false) const orderRows = ref([]) const data = ref(null) const error = ref('') function resetFilters() { sn.value = '' orderNo.value = '' + operator.value = '' data.value = null orderRows.value = [] error.value = '' @@ -232,7 +241,7 @@ async function search() { error.value = '' data.value = null try { - data.value = await request.get('/trace', { params: { sn: sn.value } }) + data.value = await request.get('/trace', { params: { sn: sn.value, operator: operator.value } }) } catch (e) { error.value = e.message || '查询失败' } @@ -243,6 +252,31 @@ async function printCard() { // 改由 axios 取回 HTML 后写入新窗口(openPrintableHtml 内部已处理鉴权头) await openPrintableHtml('/process-card/by-sn', { sn: sn.value }) } +// A4 拧紧数据独立导出:GET /api/v1/torque/export(带 sn + 操作人筛选),走 fetch + Bearer 下载 xlsx +async function exportTorque() { + if (!sn.value) return + exporting.value = true + try { + const params = new URLSearchParams() + params.set('sn', sn.value) + if (operator.value) params.set('operator', operator.value) + const resp = await fetch('/api/v1/torque/export?' + params.toString(), { + headers: { Authorization: 'Bearer ' + getToken() } + }) + if (!resp.ok) { ElMessage.error('导出失败'); return } + const blob = await resp.blob() + const url = URL.createObjectURL(blob) + const link = document.createElement('a') + link.href = url + link.download = '拧紧数据.xlsx' + link.click() + URL.revokeObjectURL(url) + } catch { + ElMessage.error('导出失败') + } finally { + exporting.value = false + } +} // 把递归的物料组成树扁平化为带层级缩进的列表,避免 el-table 树形 row-key 冲突 const flatBom = computed(() => { const out = [] @@ -256,9 +290,11 @@ const flatBom = computed(() => { walk(data.value?.bindTrace?.bomTree || [], 0, 'r') return out }) +// 工件六态生命周期映射(2026-10-19:与 WorkOrder.vue pieceStatusMap 统一口径; +// 原映射照抄工单状态,NEW/PROCESSING/SEMI_STORED 无中文显示英文,ONLINE 误作"生产中") +const WORKPIECE_STATUS_MAP = { NEW: '待上线', ONLINE: '已上线', PROCESSING: '在制', SEMI_STORED: '半成品入库', DONE: '完工', SCRAPPED: '报废' } function statusText(st) { - const map = { CREATED: '已创建', ONLINE: '生产中', DONE: '已完工', SCRAPPED: '已报废' } - return map[st] || st || '-' + return WORKPIECE_STATUS_MAP[st] || st || '-' } // B6 拧紧闭环:质检/班组长确认放行——清标记 + 写 event_log + 置 torque_ng 预警 resolved。 const disposing = ref(false) diff --git a/bj_power_mes/frontend/src/pages/VirtualStation.vue b/bj_power_mes/frontend/src/pages/VirtualStation.vue index e58cec3..cfc9e72 100644 --- a/bj_power_mes/frontend/src/pages/VirtualStation.vue +++ b/bj_power_mes/frontend/src/pages/VirtualStation.vue @@ -44,12 +44,10 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -113,6 +158,7 @@ import { ref, reactive, computed, onMounted } from 'vue' import { ElMessage } from 'element-plus' import request from '../utils/request' +import { getUser } from '../utils/auth' import PageHelp from '../components/PageHelp.vue' import { helpVirtualStation } from '../help' @@ -129,8 +175,9 @@ const startedAt = ref('') const orderNos = computed(() => (Array.isArray(task.value?.orderNos) ? task.value.orderNos : [])) -// 可报工:选了工单+SN、工艺已绑定;拧紧步骤不拦(在物理工位采集) -const manualSteps = computed(() => (task.value?.steps || []).filter((s) => s.collectType === 'MANUAL')) +// 可报工:选了工单+SN、工艺已绑定;拧紧步骤不拦(在物理工位采集)。 +// 手填/扫码步骤都需人工录入一串字符串(2026-10-19:采集方式新增「扫码」,与手填等价) +const manualSteps = computed(() => (task.value?.steps || []).filter((s) => s.collectType === 'MANUAL' || s.collectType === 'SCAN')) const canReport = computed(() => { if (!stationNo.value || !sn.value || !orderNo.value) return false if (!task.value?.flowActive) return false @@ -211,8 +258,72 @@ async function onSnEntered() { } } -// report 完成报工:步骤数据 + 装机绑定 随单提交(与终端同一接口 /station/report) +// 检测确认弹窗(2026-10-19):存在「检测确认」步骤时,先弹汇总窗逐项确认,全部勾选后才允许提交 +const checkDlg = reactive({ show: false, rows: [] }) +const allConfirmed = computed(() => checkDlg.rows.length > 0 && checkDlg.rows.every((r) => r.confirmed)) +function openCheckDialog() { + checkDlg.rows = manualSteps.value.filter((s) => s.needCheck).map((s) => ({ + step: s, name: s.name, value: stepValues[s.id], confirmed: false + })) + checkDlg.show = true +} +async function confirmAndReport() { + if (!allConfirmed.value) return + for (const r of checkDlg.rows) stepChecks[r.step.id] = true + checkDlg.show = false + // 签字门禁(2026-10-20):有「需操作工签字」步骤 → 先弹签字确认窗,未全部确认不提交 + if (pendingSignSteps.value.length) { + if (!signerName()) { + ElMessage.warning('未获取到登录人身份,请重新登录后再报工') + return + } + openSignDialog() + return + } + await doReport() +} + +// report 完成报工:有「检测确认」步骤先弹确认窗;否则直接提交 async function report() { + if (manualSteps.value.some((s) => s.needCheck)) { + openCheckDialog() + return + } + await doReport() +} + +// 操作工签字弹窗(2026-10-20 方案A,对齐工位终端 WorkPanel):存在「需操作工签字」步骤时, +// 完成报工前逐项核对勾选,全部确认后才允许提交;signs 随 /station/report 载荷提交, +// MES 服务端强校验(validateNeedSign)后落 step_sign_record(signRole=OPERATOR,含签字人/时间/轮次)。 +// 签字人 = 当前 MES 登录账号(本页以登录身份留痕,与终端 operatorName 同口径)。 +const pendingSignSteps = computed(() => (task.value?.steps || []).filter((s) => s.needOperatorSign)) +const signerName = () => { + const me = getUser() + return me ? (me.name || me.username || '') : '' +} +const signDlg = reactive({ show: false, rows: [] }) +const allSigned = computed(() => signDlg.rows.length > 0 && signDlg.rows.every((r) => r.confirmed)) +function openSignDialog() { + signDlg.rows = pendingSignSteps.value.map((s) => ({ step: s, name: s.name, confirmed: false })) + signDlg.show = true +} +// 待签步骤录入内容:手填/扫码=本页录入值;拧紧(自动采集)=物理工位采集(本页无输入框) +function signStepContent(s) { + if (s.collectType === 'AUTO') return '拧紧步骤(物理工位采集)' + const v = stepValues[s.id] + return v === undefined || v === null || v === '' ? '(未录入)' : String(v) +} +function confirmAndReportSign() { + if (!allSigned.value) return + signDlg.show = false + doReport(pendingSignSteps.value.map((s) => ({ + stepId: s.id, signRole: 'OPERATOR', signer: signerName(), remark: '' + }))) +} + +// doReport 步骤数据 + 装机绑定 + 签字 随单提交(与终端同一接口 /station/report) +// signs:需操作工签字步骤的签字确认(签字弹窗采集),MES 服务端强校验后落 step_sign_record +async function doReport(signs = []) { const steps = manualSteps.value.map((s) => ({ stepId: s.id, name: s.name, value: Number(stepValues[s.id]) || 0, @@ -229,11 +340,13 @@ async function report() { } } } + const payload = { + sn: sn.value, flowId: Number(task.value.flowId || 0), stationNo: stationNo.value, + steps, binds, startedAt: startedAt.value, endedAt: new Date().toISOString() + } + if (signs.length) payload.signs = signs try { - await request.post('/station/report', { - sn: sn.value, flowId: Number(task.value.flowId || 0), stationNo: stationNo.value, - steps, binds, startedAt: startedAt.value, endedAt: new Date().toISOString() - }) + await request.post('/station/report', payload) ElMessage.success('报工成功') sn.value = '' startedAt.value = '' diff --git a/bj_power_mes/frontend/src/pages/WorkOrder.vue b/bj_power_mes/frontend/src/pages/WorkOrder.vue index a53570c..1a0d45d 100644 --- a/bj_power_mes/frontend/src/pages/WorkOrder.vue +++ b/bj_power_mes/frontend/src/pages/WorkOrder.vue @@ -19,7 +19,7 @@ - + @@ -49,8 +49,13 @@ - - + + + + + + +