feat: 重构入库流程,支持序列号与类型解耦,新增通用入库组件
- 重构物料档案字段:将"序列号件"改为"序列号",描述是否有序列号,与类型独立 - 调整入库页逻辑:按物料"序列号"决定记账方式,类型仅用于页签归属 - 新增通用入库组件 InboundEntry,复用三个类型页签的表单逻辑 - 优化成品入库页面,提交后自动切换到入库列表页签 - 修正物料校验提示文案,统一表述为"是否有序列号"
This commit is contained in:
@@ -489,7 +489,7 @@ export const helpWip = {
|
||||
export const helpAlertCenter = {
|
||||
title: '预警中心(系统自动触发)',
|
||||
overview:
|
||||
'预警中心汇集全系统自动产生的异常/提醒消息,人工无需配置规则——全部由内置触发源自动落库并推送。顶部铃铛角标显示未读数,点击进入本页处理。\n\n八类内置触发源:\n· 扭紧不合格(torque_ng):拧紧扭矩/角度超考核标准时自动告警;\n· 检验不合格(inspection_ng):质量检验判定 NG 时告警;\n· 备料未齐套(material_shortage):工单装机绑定物料未齐套时告警;\n· 库存偏低(inventory_low):可用量低于安全库存时告警;\n· 工单超时(task_overdue):工单超过完成日期未完工时告警;\n· 缓存位满(cache_full):产线缓存/接驳台占满时告警;\n· 数量不符(qty_diff):工位收料实收≠应发时告警(MES 仅预警,明细由 WMS 处理);\n· 应急呼叫(emergency_call):工位终端现场发起的紧急呼叫。\n\n应急呼叫闭环:操作工在工位终端点「应急呼叫」(设备故障/质量异常/缺料/安全等紧急情形)→ 系统即时落一条 type=emergency_call 的未读预警并通过 SSE 推到大屏/看板 → 线长、维修、仓库等相关人员在本页看到未读告警并到场处置 → 处置完点「标记已读」闭环。\n\n处理流程:按 状态(全部/未读/已读)、预警类型、开始时间(默认当天)、结束时间(默认不限)筛选并分页浏览,核实后点行末「标记已读」;已读记录留存备查。',
|
||||
'预警中心汇集全系统自动产生的异常/提醒消息,人工无需配置规则——全部由内置触发源自动落库并推送。顶部铃铛角标显示未读数,点击进入本页处理。\n\n八类内置触发源:\n· 扭紧不合格(torque_ng):拧紧扭矩/角度超考核标准时自动告警。触发点=拧紧枪完成拧紧后由工位终端自动上报拧紧结果时(拧紧采集落库后约15秒内自动上报;终端离线时缓存在终端、恢复后补报),不依赖操作工点「保存/完成报工」;\n· 检验不合格(inspection_ng):质量检验判定 NG 时告警;\n· 备料未齐套(material_shortage):工单装机绑定物料未齐套时告警;\n· 库存偏低(inventory_low):可用量低于安全库存时告警;\n· 工单超时(task_overdue):工单超过完成日期未完工时告警;\n· 缓存位满(cache_full):产线缓存/接驳台占满时告警;\n· 数量不符(qty_diff):工位收料实收≠应发时告警(MES 仅预警,明细由 WMS 处理);\n· 应急呼叫(emergency_call):工位终端现场发起的紧急呼叫。\n\n应急呼叫闭环:操作工在工位终端点「应急呼叫」(设备故障/质量异常/缺料/安全等紧急情形)→ 系统即时落一条 type=emergency_call 的未读预警并通过 SSE 推到大屏/看板 → 线长、维修、仓库等相关人员在本页看到未读告警并到场处置 → 处置完点「标记已读」闭环。\n\n处理流程:按 状态(全部/未读/已读)、预警类型、开始时间(默认当天)、结束时间(默认不限)筛选并分页浏览,核实后点行末「标记已读」;已读记录留存备查。',
|
||||
fields: [
|
||||
{ name: '状态', source: '系统维护(未读/已读)。', purpose: '区分待处理与已处理预警', fill: '筛选项单选:全部/未读/已读' },
|
||||
{ name: '预警类型', source: '内置触发源自动写入。', purpose: '只关注某一类异常', fill: '下拉选择八类之一,留空=全部' },
|
||||
|
||||
@@ -38,8 +38,9 @@
|
||||
<el-table-column label="创建时间" width="160" align="center">
|
||||
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="150" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="200" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="primary" size="small" @click="openDetail(row)">详情</el-button>
|
||||
<el-button v-if="can('sys.role:edit')" link type="primary" size="small"
|
||||
:disabled="row.code === 'SUPER_ADMIN'" @click="openEdit(row)">编辑权限</el-button>
|
||||
<el-button v-if="can('sys.role:delete')" link type="danger" size="small"
|
||||
@@ -77,6 +78,7 @@
|
||||
<el-button type="primary" :loading="saving" @click="save">保存</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<DetailDrawer :visible="detail.show" :title="detail.title" :fields="detail.fields" :data="detail.row" @update:visible="detail.show = $event" />
|
||||
</div>
|
||||
<PageHelp :data="helpRole" page="RoleManage" />
|
||||
</template>
|
||||
@@ -89,6 +91,7 @@ import request from '../utils/request'
|
||||
import { fmtTime } from '../utils/format'
|
||||
import { can } from '../utils/perm'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
import DetailDrawer from '../components/DetailDrawer.vue'
|
||||
import { helpRole } from '../help'
|
||||
|
||||
const loading = ref(false)
|
||||
@@ -96,6 +99,29 @@ const roles = ref([])
|
||||
const perms = ref([]) // 全部权限定义(MENU + BUTTON)
|
||||
const treeRef = ref()
|
||||
|
||||
/* ---------- 详情抽屉 ---------- */
|
||||
const detail = reactive({ show: false, title: '角色详情', fields: [], row: null })
|
||||
function openDetail(row) {
|
||||
detail.fields = [
|
||||
{ key: 'id', label: 'ID' },
|
||||
{ key: 'code', label: '角色编码' },
|
||||
{ key: 'name', label: '角色名称' },
|
||||
{ key: 'builtin', label: '内置角色' },
|
||||
{ key: 'permCount', label: '权限数' },
|
||||
{ key: 'perms', label: '权限明细' },
|
||||
{ key: 'remark', label: '备注' },
|
||||
{ key: 'createdAt', label: '创建时间', type: 'time' }
|
||||
]
|
||||
detail.row = {
|
||||
...row,
|
||||
builtin: ['SUPER_ADMIN', 'OPERATOR', 'INSPECTOR'].includes(row.code) ? '是' : '否',
|
||||
permCount: permCount(row),
|
||||
perms: permSummary(row),
|
||||
remark: row.remark || '-'
|
||||
}
|
||||
detail.show = true
|
||||
}
|
||||
|
||||
const codeName = computed(() => {
|
||||
const m = {}
|
||||
for (const p of perms.value) m[p.code] = p.name
|
||||
|
||||
@@ -27,12 +27,12 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="接驳台(实体)" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" :type="row.hasDock ? 'success' : 'info'">{{ row.hasDock ? '有' : '无' }}</el-tag>
|
||||
<el-tag size="small" :type="hasDockOf(row.stationNo) ? 'success' : 'info'">{{ hasDockOf(row.stationNo) ? '有' : '无' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="接驳台编码" min-width="150">
|
||||
<el-table-column label="接驳台编码" min-width="170">
|
||||
<template #default="{ row }">
|
||||
<span v-if="row.dockCode">{{ row.dockCode }}</span>
|
||||
<span v-if="dockCodesOf(row.stationNo)">{{ dockCodesOf(row.stationNo) }}</span>
|
||||
<span v-else style="color:#909399">未绑定</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -121,6 +121,26 @@ import { helpStation } from '../help'
|
||||
|
||||
const stations = ref([])
|
||||
const flows = ref([])
|
||||
// 接驳台主数据(真源在 dock 表):一工位可绑多个接驳台(R1/R2),展示按 dock.station_no 聚合
|
||||
const dockByStation = ref({})
|
||||
|
||||
async function loadDocks() {
|
||||
const data = await request.get('/docks', { params: { page: 1, size: 200 } })
|
||||
const map = {}
|
||||
for (const d of data?.list || []) {
|
||||
const no = Number(d.stationNo) || 0
|
||||
if (no <= 0) continue
|
||||
;(map[no] = map[no] || []).push(d.dockCode)
|
||||
}
|
||||
dockByStation.value = map
|
||||
}
|
||||
function dockCodesOf(no) {
|
||||
const codes = dockByStation.value[Number(no)] || []
|
||||
return codes.length ? codes.join(' / ') : ''
|
||||
}
|
||||
function hasDockOf(no) {
|
||||
return (dockByStation.value[Number(no)] || []).length > 0
|
||||
}
|
||||
|
||||
// 终端页签固定集合(与工位终端 Main.vue 页签一一对应)
|
||||
const TAB_OPTIONS = [
|
||||
@@ -217,7 +237,7 @@ async function remove(row) {
|
||||
// ---------- 工位派工已删除:路线由工单「工艺组合」决定,绑定关系即本页下拉选择 ----------
|
||||
|
||||
onMounted(async () => {
|
||||
await load()
|
||||
await Promise.all([load(), loadDocks()])
|
||||
flows.value = (await request.get('/process-flows', { params: { pageSize: 1000, page: 1 } }))?.list || []
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -175,7 +175,9 @@ function stepDisplay(step) {
|
||||
}
|
||||
|
||||
async function load() {
|
||||
stations.value = (await request.get('/stations')) || []
|
||||
const list = (await request.get('/stations')) || []
|
||||
// 虚拟工位作业只允许选择虚拟工位(0/13/14/15),过滤掉实体工位,防止误选
|
||||
stations.value = list.filter((s) => s.stationType === 'OFFLINE')
|
||||
}
|
||||
|
||||
async function loadTask() {
|
||||
|
||||
Reference in New Issue
Block a user