feat: 新增 AgvPoint 点位表及客户端,支持点位编码与接驳台绑定

This commit is contained in:
SunYF
2026-11-03 10:17:49 +08:00
parent fd2f0e2767
commit 2ccf9bb9ca
62 changed files with 5501 additions and 238 deletions
@@ -97,6 +97,21 @@ const detailVisible = ref(false)
function openDetail(row) { detailRow.value = row; detailVisible.value = true }
function doPrint() { window.print() }
// 出库作废(2026-11-03 断头路补全):仅通用/科技项目出库可作废,原因必填、留痕,库存按明细回滚
const voidVisible = ref(false)
const voidRow = ref(null)
const voidReason = ref('')
function openVoid(row) { voidRow.value = row; voidReason.value = ''; voidVisible.value = true }
async function doVoid() {
try {
const res = await request.post('/outbound/void', { outboundNo: voidRow.value.outboundNo, reason: voidReason.value.trim() })
ElMessage.success(`已作废并回滚库存:批次回加 ${res?.restoredQty || 0} 件、SN 恢复 ${res?.restoredSN || 0} 条`)
voidVisible.value = false
loadRecords()
} catch (e) { /* 拦截器已提示 */ }
}
const voidable = (row) => can('outbound:void') && !row.voided && (row.outboundType === 'general' || row.outboundType === 'project')
onMounted(loadRecords)
</script>
@@ -154,7 +169,8 @@ onMounted(loadRecords)
</el-table-column>
<el-table-column label="状态" width="90" align="center">
<template #default="{ row }">
<el-tag :type="row.status === '已送达' ? 'success' : 'info'" size="small">{{ row.status || '已出库' }}</el-tag>
<el-tag v-if="row.voided" type="danger" size="small">已作废</el-tag>
<el-tag v-else :type="row.status === '已送达' ? 'success' : 'info'" size="small">{{ row.status || '已出库' }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="orderNo" label="产品工号" min-width="130">
@@ -204,9 +220,10 @@ onMounted(loadRecords)
<el-table-column label="时间" width="150" align="center">
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center" fixed="right">
<el-table-column label="操作" width="130" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="primary" size="small" @click="openDetail(row)">详情</el-button>
<el-button v-if="voidable(row)" link type="danger" size="small" @click="openVoid(row)">作废</el-button>
</template>
</el-table-column>
</el-table>
@@ -238,6 +255,9 @@ onMounted(loadRecords)
<span v-if="borrowText(detailRow)" style="color:#e6a23c;font-weight:600">{{ borrowText(detailRow) }}</span>
<span v-else style="color:#909399">—(本工位自取,无借料)</span>
</el-descriptions-item>
<el-descriptions-item v-if="detailRow.voided" label="作废信息">
<span style="color:#f56c6c">已作废 | 原因:{{ detailRow.voidReason || '-' }} | 操作人:{{ detailRow.voidedBy || '-' }} | 时间:{{ fmtTime(detailRow.voidedAt) }}</span>
</el-descriptions-item>
</el-descriptions>
</div>
<template #footer>
@@ -245,6 +265,21 @@ onMounted(loadRecords)
<el-button type="primary" @click="doPrint">打印</el-button>
</template>
</el-dialog>
<!-- 出库作废弹窗:原因必填(留痕),库存按明细回滚 -->
<el-dialog v-model="voidVisible" title="作废出库单" width="440px" append-to-body>
<el-alert type="warning" :closable="false" style="margin-bottom:12px"
title="作废会按本单明细把库存原样回滚(SN 恢复在库、批次数量加回),单据保留显示「已作废」;仅通用/科技项目出库可作废,备料/补料出库请走退库冲正。" />
<div v-if="voidRow" style="margin-bottom:12px;color:#606266;font-size:13px">
{{ voidRow.outboundNo }} | {{ typeLabel(voidRow.outboundType) }} | {{ voidRow.materialCode }} × {{ voidRow.quantity }}
</div>
<el-input v-model="voidReason" type="textarea" :rows="3" maxlength="200" show-word-limit
placeholder="作废原因必填,写清楚为什么作废(如:物料选错 / 数量填错 / 批次扫错)" />
<template #footer>
<el-button @click="voidVisible = false">取消</el-button>
<el-button type="danger" :disabled="!voidReason.trim()" @click="doVoid">确认作废并回滚库存</el-button>
</template>
</el-dialog>
</template>
<style scoped>
+2 -1
View File
@@ -73,7 +73,7 @@ export const helpInbound = {
export const helpOutbound = {
title: '出库管理(统一主表 · 科技项目/通用拆分)',
overview:
'所有出库都落在同一张「出库主表」(OutboundOrder),用"类型"区分,装箱信息(箱号/SN清单/合同号)也直接记在主表上,不再单独建装箱表。\nB1/B2 逻辑拆分:出库按"单据类型"拆为两个独立入口——\n· 科技项目出库:归科技项目号的独立出库单据(强锁归属=科技项目号),与通用出库完全隔离;\n· 通用出库:不依赖工单的自由出库(退料/退货/样品/报废/发货/其他),归属可选 合同号/其他;\n· 全部出库记录:跨类型的统一查询与导出入口(含备料/补料/通用/科技项目),供审计对账。\n每个录入入口都自带「录入表单」与「该类型记录列表」;两入口底层共用同一套库存扣减逻辑,仅单据类型与归属不同。\n操作顺序(客户诉求 问题17/18/20):① 先选物料 → ② 系统自动判定序列号(sn_mode)→ ③ 选出库类别(纯标签;选「其他」时备注必填原因)→ ④ 通用出库填归属(合同号/其他,非其他时编号必填);科技项目出库直接填科技项目号(必填)→ ⑤ 序列号=否从可用批次选批次并填数量 / 序列号=是逐个扫 SN → ⑥ 选目标工位(下拉,来自 MES 工位列表,不可手输)。\n说明:出库单号由系统自动生成、不可修改;出库类别仅是标签记录,列表与出库单都显示。质量门禁:发货/样品/其他类出库仅允许「合格」品;退货/报废/退料类豁免(本身即处置不合格品)。',
'所有出库都落在同一张「出库主表」(OutboundOrder),用"类型"区分,装箱信息(箱号/SN清单/合同号)也直接记在主表上,不再单独建装箱表。\nB1/B2 逻辑拆分:出库按"单据类型"拆为两个独立入口——\n· 科技项目出库:归科技项目号的独立出库单据(强锁归属=科技项目号),与通用出库完全隔离;\n· 通用出库:不依赖工单的自由出库(退料/退货/样品/报废/发货/其他),归属可选 合同号/其他;\n· 全部出库记录:跨类型的统一查询与导出入口(含备料/补料/通用/科技项目),供审计对账。\n每个录入入口都自带「录入表单」与「该类型记录列表」;两入口底层共用同一套库存扣减逻辑,仅单据类型与归属不同。\n操作顺序(客户诉求 问题17/18/20):① 先选物料 → ② 系统自动判定序列号(sn_mode)→ ③ 选出库类别(纯标签;选「其他」时备注必填原因)→ ④ 通用出库填归属(合同号/其他,非其他时编号必填);科技项目出库直接填科技项目号(必填)→ ⑤ 序列号=否从可用批次选批次并填数量 / 序列号=是逐个扫 SN → ⑥ 选目标工位(下拉,来自 MES 工位列表,不可手输)。\n说明:出库单号由系统自动生成、不可修改;出库类别仅是标签记录,列表与出库单都显示。质量门禁:发货/样品/其他类出库仅允许「合格」品;退货/报废/退料类豁免(本身即处置不合格品)。\n出库作废(2026-11-03):通用出库/科技项目出库填错物料、批次、数量时,在记录列表点「作废」填原因(必填、留痕),系统按本单明细把库存原样回滚(SN 恢复在库、批次数量加回),单据保留显示「已作废」。备料出库/补料出库(与 MES 台账联动)不提供作废——错发走「退库确认」逆向冲正,两套纠错口径不混用。',
fields: [
{ name: '备料出库-产品工号', source: '下拉选择 + 模糊搜索。数据来自 MES 实时工单(未完成优先,无输入默认前 20 条)。', purpose: '出库挂靠的工单,决定可领料总量与需求缺口', fill: '下拉选产品工号(或输入关键字模糊搜索;MES 不可达时可手输兜底),选中即查询该工单的物料台账' },
{ name: '备料出库-目标工位', source: '下拉选择 DOCK01~DOCK20(选填,可过滤搜索)。', purpose: 'AGV 配送送达的接驳台(toDock 参数)', fill: '选择如 DOCK05;不选默认运到产线入口 DOCK01' },
@@ -91,6 +91,7 @@ export const helpOutbound = {
{ name: '出库方式(备料/补料/通用)', source: '系统按来源自动写入:备料=按日排产自动出库;补料=工位叫料或数量不符补发(优先发);通用=本页手工出库。', purpose: '区分出库来源,仓库先发补料', fill: '只读,可在"出库记录"按出库方式筛选' },
{ name: '出库状态(已出库/已送达)', source: '系统维护:出库即记「已出库」;叫 AGV 配送到位后自动转「已送达」。工位接料在 MES 备料单上确认,不在本表。', purpose: '跟踪料是否已送到接驳台', fill: '只读,可按状态筛选' },
{ name: '超领原因', source: '出库数量超过工单物料清单需求时必填(损耗/报废/返修)。', purpose: '超领不硬卡但必须留痕,可统计、可预警', fill: 'WMS/MES 出库时按提示填写原因后放行' },
{ name: '出库记录-作废', source: '记录列表行内「作废」按钮(权限 outbound:void),仅通用/科技项目出库且未作废的行显示。', purpose: '人工手工出库填错(物料/批次/数量/SN)时的纠错闭环,对齐入库作废', fill: '点「作废」→ 填原因(必填,留痕)→ 确认:SN 出库恢复在库(出库前锁定则恢复锁定)、批次按明细数量加回;单据保留显示「已作废」,详情弹窗可见作废原因/人/时间;该批次/SN 已被退库等后续处理时拒绝,防双重回冲' },
{ name: '出库记录-导出 CSV', source: '按钮操作。', purpose: '把统一主表当前筛选结果一次导出为 CSV(含库位/箱号/装箱SN)', fill: '点【导出 CSV】下载全部出库记录' }
]
}
@@ -108,6 +108,25 @@ function goAlertCenter() {
const topMenu = { path: '/', title: '工作台', icon: HomeFilled, code: 'dashboard:view' }
const menuGroups = [
{
title: '基础资料', icon: Goods, children: [
{ path: '/material', title: '物料档案', icon: Goods, code: 'material:view' },
{ path: '/zone', title: '区域维护', icon: Location, code: 'zone:view' }
]
},
{
title: '仓储作业', icon: Operation, children: [
{ path: '/inbound', title: '入库管理', icon: Download, code: 'inbound:view' },
{ path: '/finished-inbound', title: '成品入库', icon: Box, code: 'wms.finished:edit' },
{ path: '/inspection-incoming', title: '来料检验', icon: CircleCheck, code: 'inspection:view' },
{ path: '/project-outbound', title: '科技项目出库', icon: Upload, code: 'outbound:view' },
{ path: '/general-outbound', title: '通用出库', icon: Upload, code: 'outbound:view' },
{ path: '/outbound', title: '全部出库记录', icon: List, code: 'outbound:view' },
{ path: '/call-queue', title: '叫料队列', icon: Bell, code: 'call:view' },
{ path: '/return-order', title: '退库确认', icon: RefreshLeft, code: 'return:view' },
{ path: '/production-return', title: '生产退不良', icon: WarningFilled, code: 'prodreturn:manage' }
]
},
{
title: '库存管理', icon: Box, children: [
{ path: '/inventory', title: '库存查询', icon: Search, code: 'inventory:view' },
@@ -115,34 +134,15 @@ const menuGroups = [
{ path: '/semi', title: '半成品管理', icon: Box, code: 'semi:view' }
]
},
{
title: '仓储作业', icon: Operation, children: [
{ path: '/inbound', title: '入库管理', icon: Download, code: 'inbound:view' },
{ path: '/finished-inbound', title: '成品入库', icon: Box, code: 'wms.finished:edit' },
{ path: '/project-outbound', title: '科技项目出库', icon: Upload, code: 'outbound:view' },
{ path: '/general-outbound', title: '通用出库', icon: Upload, code: 'outbound:view' },
{ path: '/outbound', title: '全部出库记录', icon: List, code: 'outbound:view' },
{ path: '/call-queue', title: '叫料队列', icon: Bell, code: 'call:view' },
{ path: '/return-order', title: '退库确认', icon: RefreshLeft, code: 'return:view' },
{ path: '/production-return', title: '生产退不良', icon: WarningFilled, code: 'prodreturn:manage' },
{ path: '/inspection-incoming', title: '来料检验', icon: CircleCheck, code: 'inspection:view' }
]
},
{
title: '基础资料', icon: Goods, children: [
{ path: '/material', title: '物料档案', icon: Goods, code: 'material:view' },
{ path: '/zone', title: '区域维护', icon: Location, code: 'zone:view' }
]
},
{
title: '系统管理', icon: Key, children: [
{ path: '/users', title: '账号管理', icon: EditPen, code: 'user:manage' },
{ path: '/roles', title: '角色管理', icon: Key, code: 'role:manage' },
{ path: '/event-log', title: '操作日志', icon: Clock, code: 'eventlog:manage' },
{ path: '/attachment', title: '附件中心', icon: Folder, code: 'attachment:view' },
{ path: '/data-archive', title: '数据归档', icon: Tools, code: 'backup:manage' },
{ path: '/alert-center', title: '预警中心', icon: Bell },
{ path: '/alert-rule', title: '预警规则', icon: Bell },
{ path: '/attachment', title: '附件中心', icon: Folder, code: 'attachment:view' },
{ path: '/data-archive', title: '数据归档', icon: Tools, code: 'backup:manage' },
{ path: '/settings', title: '基础设置', icon: Setting, code: 'sys.settings:view' }
]
}
+53 -23
View File
@@ -9,22 +9,23 @@
<el-table-column prop="code" label="规则编码" width="200" />
<el-table-column prop="name" label="规则名称" min-width="180" />
<el-table-column label="启用" width="90" align="center">
<template #default="{row}">
<el-switch v-model="row.enabled" @change="saveRule(row)" />
</template>
<template #default="{row}"><el-tag :type="row.enabled ? 'success' : 'warning'">{{ row.enabled ? '启用' : '停用' }}</el-tag></template>
</el-table-column>
<el-table-column label="阈值" width="200">
<el-table-column label="阈值" width="160">
<template #default="{row}">
<el-input-number v-model="row.threshold" :min="0" :controls="false" style="width:120px" @change="saveRule(row)" />
<span class="unit">{{ thresholdUnit(row.code) }}</span>
<span v-if="row.threshold === 0 || row.threshold == null">未配置</span>
<span v-else>{{ row.threshold }}{{ thresholdUnit(row.code) }}</span>
</template>
</el-table-column>
<el-table-column label="说明" min-width="240">
<template #default="{row}">{{ ruleNote(row.code) }}</template>
</el-table-column>
<el-table-column label="备注" min-width="160">
<template #default="{row}">{{ row.remark || '-' }}</template>
</el-table-column>
<el-table-column label="操作" width="90" fixed="right" align="center">
<template #default="{row}">
<el-input v-model="row.remark" size="small" placeholder="可填写备注" @change="saveRule(row)" />
<el-button size="small" type="primary" link @click="openEdit(row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
@@ -32,6 +33,27 @@
说明:阈值仅对「来料检超期未检」(超期小时) 与「库龄超档」(超期天) 生效;其余规则阈值不参与判定。
</div>
</el-card>
<el-dialog v-model="dialogVisible" title="编辑预警规则" width="520px">
<el-form :model="form" label-width="110px">
<el-form-item label="规则名称"><el-input v-model="form.name" disabled /></el-form-item>
<el-form-item label="规则编码"><el-input :value="form.code" disabled /></el-form-item>
<el-form-item :label="'阈值' + (thresholdUnit(form.code) ? '(' + thresholdUnit(form.code) + ')' : '')">
<el-input v-model.number="form.threshold" type="number" placeholder="0 = 未配置(不触发)" />
<div style="color:#999;font-size:12px;margin-top:4px">{{ ruleNote(form.code) }}</div>
</el-form-item>
<el-form-item label="启用">
<el-switch v-model="form.enabled" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="可填写备注" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="saving" @click="saveRule">保存</el-button>
</template>
</el-dialog>
</div>
</template>
@@ -59,6 +81,9 @@ function thresholdUnit(code) {
const rules = ref([])
const rulesLoading = ref(false)
const dialogVisible = ref(false)
const saving = ref(false)
const form = ref({ code: '', name: '', threshold: 0, enabled: true, remark: '' })
async function loadRules() {
rulesLoading.value = true
@@ -71,22 +96,27 @@ async function loadRules() {
rulesLoading.value = false
}
}
let saveTimer = null
function saveRule(row) {
clearTimeout(saveTimer)
saveTimer = setTimeout(async () => {
try {
await request.post('/alert-rules/update', {
code: row.code,
enabled: row.enabled,
threshold: row.threshold,
remark: row.remark
})
ElMessage.success('规则已保存')
} catch (e) {
ElMessage.error(e?.message || '保存失败')
}
}, 300)
function openEdit(row) {
form.value = { code: row.code, name: row.name, threshold: row.threshold ?? 0, enabled: !!row.enabled, remark: row.remark || '' }
dialogVisible.value = true
}
async function saveRule() {
saving.value = true
try {
await request.post('/alert-rules/update', {
code: form.value.code,
enabled: form.value.enabled,
threshold: form.value.threshold ?? 0,
remark: form.value.remark
})
ElMessage.success('规则已保存')
dialogVisible.value = false
loadRules()
} catch (e) {
ElMessage.error(e?.message || '保存失败')
} finally {
saving.value = false
}
}
onMounted(loadRules)
+1 -1
View File
@@ -1128,7 +1128,7 @@ async function onMaterialFile(e) {
<el-tag v-else type="success" size="small">正常</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center" fixed="right">
<el-table-column label="操作" width="170" align="center" fixed="right">
<template #default="{ row }">
<el-button v-if="can('material:edit')" link type="primary" size="small" @click="openMatEdit(row)">编辑</el-button>
<el-button link type="primary" size="small" @click="openMatAttach(row)">附件</el-button>