feat: 解耦管理类型与SN管理方式,新增sn_mode字段实现全链路SN管理标准化

本次重构将原manage_mode字段拆分为独立的分类维度(manage_mode)和SN管理维度(sn_mode),实现全链路(MES/WMS/工位终端)的SN管理行为统一依据:
1. 新增sn_mode字段,定义1=序列号件、2=批次件、0=未选择,替代原manage_mode的SN判断逻辑
2. 移除冗余的manage_mode字段在多个实体中的使用,统一使用sn_mode决定业务行为
3. 新增工位接驳台配置,服务端固定接驳台,前端不可修改,确保AGV送达准确性
4. 优化检验记录导出,新增装配物料绑定明细,满足客户追溯需求
5. 修正前端提示文本,统一使用序列号件/批次件表述,与后端逻辑对齐
This commit is contained in:
SunYF
2026-09-30 17:33:11 +08:00
parent 58f67240d7
commit c33acab9c8
136 changed files with 3730 additions and 1174 deletions
+126 -25
View File
@@ -2,20 +2,22 @@
<div>
<el-card>
<el-form inline>
<el-form-item label="工单号">
<el-form-item label="产品工号">
<el-input v-model="query.orderNo" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="产品编号">
<el-form-item label="图号">
<el-input v-model="query.productCode" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="产品名称">
<el-input v-model="query.productName" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="合同号">
<el-input v-model="query.contractNo" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
<el-form-item label="归属类型">
<el-select v-model="query.ownershipType" clearable placeholder="请选择" style="width:130px">
<el-option v-for="o in ownershipOptions" :key="o.v" :label="o.l" :value="o.v" />
</el-select>
</el-form-item>
<el-form-item label="工程编号">
<el-input v-model="query.projectNo" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
<el-form-item label="归属编号">
<el-input v-model="query.contractNo" placeholder="合同号/科技项目号 模糊查询" clearable style="width:170px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="完成日期">
<el-date-picker v-model="query.dueRange" type="daterange" value-format="YYYY-MM-DD"
@@ -34,12 +36,18 @@
<el-table :data="list" border stripe size="small">
<el-table-column prop="id" label="ID" width="55" />
<el-table-column prop="workOrderNo" label="工单号" min-width="140" />
<el-table-column prop="productCode" label="产品编号" min-width="120" />
<el-table-column prop="workOrderNo" label="产品工号" min-width="140" />
<el-table-column prop="productCode" label="图号" min-width="120" />
<el-table-column prop="productName" label="产品名称" min-width="120" />
<el-table-column prop="contractNo" label="合同号" min-width="110" show-overflow-tooltip />
<el-table-column prop="projectNo" label="工程编号" min-width="110" show-overflow-tooltip />
<el-table-column prop="productSerial" label="产品序号" min-width="110" show-overflow-tooltip />
<el-table-column label="归属类型" width="95">
<template #default="{ row }">{{ ownershipText(row.ownershipType) }}</template>
</el-table-column>
<el-table-column prop="contractNo" label="归属编号" min-width="110" show-overflow-tooltip>
<template #default="{ row }">{{ row.contractNo || '-' }}</template>
</el-table-column>
<el-table-column prop="productSerial" label="产品序号" min-width="100" show-overflow-tooltip>
<template #default="{ row }">{{ row.productSerial || '-' }}</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" width="70" />
<el-table-column prop="finishedNum" label="已完工" width="70" />
<el-table-column prop="status" label="状态" width="100">
@@ -57,8 +65,9 @@
<el-table-column label="开始时间" width="110">
<template #default="{ row }">{{ fmtDateOnly(row.planStart) }}</template>
</el-table-column>
<el-table-column label="操作" width="350" fixed="right">
<el-table-column label="操作" width="390" fixed="right">
<template #default="{ row }">
<el-button size="small" @click="openDetail(row)">详情</el-button>
<el-button size="small" @click="openUsage(row)">用料</el-button>
<el-tooltip v-if="can('produce.workorder:dailyplan') && !['DONE','CANCELLED'].includes(row.status)"
:disabled="hasCombination(row)" content="请先选择工艺组合" placement="top">
@@ -95,21 +104,28 @@
<!-- 新建/编辑工单 -->
<el-dialog v-model="dialog.show" :title="dialog.id ? '编辑工单' : '新建工单'" width="640px">
<el-form :model="dialog" label-width="90px">
<el-form-item label="工单号" required><el-input v-model="dialog.workOrderNo" /></el-form-item>
<el-form-item label="产品工号" required><el-input v-model="dialog.workOrderNo" /></el-form-item>
<el-form-item label="产品型号" required>
<el-select v-model="dialog.productTypeId" placeholder="---请选择---" style="width:100%" @change="onProductTypeChange">
<el-option v-for="p in productTypes" :key="p.id" :label="p.name + (p.code ? ' / ' + p.code : '')" :value="p.id" />
</el-select>
</el-form-item>
<el-form-item label="产品编号">
<el-form-item label="图号">
<el-input v-model="dialog.productCode" placeholder="随产品型号自动带出" :disabled="dialog.productTypeId > 0" />
</el-form-item>
<el-form-item label="产品名称">
<el-input v-model="dialog.productName" placeholder="随产品型号自动带出" :disabled="dialog.productTypeId > 0" />
</el-form-item>
<el-form-item label="合同号"><el-input v-model="dialog.contractNo" placeholder="一个合同对应一个工程编号" /></el-form-item>
<el-form-item label="工程编号"><el-input v-model="dialog.projectNo" placeholder="工程编号下挂各产品序号" /></el-form-item>
<el-form-item label="产品序号"><el-input v-model="dialog.productSerial" placeholder="本产品在该工程下的序号" /></el-form-item>
<el-form-item label="归属类型" required>
<el-select v-model="dialog.ownershipType" placeholder="请选择归属(合同号/科技项目号/其他)" style="width:100%">
<el-option v-for="o in ownershipOptions" :key="o.v" :label="o.l" :value="o.v" />
</el-select>
</el-form-item>
<el-form-item label="归属编号">
<el-input v-model="dialog.contractNo"
:placeholder="dialog.ownershipType === 'project' ? '科技项目号(必填)' : dialog.ownershipType === 'other' ? '选「其他」可不填' : '合同号(必填)'" />
</el-form-item>
<el-form-item label="产品序号"><el-input v-model="dialog.productSerial" placeholder="本工单内每台产品的序号" /></el-form-item>
<el-form-item label="数量" required><el-input-number v-model="dialog.quantity" :min="1" /></el-form-item>
<el-form-item label="完成日期" required>
<el-date-picker v-model="dialog.dueDate" type="date" value-format="YYYY-MM-DD"
@@ -217,7 +233,7 @@
<el-table-column prop="spec" label="规格" min-width="120" show-overflow-tooltip />
<el-table-column prop="unit" label="单位" width="70" align="center" />
<el-table-column label="管理方式" width="100" align="center">
<template #default="{ row }">{{ row.manageMode === '2' ? 'SN(电气件)' : '批次(结构件)' }}</template>
<template #default="{ row }">{{ row.snMode === 1 ? '序列号件' : '批次件' }}</template>
</el-table-column>
<el-table-column prop="unitQty" label="单台净用量" width="100" align="center" />
<el-table-column prop="lossRate" label="损耗率(%)" width="100" align="center" />
@@ -227,6 +243,42 @@
<el-button @click="usage.show = false">关闭</el-button>
</template>
</el-dialog>
<!-- 工单详情(只读):工单字段汇总 + 工件SN列表 -->
<el-drawer v-model="detail.show" :title="`工单详情 - ${detail.row ? detail.row.workOrderNo : ''}`" size="780px">
<template v-if="detail.row">
<el-descriptions :column="2" border size="small">
<el-descriptions-item label="产品工号">{{ detail.row.workOrderNo }}</el-descriptions-item>
<el-descriptions-item label="图号">{{ detail.row.productCode || '-' }}</el-descriptions-item>
<el-descriptions-item label="产品名称">{{ detail.row.productName || '-' }}</el-descriptions-item>
<el-descriptions-item label="数量">共 {{ detail.row.quantity }} 台(已完工 {{ detail.row.finishedNum }})</el-descriptions-item>
<el-descriptions-item label="归属">
{{ ownershipText(detail.row.ownershipType) }}{{ detail.row.contractNo ? ':' + detail.row.contractNo : '' }}
</el-descriptions-item>
<el-descriptions-item label="状态">{{ statusText(detail.row.status) }}</el-descriptions-item>
<el-descriptions-item label="产品序号">{{ detail.row.productSerial || '-' }}</el-descriptions-item>
<el-descriptions-item label="完成日期">{{ fmtDateOnly(detail.row.dueDate) }}</el-descriptions-item>
<el-descriptions-item label="开始时间">{{ fmtDateOnly(detail.row.planStart) }}</el-descriptions-item>
<el-descriptions-item label="创建人 / 创建日期">
{{ detail.row.createdBy || '-' }} / {{ fmtTime(detail.row.createdAt) }}
</el-descriptions-item>
</el-descriptions>
<div class="detail-subtitle">工件SN列表({{ detail.pieces.length }} 台)</div>
<el-table :data="detail.pieces" border size="small" v-loading="detail.loading" empty-text="该工单暂无工件进线记录">
<el-table-column type="index" label="产品序号" width="80" align="center" />
<el-table-column prop="sn" label="SN" min-width="160" show-overflow-tooltip />
<el-table-column label="类型" width="90" align="center">
<template #default>{{ snModeText(detail.snMode) }}</template>
</el-table-column>
<el-table-column label="状态" width="90" align="center">
<template #default="{ row }">{{ pieceStatusText(row.status) }}</template>
</el-table-column>
<el-table-column label="当前工位" width="90" align="center">
<template #default="{ row }">{{ stationText(row.currentStationNo) }}</template>
</el-table-column>
</el-table>
</template>
</el-drawer>
</div>
<PageHelp :data="helpWorkOrder" page="WorkOrder" />
</template>
@@ -247,6 +299,18 @@ const statusOptions = [
]
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || s
// 归属(一级编号):合同号/科技项目号 二选一,值域与 WMS inventories.ownership_type 一致
const ownershipOptions = [
{ v: 'workorder', l: '合同号' }, { v: 'project', l: '科技项目号' }, { v: 'other', l: '其他' }
]
const ownershipText = (t) => (ownershipOptions.find((o) => o.v === t) || {}).l || '-'
// 工件SN列表(详情抽屉):状态/当前工位/类型(sn_mode:1=序列号件 2=批次件,取自产品图号对应物料档案)
const pieceStatusMap = { ONLINE: '已上线', PROCESSING: '在制', DONE: '完工', REPAIR: '返修', SCRAPPED: '报废' }
const pieceStatusText = (s) => pieceStatusMap[s] || s
const stationText = (n) => (n > 0 ? '工位' + n : '-')
const snModeText = (m) => (m === 1 ? '序列号件' : m === 2 ? '批次件' : '-')
// 状态流转:给出当前状态可执行的下一个动作(按钮文案随当前状态变化)
function statusActionBtn(status) {
const map = {
@@ -267,7 +331,7 @@ function statusActions(status) {
return map[status] || []
}
const query = reactive({ orderNo: '', productCode: '', productName: '', contractNo: '', projectNo: '', status: '', dueRange: null })
const query = reactive({ orderNo: '', productCode: '', productName: '', contractNo: '', ownershipType: '', status: '', dueRange: null })
const list = ref([])
const productTypes = ref([])
@@ -337,13 +401,44 @@ async function openUsage(row) {
}
}
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED' })
// ---------- 工单详情(只读:字段汇总 + 工件SN列表) ----------
// 数据源:既有工件查询 API(GET /workpieces?orderNo=,按工单精确过滤);
// 类型列读物料档案 sn_mode(同工单同图号,按工单图号取一次,全行同值)。
const detail = reactive({ show: false, row: null, pieces: [], loading: false, snMode: 0 })
let materialsCache = null
async function materialSnModeOf(code) {
if (!code) return 0
if (!materialsCache) {
try {
materialsCache = (await request.get('/materials')) || []
} catch {
materialsCache = []
}
}
const m = materialsCache.find((x) => x.code === code)
return m ? (m.snMode || 0) : 0
}
async function openDetail(row) {
Object.assign(detail, { show: true, row, pieces: [], loading: true, snMode: 0 })
try {
const [pieces, snMode] = await Promise.all([
request.get('/workpieces', { params: { orderNo: row.workOrderNo } }).catch(() => []),
materialSnModeOf(row.productCode)
])
detail.pieces = pieces || []
detail.snMode = snMode
} finally {
detail.loading = false
}
}
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED' })
async function load() {
const [dueFrom, dueTo] = query.dueRange || []
const params = {
orderNo: query.orderNo, productCode: query.productCode, productName: query.productName,
contractNo: query.contractNo, projectNo: query.projectNo, status: query.status,
contractNo: query.contractNo, ownershipType: query.ownershipType, status: query.status,
dueFrom: dueFrom || '', dueTo: dueTo || ''
}
const data = await request.get('/work-orders', { params })
@@ -357,7 +452,7 @@ function genOrderNo() {
const ymd = `${d.getFullYear()}${String(d.getMonth() + 1).padStart(2, '0')}${String(d.getDate()).padStart(2, '0')}`
return `WO-${ymd}-001`
}
// Q1=A:选产品型号后自动带出产品编号/名称(只读,避免手填错位)
// Q1=A:选产品型号后自动带出图号/名称(只读,避免手填错位;图号=产品编码,同值)
function onProductTypeChange(id) {
const p = productTypes.value.find((x) => x.id === id)
if (p) {
@@ -369,20 +464,25 @@ function onProductTypeChange(id) {
}
}
function openCreate() {
Object.assign(dialog, { show: true, id: 0, workOrderNo: genOrderNo(), productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED' })
Object.assign(dialog, { show: true, id: 0, workOrderNo: genOrderNo(), productTypeId: 0, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED' })
selStations.value = defaultSelStations()
}
function openEdit(row) {
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, contractNo: row.contractNo || '', projectNo: row.projectNo || '', productSerial: row.productSerial || '', quantity: row.quantity, dueDate: row.dueDate ? String(row.dueDate).slice(0, 10) : '', planStart: row.planStart ? String(row.planStart).slice(0, 10) : '', status: row.status })
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, contractNo: row.contractNo || '', ownershipType: row.ownershipType || '', productSerial: row.productSerial || '', quantity: row.quantity, dueDate: row.dueDate ? String(row.dueDate).slice(0, 10) : '', planStart: row.planStart ? String(row.planStart).slice(0, 10) : '', status: row.status })
selStations.value = hasCombination(row)
? [...new Set(row.flowCombination.map((c) => c.stationNo))].sort((a, b) => a - b)
: defaultSelStations()
}
async function save() {
if (!dialog.dueDate) return ElMessage.warning('请选择完成日期(必填)')
// 归属(一级编号)二选一口径:类型必选;合同号/科技项目号必填编号,其他可空
if (!dialog.ownershipType) return ElMessage.warning('请选择归属类型(合同号/科技项目号/其他)')
if (dialog.ownershipType !== 'other' && !String(dialog.contractNo || '').trim()) {
return ElMessage.warning(dialog.ownershipType === 'project' ? '归属类型为科技项目号,请填写归属编号' : '归属类型为合同号,请填写归属编号')
}
// 建单不强制工艺组合(工单≠开工):排产/开工时由后端校验组合非空
if (!flowCombination.value.length) ElMessage.warning('未选择工艺组合:排产/开工前须配置')
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, contractNo: dialog.contractNo, projectNo: dialog.projectNo, productSerial: dialog.productSerial, quantity: dialog.quantity, dueDate: dialog.dueDate, planStart: dialog.planStart, flowCombination: flowCombination.value }
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, contractNo: dialog.contractNo, ownershipType: dialog.ownershipType, productSerial: dialog.productSerial, quantity: dialog.quantity, dueDate: dialog.dueDate, planStart: dialog.planStart, flowCombination: flowCombination.value }
if (dialog.id) await request.put('/work-orders', body)
else await request.post('/work-orders', body)
ElMessage.success('保存成功')
@@ -480,6 +580,7 @@ onMounted(async () => { load(); loadProducts(); loadComboData() })
<style scoped>
.sched-tip { font-size: 12px; color: #909399; margin-top: 4px; }
.detail-subtitle { font-size: 13px; font-weight: 600; color: #303133; margin: 14px 0 8px; }
.combo-group { display: flex; flex-wrap: wrap; gap: 4px 12px; align-items: flex-start; width: 100%; }
.combo-group-title { width: 100%; font-size: 12px; font-weight: 600; color: #303133; background: #f5f7fa; padding: 4px 8px; border-radius: 4px; margin-top: 4px; }
.combo-group-title.combo-empty { color: #909399; font-weight: 500; }