diff --git a/bj_power_mes/common/httpx/response.go b/bj_power_mes/common/httpx/response.go
index 3a28304..144b8e9 100644
--- a/bj_power_mes/common/httpx/response.go
+++ b/bj_power_mes/common/httpx/response.go
@@ -33,41 +33,80 @@ func OkMessage(w http.ResponseWriter, message string, data any) {
writeJSON(w, http.StatusOK, Resp{Code: 0, Message: message, Data: data})
}
-// friendlyMessage 把数据库唯一约束冲突(SQLSTATE 23505)等技术错误转成业务语言提示。
+// friendlyMessage 把数据库底层技术错误(pq: / SQLSTATE / 约束冲突等)统一转成用户能看懂的业务提示。
// 覆盖所有出口(Fail / FailHTTP / FailErr / BadRequest / InternalError),
-// 免得某个 handler 直接 err.Error() 就把 "重复键违反唯一约束..." 原样弹给用户。
+// 免得某个 handler 直接 err.Error() 就把 "duplicate key violates unique constraint..." 原样弹给用户。
+// 分层:①已知唯一约束(23505)按表名给精确对象名 → ②其他已知 SQLSTATE 按类型给友好文案 →
+// ③未识别的 pq:/SQLSTATE 兜底给通用提示(附原始错误便于排查)→ ④纯业务文本原样返回(不误伤)。
func friendlyMessage(raw string) string {
if raw == "" {
return raw
}
lower := strings.ToLower(raw)
+
+ // ① 唯一约束冲突(23505):按约束/表名给更具体的业务对象名
isDup := strings.Contains(lower, "23505") ||
strings.Contains(lower, "duplicate key") ||
strings.Contains(lower, "violates unique constraint") ||
strings.Contains(lower, "重复键") ||
strings.Contains(lower, "重复键违反唯一约束")
- if !isDup {
- return raw
+ if isDup {
+ switch {
+ case strings.Contains(lower, "sys_config"):
+ return "该配置项已存在,请勿重复添加(同名模板/配置只能保存一次)"
+ case strings.Contains(lower, "station"):
+ return "该工位已存在,请勿重复添加(工位号不能重复)"
+ case strings.Contains(lower, "work_order") || strings.Contains(lower, "workorder"):
+ return "该产品工号已存在,请勿重复添加"
+ case strings.Contains(lower, "workpiece") || strings.Contains(lower, "_sn"):
+ return "该产品序号(SN)已存在,请勿重复添加"
+ case strings.Contains(lower, "material") || strings.Contains(lower, "product_type"):
+ return "该物料已存在,请勿重复添加(图号不能重复)"
+ case strings.Contains(lower, "daily_plan"):
+ return "该工单在这天已有排产,请勿重复添加"
+ case strings.Contains(lower, "user") || strings.Contains(lower, "username"):
+ return "该账号已存在,请勿重复添加"
+ default:
+ return "该记录已存在,请勿重复添加(同名或同编号的记录只能保存一次)"
+ }
}
- // 按约束/表名给更具体的业务对象名;命中不了走通用提示
+
+ // ② 其他已知 SQLSTATE / 约束类型,按错误性质给友好提示 + 怎么办
switch {
- case strings.Contains(lower, "sys_config"):
- return "该配置项已存在,请勿重复添加(同名模板/配置只能保存一次)"
- case strings.Contains(lower, "station"):
- return "该工位已存在,请勿重复添加(工位号不能重复)"
- case strings.Contains(lower, "work_order") || strings.Contains(lower, "workorder"):
- return "该产品工号已存在,请勿重复添加"
- case strings.Contains(lower, "workpiece") || strings.Contains(lower, "_sn"):
- return "该产品序号(SN)已存在,请勿重复添加"
- case strings.Contains(lower, "material") || strings.Contains(lower, "product_type"):
- return "该物料已存在,请勿重复添加(图号不能重复)"
- case strings.Contains(lower, "daily_plan"):
- return "该工单在这天已有排产,请勿重复添加"
- case strings.Contains(lower, "user") || strings.Contains(lower, "username"):
- return "该账号已存在,请勿重复添加"
- default:
- return "该记录已存在,请勿重复添加(同名或同编号的记录只能保存一次)"
+ case strings.Contains(lower, "23503") || strings.Contains(lower, "violates foreign key constraint"):
+ return "保存失败:该记录已被其他单据引用,不能删除或改为无效值。请先处理引用它的单据再重试"
+ case strings.Contains(lower, "23502") || strings.Contains(lower, "violates not-null constraint") || strings.Contains(lower, "null value in column"):
+ return "保存失败:有必填内容未填。请检查带星号的必填项后重试"
+ case strings.Contains(lower, "22001") || strings.Contains(lower, "value too long") || strings.Contains(lower, "character varying"):
+ return "保存失败:某项内容超过允许长度。请缩短名称/备注后重试"
+ case strings.Contains(lower, "22003") || strings.Contains(lower, "numeric value out of range"):
+ return "保存失败:某项数字超出允许范围。请核对数量/数值后重试"
+ case strings.Contains(lower, "22p02") || strings.Contains(lower, "invalid input syntax") || strings.Contains(lower, "invalid input syntax for type"):
+ return "保存失败:某项数字或日期格式不正确。请检查录入内容后重试"
+ case strings.Contains(lower, "23514") || strings.Contains(lower, "violates check constraint"):
+ return "保存失败:某项内容不符合业务规则取值。请核对选项后重试"
+ case strings.Contains(lower, "40001") || strings.Contains(lower, "deadlock detected"):
+ return "保存失败:本次操作与其他操作冲突。请稍等片刻后重试"
+ case strings.Contains(lower, "42p01") || strings.Contains(lower, "relation") && strings.Contains(lower, "does not exist"):
+ return "保存失败:相关数据未就绪(表或结构不存在)。请通知维护人员初始化数据后再试"
+ case strings.Contains(lower, "42703") || strings.Contains(lower, "column") && strings.Contains(lower, "does not exist"):
+ return "保存失败:数据结构与程序版本不一致。请通知维护人员升级后再试"
+ case strings.Contains(lower, "08006") || strings.Contains(lower, "connection") && strings.Contains(lower, "refused") || strings.Contains(lower, "could not connect"):
+ return "保存失败:数据库连接不可用。请检查网络/数据库服务后重试"
}
+
+ // ③ 未归类的底层数据库错误(pq:/SQLSTATE/ent 约束):兜底友好提示,附原始错误供定位,避免吞掉线索
+ isDB := strings.Contains(lower, "pq:") ||
+ strings.Contains(lower, "sqlstate") ||
+ strings.Contains(lower, "ent: constraint failed") ||
+ strings.Contains(lower, "constraint failed") ||
+ strings.Contains(lower, "constraint violation")
+ if isDB {
+ return "保存失败:数据校验未通过或数据库处理异常,请核对录入内容后重试;若反复出现请把提示原文反馈维护人员(" + raw + ")"
+ }
+
+ // ④ 纯业务文本:原样返回,不误伤
+ return raw
}
// Fail 业务失败(HTTP 200,业务码非0)
diff --git a/bj_power_mes/frontend/src/board/BoardApp.vue b/bj_power_mes/frontend/src/board/BoardApp.vue
index 1a30d97..b7cb9f5 100644
--- a/bj_power_mes/frontend/src/board/BoardApp.vue
+++ b/bj_power_mes/frontend/src/board/BoardApp.vue
@@ -20,6 +20,9 @@
【{{ a.level || '告警' }}】{{ a.target }}:{{ a.message }}
+
+
+
@@ -55,6 +58,7 @@ import BoardProduction from './components/BoardProduction.vue'
import BoardWarehouse from './components/BoardWarehouse.vue'
import BoardSide from './components/BoardSide.vue'
import BoardMaterialQuery from './components/BoardMaterialQuery.vue'
+import BoardManage from './components/BoardManage.vue'
/**
* 门口看板 /board(由 App.tsx 迁移):100 寸 · 无鼠标 · 纯流式自适应。
diff --git a/bj_power_mes/frontend/src/board/boardRequest.js b/bj_power_mes/frontend/src/board/boardRequest.js
index 3e6f938..8228a07 100644
--- a/bj_power_mes/frontend/src/board/boardRequest.js
+++ b/bj_power_mes/frontend/src/board/boardRequest.js
@@ -24,6 +24,10 @@ export const boardEndpoints = {
snapshot: 'dashboard/snapshot',
config: 'dashboard/config',
materialQuery: 'dashboard/material-query',
+ /** 管理屏专属查询(客户 22 条) */
+ tempo: 'dashboard/tempo',
+ contractQuery: 'dashboard/contract-query',
+ batchTrace: 'dashboard/batch-trace',
/** SSE 必须走 fetch 流,用同源完整路径 */
stream: '/api/internal/dashboard/stream',
}
diff --git a/bj_power_mes/frontend/src/board/boardService.js b/bj_power_mes/frontend/src/board/boardService.js
index 44ab597..ba20753 100644
--- a/bj_power_mes/frontend/src/board/boardService.js
+++ b/bj_power_mes/frontend/src/board/boardService.js
@@ -313,6 +313,8 @@ function normalize(raw) {
agv: raw.agv ?? [],
events: raw.events ?? [],
alarms: raw.alarms ?? [],
+ // 客户 22 条:管理屏专属聚合(停机TOP/不良TOP/返修报废/节拍/缺料/低库存)
+ manage: raw.manage ?? {},
isDemo: false,
}
}
diff --git a/bj_power_mes/frontend/src/board/components/BoardKpi.vue b/bj_power_mes/frontend/src/board/components/BoardKpi.vue
index 970e65e..4b2bb77 100644
--- a/bj_power_mes/frontend/src/board/components/BoardKpi.vue
+++ b/bj_power_mes/frontend/src/board/components/BoardKpi.vue
@@ -27,7 +27,6 @@ const allCells = computed(() => {
const output = p.outputToday ?? 0
const target = p.targetToday ?? 0
const pct = target > 0 ? Math.min(100, Math.round((output / target) * 100)) : null
- const locPct = w.locationTotal > 0 ? Math.round((w.locationUsed / w.locationTotal) * 100) : null
return [
{ key: 'output', label: '今日产量', value: output, unit: '件', sub: target > 0 ? `目标 ${target} 件` : '目标未下达', color: '#22d3ee' },
{ key: 'rate', label: '产量达成', value: pct === null ? '—' : pct, unit: pct === null ? '' : '%', sub: '实际 / 目标', color: '#34d399' },
@@ -47,13 +46,7 @@ const allCells = computed(() => {
sub: '扫码枪 + 拧紧枪',
color: '#22d3ee',
},
- {
- key: 'location', label: '库位利用率',
- value: locPct === null ? '—' : locPct,
- unit: locPct === null ? '' : '%',
- sub: w.locationTotal > 0 ? `已用 ${w.locationUsed} / 共 ${w.locationTotal}` : '库位未维护',
- color: '#a78bfa',
- },
+ // 客户诉求3:顶部「库位利用率」已删除(与仓储概览 BoardWarehouse 重复),仅保留底部仓储概览那一份。
// 2026-11-10 新增可选指标:在「基础设置 → 看板顶部指标」里勾选后才显示
{ key: 'yield', label: '良率', value: Number(p.qualifiedRate ?? 0).toFixed(1), unit: '%', sub: '全工序一次合格 / 总完工', color: '#34d399' },
{
diff --git a/bj_power_mes/frontend/src/board/components/BoardLineModel.vue b/bj_power_mes/frontend/src/board/components/BoardLineModel.vue
index 1e50103..15690c5 100644
--- a/bj_power_mes/frontend/src/board/components/BoardLineModel.vue
+++ b/bj_power_mes/frontend/src/board/components/BoardLineModel.vue
@@ -59,7 +59,10 @@
{{ s.end ? `工位${s.no} 下料` : `工位${s.no}` }}
-
+
+
+ {{ s.tagLabel }}
+
@@ -67,7 +70,8 @@
{{ s.currentProcess || '待排产' }}
{{ s.currentSn || '无在制工件' }}
- {{ s.currentOperator || '未登录' }}{{ s.doneCount ? ` · 完成 ${s.doneCount}` : '' }}
+
+ {{ s.currentOperator || '未登录' }}{{ s.planCount > 0 ? ` · ${s.doneCount}/${s.planCount} (${s.doneRate}%)` : (s.doneCount ? ` · 完成 ${s.doneCount}` : '') }}
@@ -89,12 +93,14 @@
-
-
+
+
+
{{ a.label }}
+ {{ a.label }} · {{ a.statusLabel }}
-
AGV 搬运通道 · 任务驱动
+
AGV 搬运通道 · {{ agvLegend }}
@@ -297,6 +303,16 @@ const stationBoxes = computed(() => PAIR_STOP.flatMap(([up, down, stop]) => {
const st = byNo.value.get(no)
const running = st?.status === 'running'
const offline = st?.status === 'offline'
+ // 客户诉求11:状态标签映射(后端 stationTag: normal/shortage/offline)
+ const tag = st?.stationTag || (offline ? 'offline' : st?.paused ? 'shortage' : 'normal')
+ const tagMap = {
+ shortage: { fill: '#ef4444', blink: true, label: '缺料/离开' },
+ offline: { fill: '#94a3b8', blink: false, label: '离线' },
+ normal: { fill: running ? '#67e8f9' : '#60a5fa', blink: running, label: '正常' },
+ }
+ const tagStyle = tagMap[tag] || tagMap.normal
+ const planCount = Number(st?.planCount || 0)
+ const doneCount = Number(st?.doneCount || 0)
return {
no,
x: center,
@@ -304,13 +320,18 @@ const stationBoxes = computed(() => PAIR_STOP.flatMap(([up, down, stop]) => {
running,
offline,
paused: !!st?.paused,
- fill: offline ? 'rgba(51,65,85,0.5)' : running ? 'rgba(8,145,178,0.38)' : 'rgba(30,64,175,0.38)',
- edge: offline ? '#475569' : running ? '#22d3ee' : '#3b82f6',
+ tagFill: tagStyle.fill,
+ tagBlink: tagStyle.blink,
+ tagLabel: tagStyle.label,
+ fill: tag === 'shortage' ? 'rgba(127,29,29,0.5)' : offline ? 'rgba(51,65,85,0.5)' : running ? 'rgba(8,145,178,0.38)' : 'rgba(30,64,175,0.38)',
+ edge: tag === 'shortage' ? '#ef4444' : offline ? '#475569' : running ? '#22d3ee' : '#3b82f6',
end: no >= 11,
currentProcess: st?.currentProcess,
currentSn: st?.currentSn,
currentOperator: st?.currentOperator,
- doneCount: st?.doneCount,
+ doneCount,
+ planCount,
+ doneRate: planCount > 0 ? Math.min(100, Math.round(doneCount / planCount * 100)) : 0,
}
})
}))
@@ -325,6 +346,15 @@ const dockBoxes = computed(() => PAIR_STOP.filter(([up]) => up < 11).flatMap(([u
]
}))
+// 客户诉求12:AGV 状态 → 车体/指示灯颜色映射(与 Agv.vue 细化口径一致)
+const AGV_COLOR = {
+ 空闲: { body: '#4ade80', lamp: '#22c55e', blink: false },
+ 运送中: { body: '#fb923c', lamp: '#fde047', blink: true },
+ 装货中: { body: '#22d3ee', lamp: '#67e8f9', blink: true },
+ 故障: { body: '#ef4444', lamp: '#fca5a5', blink: true },
+ 充电: { body: '#60a5fa', lamp: '#93c5fd', blink: false },
+ 待命: { body: '#94a3b8', lamp: '#cbd5e1', blink: false },
+}
const agvCars = computed(() => {
const list = props.data.agv || []
return [
@@ -339,9 +369,20 @@ const agvCars = computed(() => {
else if (robot.status === 'loading' || robot.status === 'waiting') pos = from
else pos = to ?? from
}
- return { pos, label: (robot?.code ?? 'AGV').replace('AGV-', 'AGV ') }
+ const statusLabel = robot?.statusLabel || '待命'
+ const c = AGV_COLOR[statusLabel] || AGV_COLOR['待命']
+ return {
+ pos, label: (robot?.code ?? 'AGV').replace('AGV-', 'AGV '),
+ statusLabel, bodyColor: c.body, lampColor: c.lamp, lampBlink: c.blink,
+ }
})
})
+const agvLegend = computed(() => {
+ const list = props.data.agv || []
+ if (!list.length) return '任务驱动'
+ const labels = [...new Set(list.map((a) => a.statusLabel || '待命'))]
+ return labels.join(' / ')
+})
const legends = [
{ y: 0, color: COLOR.stopOn, label: '停靠位(到位即进工位)' },
@@ -367,3 +408,15 @@ const virtualRows = computed(() => [0, 1].flatMap((copy) => virtuals.value.map((
}
})))
+
+
diff --git a/bj_power_mes/frontend/src/board/components/BoardManage.vue b/bj_power_mes/frontend/src/board/components/BoardManage.vue
new file mode 100644
index 0000000..6e290ed
--- /dev/null
+++ b/bj_power_mes/frontend/src/board/components/BoardManage.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
+ 不良分类 TOP 不良 {{ ngTotal }} · {{ ngRate.toFixed(1) }}%
+
+
+
+
+
+
+
+ 成品试验 合格 {{ trials.ok }} · 返修 {{ trials.repair }} · 报废 {{ trials.scrap }}
+
+
+
+
+
+
+
+
+ 节拍 · 瓶颈识别
+
+
+
+
+
+
按工序(耗时最长=瓶颈在前)
+
+
按人员
+
+
+
+
+
+
+ 即将缺料 / 实时告警
+
+
+ {{ s.stationNo }}工位 · {{ s.material || '物料' }}
+ 待补料
+
+
+ 【{{ a.level || '告警' }}】{{ a.target }}
+ {{ a.message }}
+
+
暂无缺料与告警
+
+
+
+
+
+ 批量追踪 · 合同号反查
+
+
+
+
+
+
+
+
+
+ {{ o.orderNo }} · {{ o.productName }}
+ {{ o.doneQty }}/{{ o.totalQty }} · SN {{ (o.finishedSns || []).length }}
+
+
+ 成品 SN{{ sn }}
+
+
未查询到关联数据
+
+
+
+
+
+
+
+
+
+
diff --git a/bj_power_mes/frontend/src/board/components/BoardMaterialQuery.vue b/bj_power_mes/frontend/src/board/components/BoardMaterialQuery.vue
index 4e11ba4..d3cf6c5 100644
--- a/bj_power_mes/frontend/src/board/components/BoardMaterialQuery.vue
+++ b/bj_power_mes/frontend/src/board/components/BoardMaterialQuery.vue
@@ -1,43 +1,87 @@
-
+
- 物料追溯查询
+ 追溯查询
-
-
-
-
-
-
{{ error }}
-
未查询到该物料档案。
-
-
- 物料档案
-
- {{ material.name || material.code }}({{ material.code }}) · 规格 {{ material.spec || '-' }} · 单位 {{ material.unit || '-' }}
-
-
-
-
- 在库库存
-
- | 库位 | 批次 | 质量状态 | 数量 |
-
-
- | {{ locLabel(r) }} |
- {{ r.batch || '—' }} |
- {{ r.quality || '未检' }} |
- {{ r.qty }} |
-
-
-
-
+
+
+
+
-
@@ -48,28 +92,30 @@ import { ref } from 'vue'
import boardRequest, { boardEndpoints } from '../boardRequest'
/**
- * 物料追溯查询入口(由 MaterialQuery.tsx 迁移)。
- * 复用 MES 代理接口 /api/internal/dashboard/material-query;
- * 弹层用原生 HTML,不引 Semi UI / Element Plus、不引新依赖。
+ * 看板追溯查询入口:物料追溯 + 合同号反查(诉求1)+ 批次反查成品(诉求8)。
+ * 复用 MES 内部代理接口;弹层用原生 HTML,不引 Semi UI / Element Plus。
*/
const visible = ref(false)
+const tab = ref('contract')
const code = ref('')
const batch = ref('')
+const contractNo = ref('')
+const batchQuery = ref('')
const loading = ref(false)
-const error = ref('')
+const err = ref({ contract: '', material: '', batch: '' })
const found = ref(null)
const material = ref(null)
const inventory = ref([])
+const contractResult = ref(null)
+const batchResult = ref(null)
function unwrap(j) {
if (j && typeof j === 'object' && j.code !== undefined && 'data' in j) return j.data
return j
}
-
function locLabel(r) {
return `${r.zone || '-'} / ${r.shelf || ''} / ${r.layer || ''} / ${r.position || ''}`
}
-
function qClass(q) {
if (q === '合格') return 'is-ok'
if (q === '不合格') return 'is-ng'
@@ -78,12 +124,9 @@ function qClass(q) {
async function doQuery() {
const c = code.value.trim()
- if (!c) {
- error.value = '请输入物料编码'
- return
- }
+ if (!c) { err.value.material = '请输入物料编码'; return }
loading.value = true
- error.value = ''
+ err.value.material = ''
found.value = null
material.value = null
inventory.value = []
@@ -92,18 +135,47 @@ async function doQuery() {
if (batch.value.trim()) params.batch = batch.value.trim()
const res = await boardRequest.get(boardEndpoints.materialQuery, { params })
const d = unwrap(res.data)
- if (!d || d.available === false) {
- error.value = 'MES/WMS 服务不可用,暂无法查询'
- found.value = false
- return
- }
+ if (!d || d.available === false) { err.value.material = 'MES/WMS 服务不可用,暂无法查询'; found.value = false; return }
found.value = !!d.found
material.value = d.material || null
inventory.value = d.inventory || []
} catch (e) {
- error.value = e instanceof Error ? e.message : '查询失败'
- } finally {
- loading.value = false
- }
+ err.value.material = e instanceof Error ? e.message : '查询失败'
+ } finally { loading.value = false }
+}
+
+async function doContract() {
+ const v = contractNo.value.trim()
+ if (!v) { err.value.contract = '请输入合同号'; return }
+ loading.value = true
+ err.value.contract = ''
+ contractResult.value = null
+ try {
+ const res = await boardRequest.get(boardEndpoints.contractQuery, { params: { contractNo: v } })
+ contractResult.value = unwrap(res.data) || { found: false, orders: [] }
+ } catch (e) {
+ err.value.contract = e instanceof Error ? e.message : '查询失败'
+ } finally { loading.value = false }
+}
+
+async function doBatch() {
+ const v = batchQuery.value.trim()
+ if (!v) { err.value.batch = '请输入批次号'; return }
+ loading.value = true
+ err.value.batch = ''
+ batchResult.value = null
+ try {
+ const res = await boardRequest.get(boardEndpoints.batchTrace, { params: { batch: v } })
+ batchResult.value = unwrap(res.data) || { found: false, sns: [] }
+ } catch (e) {
+ err.value.batch = e instanceof Error ? e.message : '查询失败'
+ } finally { loading.value = false }
}
+
+
diff --git a/bj_power_mes/frontend/src/board/components/RankBars.vue b/bj_power_mes/frontend/src/board/components/RankBars.vue
new file mode 100644
index 0000000..d5dc5aa
--- /dev/null
+++ b/bj_power_mes/frontend/src/board/components/RankBars.vue
@@ -0,0 +1,43 @@
+
+
+
+
{{ empty }}
+
+ {{ label(r) }}
+
+
+
+ {{ value(r) }}{{ suffix }}
+
+
+
+
+
+
+
diff --git a/bj_power_mes/frontend/src/help.js b/bj_power_mes/frontend/src/help.js
index 29739e3..9ea8932 100644
--- a/bj_power_mes/frontend/src/help.js
+++ b/bj_power_mes/frontend/src/help.js
@@ -9,9 +9,9 @@ const P = (title, intro, blocks, links) => ({ title, intro, blocks: blocks || []
// ── 成品:型号、怎么造、造多少 ──────────────────────────────────
-export const helpProductType = P('成品档案', '这里是成品型号的源头,也是 MES 与 WMS 双向同步的基准。编码一旦被工单引用就不要改。', [
+export const helpProductType = P('成品档案', '这里是成品主数据的源头,也是 MES 与 WMS 双向同步的基准。成品编码一旦被工单引用就不要改。', [
{ k: 'role', t: '这页解决什么', text: '把「要造的成品」登记成一个全系统公认的型号,工单、工艺、成品入库、试验、追溯都挂在这个编码上。原材料不在这里建,在 WMS 建。' },
- { k: 'confuse', t: '三个编号别混', text: '产品工号是工单号(一批一个);产品编码是成品型号(多个工单可以是同一个型号);产品序号(SN) 是每台工件自己的号。MES 页面叫「成品档案」,不显示「图号」——成品没有图号,也没有物料编码;这两个字段属于原材料,是 WMS 物料档案的事。改产品编码会让已建工单找不到原来的型号,追溯也跟着断。' },
+ { k: 'confuse', t: '三个编号别混', text: '产品工号是工单号(一批一个);成品编码由系统自动生成,是本系统内部唯一编码;产品序号(SN) 是每台工件自己的号。成品没有图号、也没有物料编码,这两项属于原材料(WMS 物料档案),本系统界面与导入模板均不出现。改成品编码会让已建工单找不到原来的产品,追溯也跟着断。' },
{ k: 'states', t: '停用不是删除', text: '停用后新建工单的下拉里选不到它,但已经建好的工单、库存、追溯记录都还在,也还能查。这是唯一的下架方式,系统不物理删型号。' },
{ k: 'confuse', t: '「序列号=是」决定什么', text: '它决定这台工件是按批次数量记账,还是一台一个号逐件扫。选「是」时,上线建档必须扫已在 WMS 入库登记过的来料 SN,不能让系统发号。产品分类只是个默认值,跟这件事没有绑定关系。新建成品时不需要选「类型」,表虽然和原材料共用,页面上不做这个选择。' },
{ k: 'complex', t: '同步失败时两种表现不一样', text: '单条建档或编辑即使 WMS 暂时不通,本系统也会先保存下来、标上待同步,之后点「重推」补上;Excel 批量导入则是整批一起成功或一起失败,不会出现半张表进去了的情况。导入模板与 WMS 大体同款(MES 无「类型」列、列名一致,均按表头名识别),改模板必须两端一起改。' },
diff --git a/bj_power_mes/frontend/src/layouts/MainLayout.vue b/bj_power_mes/frontend/src/layouts/MainLayout.vue
index 1b50584..cb8138e 100644
--- a/bj_power_mes/frontend/src/layouts/MainLayout.vue
+++ b/bj_power_mes/frontend/src/layouts/MainLayout.vue
@@ -10,7 +10,7 @@
+ class="menu" style="border-right:none" :collapse="isCollapse && !isMobile">
@@ -390,7 +390,10 @@ function onUserCmd(cmd) {
diff --git a/bj_power_wms/frontend/src/pages/Inspection.vue b/bj_power_wms/frontend/src/pages/Inspection.vue
index 23f65cd..1c08e02 100644
--- a/bj_power_wms/frontend/src/pages/Inspection.vue
+++ b/bj_power_wms/frontend/src/pages/Inspection.vue
@@ -162,8 +162,8 @@ function clearAll() {
sourceInboundNo.value = '' // 解除入库单绑定,回到自由录入模式
}
// 结论变化:SN/其他 自动定检验数=1、合格数随结论;批次合格时合格数=检验数。
-// 2026-11-16 拍板:处置下放明细行——行判「不合格」时初始化一条处置明细(默认全量退货),
-// 可按数量拆分为退货/返修/报废多行;运单号概念废除,物流信息填备注。
+// 2026-11-16 拍板:判「不合格」不预置任何处置方式,全部由检验员在「登记不合格处置」弹窗里自行选
+// 退货/返修/报废并填数量;Σqty 必须等于不合格数。运单号概念废除,物流信息填备注。
function rejectQtyOfRow(row) {
return Math.max(0, (Number(row.inspectQty) || 0) - (Number(row.passQty) || 0))
}
@@ -172,7 +172,8 @@ function disposalSum(row) {
}
function addDisposalLine(row) {
if (!row.disposals) row.disposals = []
- row.disposals.push({ type: 'RETURN', qty: Math.max(1, rejectQtyOfRow(row) - disposalSum(row)), remark: '' })
+ // 新行不指定类型(type 空=让检验员自己选),数量默认剩余未分配数
+ row.disposals.push({ type: '', qty: Math.max(1, rejectQtyOfRow(row) - disposalSum(row)), remark: '' })
}
function onItemStatus(row) {
if (!isRowBatch(row)) {
@@ -182,9 +183,7 @@ function onItemStatus(row) {
row.passQty = row.inspectQty
}
if (row.status === '不合格') {
- if (!row.disposals || !row.disposals.length) {
- row.disposals = [{ type: 'RETURN', qty: rejectQtyOfRow(row) || 1, remark: '' }]
- }
+ if (!row.disposals) row.disposals = []
} else {
row.disposals = []
}
@@ -194,6 +193,51 @@ function onTargetTypeChange() {
loadPicker()
}
+// 登记不合格处置(弹窗):检验员自行选退货/返修/报废并填数量,Σqty 必须=不合格数。
+const disposalDlg = reactive({ show: false, row: null })
+function openDisposalDlg(row) {
+ if (row.status !== '不合格') return
+ if (!row.disposals) row.disposals = []
+ disposalDlg.row = row
+ disposalDlg.show = true
+}
+function disposalDlgAdd() {
+ if (!disposalDlg.row) return
+ addDisposalLine(disposalDlg.row)
+}
+function disposalDlgRemove(i) {
+ if (disposalDlg.row) disposalDlg.row.disposals.splice(i, 1)
+}
+// 实时校验(2026-11-16 纠偏):合计数量一旦大于该行不合格数,立刻飘红提示并禁用「确认」按钮,不等提交才报错。
+const disposalOver = computed(() => {
+ const row = disposalDlg.row
+ if (!row) return false
+ return disposalSum(row) > rejectQtyOfRow(row)
+})
+function disposalDlgOk() {
+ const row = disposalDlg.row
+ if (!row) return
+ const rq = rejectQtyOfRow(row)
+ const sum = disposalSum(row)
+ if (disposalOver.value) {
+ ElMessage.warning(`处置数量合计(${sum})不能大于不合格数(${rq})`)
+ return
+ }
+ if (sum !== rq) {
+ ElMessage.warning(`处置数量合计(${sum})必须等于不合格数(${rq})`)
+ return
+ }
+ if ((row.disposals || []).some((d) => !d.type)) {
+ ElMessage.warning('请为每条处置选择方式(退货 / 返修 / 报废)')
+ return
+ }
+ if ((row.disposals || []).some((d) => (Number(d.qty) || 0) <= 0)) {
+ ElMessage.warning('处置数量必须大于 0')
+ return
+ }
+ disposalDlg.show = false
+}
+
// 从待检清单送检:把明细带入录入页已选清单,并回填归属(§E1/E2)
async function sendToEntry(details, row) {
if (!details.length) return
@@ -259,6 +303,10 @@ async function submitInspection() {
}
const rq = rejectQtyOfRow(it)
const sum = disposalSum(it)
+ if (it.disposals.some((d) => !d.type)) {
+ ElMessage.warning(`批次/SN「${it.targetId}」请选择每条处置的方式(退货 / 返修 / 报废)`)
+ return
+ }
if (it.disposals.some((d) => (Number(d.qty) || 0) <= 0)) {
ElMessage.warning(`批次/SN「${it.targetId}」处置明细行数量必须大于 0`)
return
@@ -775,77 +823,61 @@ onMounted(() => {
-
-
-
-
-
-
- {{ row.inboundNo || '-' }}
-
-
- {{ row.materialCode || '-' }}
-
-
- {{ row.materialName || '-' }}
-
-
-
- onItemStatus(row)">
- 合格
- 不合格
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ (Number(row.inspectQty)||0) - (Number(row.passQty)||0) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删
-
-
- + 添加处置行
-
- 已拆 {{ disposalSum(row) }}/{{ rejectQtyOfRow(row) }},需等于不合格数
-
-
-
- -
-
-
-
-
- 移除
-
-
-
-
尚未选择任何待检编号(可逐项判定合格/不合格,产品序号(SN)/其他默认检验数=1)
-
清空
+
+
+
+ 已选清单
+ 清空
-
+
+
+
+ {{ row.materialName || row.materialCode || '-' }}
+
+
+
+ onItemStatus(row)">
+ 合格
+ 不合格
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ rejectQtyOfRow(row) }}
+
+
+
+
+
+ {{ disposalSum(row) === rejectQtyOfRow(row) && disposalSum(row) > 0 ? '已登记处置' : '登记不合格处置' }}
+
+
+ 待分配 {{ rejectQtyOfRow(row) - disposalSum(row) }}
+
+
+ -
+
+
+
+
+ 移除
+
+
+
+
尚未选择任何待检编号(可逐项判定合格/不合格,产品序号(SN)/其他默认检验数=1)
+
提交检验
@@ -1045,6 +1077,53 @@ onMounted(() => {
+
+
+
+ 批次/产品序号(SN):{{ disposalDlg.row?.targetId || '' }} 不合格数:{{ rejectQtyOfRow(disposalDlg.row) }}
+ 已分配:{{ disposalSum(disposalDlg.row) }} 按数量拆分,合计须等于不合格数。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删
+
+
+
+
+ + 添加处置行
+
+ 处置数量不能大于不合格数(已填 {{ disposalSum(disposalDlg.row) }} / 不合格 {{ rejectQtyOfRow(disposalDlg.row) }})
+
+
+ 还差 {{ rejectQtyOfRow(disposalDlg.row) - disposalSum(disposalDlg.row) }} 件未分配
+
+
+
+ 取消
+ 确认
+
+
+
diff --git a/bj_power_wms/frontend/src/pages/Inventory.vue b/bj_power_wms/frontend/src/pages/Inventory.vue
index f7e1ccf..262a6fb 100644
--- a/bj_power_wms/frontend/src/pages/Inventory.vue
+++ b/bj_power_wms/frontend/src/pages/Inventory.vue
@@ -8,9 +8,10 @@ import { exportXlsxFetch } from '../utils/export'
import { can } from '../utils/perm'
import PageHelp from '../components/PageHelp.vue'
import { helpInventory } from '../help'
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
const router = useRouter()
+const route = useRoute()
// 视图切换:物料汇总(一物料一行) / 库位明细(物料×库位×批次SN) / 区域汇总 / 缺料补货
// 物料汇总为默认首视图:快速回答"这个物料总共有多少"
@@ -444,6 +445,10 @@ async function exportCsv() {
}
onMounted(() => {
+ // 客户诉求21:从大屏物料结构饼图下钻,带分类筛选条件进入
+ const q = route.query || {}
+ if (q.manageMode) filters.manageMode = String(q.manageMode)
+ if (q.category) filters.category = String(q.category)
loadZones()
load()
})
diff --git a/bj_power_wms/frontend/src/pages/PalletWorkbench.vue b/bj_power_wms/frontend/src/pages/PalletWorkbench.vue
index 72e0c18..a471a27 100644
--- a/bj_power_wms/frontend/src/pages/PalletWorkbench.vue
+++ b/bj_power_wms/frontend/src/pages/PalletWorkbench.vue
@@ -76,7 +76,7 @@
-
+
diff --git a/bj_power_wms/frontend/src/pages/PreparationList.vue b/bj_power_wms/frontend/src/pages/PreparationList.vue
index eb8aaad..aeb81f8 100644
--- a/bj_power_wms/frontend/src/pages/PreparationList.vue
+++ b/bj_power_wms/frontend/src/pages/PreparationList.vue
@@ -12,7 +12,7 @@
-
+
diff --git a/bj_power_wms/frontend/src/pages/ReturnOrder.vue b/bj_power_wms/frontend/src/pages/ReturnOrder.vue
index bc02c1e..810e170 100644
--- a/bj_power_wms/frontend/src/pages/ReturnOrder.vue
+++ b/bj_power_wms/frontend/src/pages/ReturnOrder.vue
@@ -546,7 +546,7 @@ async function loadAllDocks() {
-
+
diff --git a/bj_power_wms/frontend/src/pages/UserManage.vue b/bj_power_wms/frontend/src/pages/UserManage.vue
index 8274aad..4c23b23 100644
--- a/bj_power_wms/frontend/src/pages/UserManage.vue
+++ b/bj_power_wms/frontend/src/pages/UserManage.vue
@@ -286,7 +286,7 @@ onMounted(() => {
-
+
diff --git a/bj_power_wms/internal/handler/internalapi.go b/bj_power_wms/internal/handler/internalapi.go
index 2024c7b..3d7a78d 100644
--- a/bj_power_wms/internal/handler/internalapi.go
+++ b/bj_power_wms/internal/handler/internalapi.go
@@ -12,6 +12,7 @@ import (
"bj_power_wms/ent/inventory"
"bj_power_wms/ent/material"
"bj_power_wms/ent/outboundorder"
+ "bj_power_wms/ent/returnorder"
"bj_power_wms/ent/zone"
"bj_power_wms/internal/svc"
)
@@ -143,7 +144,10 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
Order(ent.Desc(inboundorder.FieldCreatedAt)).Limit(15).All(ctx0())
outb, _ := ctx.EntClient.OutboundOrder.Query().
Order(ent.Desc(outboundorder.FieldCreatedAt)).Limit(15).All(ctx0())
- type mv struct{ t int64; m map[string]any }
+ type mv struct {
+ t int64
+ m map[string]any
+ }
all := make([]mv, 0, len(inb)+len(outb))
for _, o := range inb {
mat := o.MaterialName
@@ -173,6 +177,86 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
movements = append(movements, x.m)
}
+ // ===== 客户诉求 13/16/17/18/20:管理屏数据(复用 invs + 现成表,不建新表)=====
+ // 13 返修/不良库存:返修=成品 product_status=返修;不良=quality_status=不合格
+ repairStock, defectStock := 0, 0
+ for _, iv := range invs {
+ if iv.ProductStatus == "返修" {
+ repairStock += iv.Quantity
+ }
+ if iv.QualityStatus == "不合格" {
+ defectStock += iv.Quantity
+ }
+ }
+ // 16 待退料:return_order status=PENDING
+ pendingReturn := 0
+ if n, e := ctx.EntClient.ReturnOrder.Query().Where(returnorder.StatusEQ("PENDING")).Count(ctx0()); e == nil {
+ pendingReturn = n
+ }
+ // 17 低安全库存告警:material.safety_stock>0 且库存可用量<阈值
+ type lowStockRow struct {
+ Material string `json:"material"`
+ MaterialName string `json:"materialName"`
+ Qty int `json:"qty"`
+ SafetyStock int `json:"safetyStock"`
+ }
+ lowStocks := []lowStockRow{}
+ stockByCode := map[string]int{}
+ for _, iv := range invs {
+ if iv.Status == "在库" {
+ stockByCode[iv.MaterialCode] += iv.Quantity - iv.LockedQty
+ }
+ }
+ if mats, e := ctx.EntClient.Material.Query().Where(material.SafetyStockGT(0)).All(ctx0()); e == nil {
+ for _, m := range mats {
+ qty := stockByCode[m.Code]
+ if qty < m.SafetyStock {
+ lowStocks = append(lowStocks, lowStockRow{Material: m.Code, MaterialName: m.Name, Qty: qty, SafetyStock: m.SafetyStock})
+ }
+ }
+ }
+ // 18 仓内作业效率:未闭环单据创建至今超过 2 小时视为超时(单据表无完成时间字段,
+ // 采用「仍活跃且创建>2h」口径;入库=未检未作废,出库=已出库未送达)。
+ overdueOps := 0
+ nowUnix := time.Now().Unix()
+ for _, o := range inb {
+ if !o.Voided && (o.QualityStatus == "未检" || o.QualityStatus == "") && nowUnix-o.CreatedAt > 7200 {
+ overdueOps++
+ }
+ }
+ for _, o := range outb {
+ if o.Status == "已出库" && nowUnix-o.CreatedAt > 7200 {
+ overdueOps++
+ }
+ }
+ // 20 断料颜色预警:待备料/配送中叫料单等待分钟数(前端按 10/20 分黄红映射)
+ callWaits := []map[string]any{}
+ if ctx.Mes != nil {
+ if list, err := ctx.Mes.ListMaterialRequests(ctx0(), ""); err == nil {
+ for _, m := range list {
+ if m.Status != "PENDING" && m.Status != "SHIPPED" {
+ continue
+ }
+ waitMin := 0
+ if m.CreatedAt != "" {
+ if tt, e := time.Parse(time.RFC3339, m.CreatedAt); e == nil {
+ waitMin = int(time.Since(tt).Minutes())
+ }
+ }
+ mat := m.MaterialName
+ if mat == "" {
+ mat = m.MaterialCode
+ }
+ callWaits = append(callWaits, map[string]any{
+ "stationNo": m.StationNo, "material": mat, "waitMin": waitMin,
+ })
+ if len(callWaits) >= 20 {
+ break
+ }
+ }
+ }
+ }
+
ok(w, map[string]any{
"batchCount": batchCount,
"totalQty": totalQty,
@@ -191,7 +275,14 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
"pendingInbound": pendingInbound,
"pendingOutbound": pendingOutbound,
"movements": movements,
- "time": time.Now().Format("2006-01-02 15:04:05"),
+ // 管理屏数据(客户诉求 13/16/17/18/20)
+ "repairStock": repairStock,
+ "defectStock": defectStock,
+ "pendingReturn": pendingReturn,
+ "lowStocks": lowStocks,
+ "overdueOps": overdueOps,
+ "callWaits": callWaits,
+ "time": time.Now().Format("2006-01-02 15:04:05"),
})
}
}
@@ -303,18 +394,18 @@ func internalDisplayCallsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
if ctx.Mes != nil {
if list, err := ctx.Mes.ListMaterialRequests(r.Context(), ""); err == nil {
mesOk = true
- keep := map[string]string{
- "PENDING": "待备料",
- "SHIPPED": "配送中",
- "DONE": "已送达",
- }
- // 大屏分区:待备料/配送中归入「待出库」,已送达归入「已送达」。
- callGroup := func(st string) string {
- if st == "PENDING" || st == "SHIPPED" {
- return "pending"
+ keep := map[string]string{
+ "PENDING": "待备料",
+ "SHIPPED": "配送中",
+ "DONE": "已送达",
+ }
+ // 大屏分区:待备料/配送中归入「待出库」,已送达归入「已送达」。
+ callGroup := func(st string) string {
+ if st == "PENDING" || st == "SHIPPED" {
+ return "pending"
+ }
+ return "done"
}
- return "done"
- }
// 2026-11-05 叫料包拍板:同一叫料包(package_no)在大屏聚合为一行——
// 名称=首物料+“等N种”,数量=包内请求量合计;状态取包内最落后进度
//(PENDING > SHIPPED > DONE);无包号(存量单)逐单展示,兼容不变。
@@ -328,7 +419,7 @@ func internalDisplayCallsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
rankOf := map[string]int{"PENDING": 0, "SHIPPED": 1, "DONE": 2}
pkgs := map[string]*pkgAgg{}
- order := []string{} // 保持 MES 排序(created desc)
+ order := []string{} // 保持 MES 排序(created desc)
for _, m := range list { // MES 已按 created_at desc, id desc 排序(logic/call.go:743)
label, ok2 := keep[m.Status]
if !ok2 {
@@ -344,14 +435,14 @@ func internalDisplayCallsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
if mat == "" {
mat = m.MaterialCode
}
- if m.PackageNo == "" {
- calls = append(calls, map[string]any{
- "time": t, "stationNo": m.StationNo, "material": mat,
- "qty": m.ReqQty, "status": label, "statusKey": m.Status,
- "group": callGroup(m.Status),
- })
- continue
- }
+ if m.PackageNo == "" {
+ calls = append(calls, map[string]any{
+ "time": t, "stationNo": m.StationNo, "material": mat,
+ "qty": m.ReqQty, "status": label, "statusKey": m.Status,
+ "group": callGroup(m.Status),
+ })
+ continue
+ }
pg := pkgs[m.PackageNo]
if pg == nil {
pg = &pkgAgg{time: t, stationNo: m.StationNo, material: mat, rank: 0}
@@ -372,11 +463,11 @@ func internalDisplayCallsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
mat = fmt.Sprintf("%s 等%d种", mat, pg.kinds)
}
sk := statusKeys[pg.rank]
- calls = append(calls, map[string]any{
- "time": pg.time, "stationNo": pg.stationNo, "material": mat,
- "qty": pg.qty, "status": keep[sk], "statusKey": sk,
- "group": callGroup(sk),
- })
+ calls = append(calls, map[string]any{
+ "time": pg.time, "stationNo": pg.stationNo, "material": mat,
+ "qty": pg.qty, "status": keep[sk], "statusKey": sk,
+ "group": callGroup(sk),
+ })
if len(calls) >= 30 {
break
}
diff --git a/bj_power_wms/web/static/index.html b/bj_power_wms/web/static/index.html
index e713be9..e8a1907 100644
--- a/bj_power_wms/web/static/index.html
+++ b/bj_power_wms/web/static/index.html
@@ -6,7 +6,7 @@
WMS库房管理
-
+
diff --git a/bj_power_workstation/frontend/src/api/index.js b/bj_power_workstation/frontend/src/api/index.js
index d676495..34c7388 100644
--- a/bj_power_workstation/frontend/src/api/index.js
+++ b/bj_power_workstation/frontend/src/api/index.js
@@ -141,6 +141,9 @@ export const getBom = (params) => request.get('/api/bom', { params })
// 工单查询(选工单带出产品编码/名称):{orderNo}
export const queryOrder = (params) => request.get('/api/order/query', { params })
+// 扫 SN 秒认工单(上线建档只需扫 SN,自动带出工单/产品/归属只读信息):{sn}
+export const queryOrderBySn = (params) => request.get('/api/order/by-sn', { params })
+
// 工件追溯(下线完工扫SN展示状态/工艺时间线/拧紧):{sn}
export const getTrace = (params) => request.get('/api/trace', { params })
diff --git a/bj_power_workstation/frontend/src/views/Login.vue b/bj_power_workstation/frontend/src/views/Login.vue
index 1d5f5dc..48a66ad 100644
--- a/bj_power_workstation/frontend/src/views/Login.vue
+++ b/bj_power_workstation/frontend/src/views/Login.vue
@@ -30,7 +30,7 @@
工位 {{ fixedStation }}
-
+
diff --git a/bj_power_workstation/frontend/src/views/panels/InspectPanel.vue b/bj_power_workstation/frontend/src/views/panels/InspectPanel.vue
index df809e9..567e5ac 100644
--- a/bj_power_workstation/frontend/src/views/panels/InspectPanel.vue
+++ b/bj_power_workstation/frontend/src/views/panels/InspectPanel.vue
@@ -170,7 +170,7 @@
-
+
diff --git a/bj_power_workstation/frontend/src/views/panels/MaterialPanel.vue b/bj_power_workstation/frontend/src/views/panels/MaterialPanel.vue
index b797621..c73e95a 100644
--- a/bj_power_workstation/frontend/src/views/panels/MaterialPanel.vue
+++ b/bj_power_workstation/frontend/src/views/panels/MaterialPanel.vue
@@ -102,7 +102,7 @@
叫料日:
期望接驳台(可空):
-
+
@@ -220,7 +220,7 @@
title="物理拉回仓库,不是退料:物料账仍挂本工位、库存不变、托盘按空托盘处理(盘上有无料都不管)。下班走本功能即可不用退料,下一个人登录仍能看到这些物料。" />
-
+
diff --git a/bj_power_workstation/frontend/src/views/panels/OfflinePanel.vue b/bj_power_workstation/frontend/src/views/panels/OfflinePanel.vue
index d9ef5a3..e23b6b4 100644
--- a/bj_power_workstation/frontend/src/views/panels/OfflinePanel.vue
+++ b/bj_power_workstation/frontend/src/views/panels/OfflinePanel.vue
@@ -55,7 +55,7 @@