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:
@@ -305,11 +305,16 @@ const matDialog = ref(false)
|
||||
const mEditingId = ref(0)
|
||||
const mForm = reactive({
|
||||
code: '', name: '', spec: '', unit: '',
|
||||
manageMode: 1, templateCode: '', description: '',
|
||||
manageMode: 1, snMode: 0, templateCode: '', description: '',
|
||||
itemType: 1, safetyStock: 0, isActive: true
|
||||
})
|
||||
const mSaving = ref(false)
|
||||
|
||||
// 类型默认联动(2026-09-30 类型与SN行为解耦):电气件→序列号件(1),结构件/其他→批次件(2);用户可手动改
|
||||
function onMatTypeChange() {
|
||||
mForm.snMode = Number(mForm.manageMode) === 2 ? 1 : 2
|
||||
}
|
||||
|
||||
async function loadMaterials() {
|
||||
materialLoading.value = true
|
||||
try {
|
||||
@@ -342,13 +347,14 @@ function resetMForm() {
|
||||
mEditingId.value = 0
|
||||
Object.assign(mForm, {
|
||||
code: '', name: '', spec: '', unit: '',
|
||||
manageMode: 1, templateCode: '', description: '',
|
||||
manageMode: 1, snMode: 0, templateCode: '', description: '',
|
||||
itemType: 1, safetyStock: 0, isActive: true
|
||||
})
|
||||
}
|
||||
|
||||
function openMatCreate() {
|
||||
resetMForm()
|
||||
onMatTypeChange() // 新增默认按类型联动带出序列号件/批次件
|
||||
matDialog.value = true
|
||||
}
|
||||
|
||||
@@ -357,6 +363,7 @@ function openMatEdit(row) {
|
||||
Object.assign(mForm, {
|
||||
code: row.code, name: row.name,
|
||||
spec: row.spec || '', unit: row.unit || '', manageMode: row.manageMode,
|
||||
snMode: Number(row.snMode) || 0,
|
||||
templateCode: row.templateCode || '',
|
||||
itemType: row.itemType || 1,
|
||||
safetyStock: row.safetyStock || 0,
|
||||
@@ -392,6 +399,11 @@ async function saveMaterial() {
|
||||
ElMessage.warning('类型为必填项')
|
||||
return
|
||||
}
|
||||
// 序列号件必选(2026-09-30 解耦定稿):0=未选择不可保存
|
||||
if (![1, 2].includes(Number(mForm.snMode))) {
|
||||
ElMessage.warning('请选择序列号件(序列号件 / 批次件)')
|
||||
return
|
||||
}
|
||||
const okSave = await confirmAction(
|
||||
mEditingId.value ? `确认保存物料「${mForm.code}」的修改?` : `确认新增物料「${String(mForm.code || '').trim()}」?保存后可继续上传图纸/附件。`,
|
||||
mEditingId.value ? '编辑确认' : '新增确认'
|
||||
@@ -399,15 +411,15 @@ async function saveMaterial() {
|
||||
if (!okSave) return
|
||||
mSaving.value = true
|
||||
try {
|
||||
// 类型(1结构件/2电气件/3其他)与品类相互独立,原样提交
|
||||
const manageMode = Number(mForm.manageMode)
|
||||
// 类型(1结构件/2电气件/3其他)与品类相互独立,原样提交;snMode(1序列号件/2批次件)独立提交
|
||||
const base = {
|
||||
name: String(mForm.name || '').trim(),
|
||||
spec: String(mForm.spec || '').trim(),
|
||||
unit: String(mForm.unit || '').trim(),
|
||||
description: mForm.description,
|
||||
itemType: Number(mForm.itemType),
|
||||
manageMode,
|
||||
manageMode: Number(mForm.manageMode),
|
||||
snMode: Number(mForm.snMode),
|
||||
safetyStock: Number(mForm.safetyStock) || 0,
|
||||
isActive: !!mForm.isActive
|
||||
}
|
||||
@@ -442,6 +454,16 @@ function itemTypeTagType(t) {
|
||||
return t === 3 ? 'success' : t === 4 ? 'danger' : 'info'
|
||||
}
|
||||
|
||||
// 类型显示(纯分类语境:1结构件/2电气件/3其他,2026-09-30 与SN行为解耦)
|
||||
function matTypeText(m) {
|
||||
if (m === 3) return '其他'
|
||||
return m === 2 ? '电气件' : '结构件'
|
||||
}
|
||||
// 序列号件显示(记账语境:1序列号件/2批次件/0未选择)
|
||||
function snModeText(v) {
|
||||
return Number(v) === 1 ? '序列号件' : Number(v) === 2 ? '批次件' : '未选择'
|
||||
}
|
||||
|
||||
// 区域维护 / 物料档案共用同一组件:切换菜单时复用,watch(mode, immediate) 保证进入即加载
|
||||
watch(
|
||||
() => props.mode,
|
||||
@@ -878,8 +900,8 @@ async function onMaterialFile(e) {
|
||||
</el-form-item>
|
||||
<el-form-item label="类型">
|
||||
<el-select v-model="matFilter.manageMode" placeholder="全部" clearable style="width:150px" @change="searchMaterials">
|
||||
<el-option label="结构件(批次)" :value="1" />
|
||||
<el-option label="电气件(SN)" :value="2" />
|
||||
<el-option label="结构件" :value="1" />
|
||||
<el-option label="电气件" :value="2" />
|
||||
<el-option label="其他" :value="3" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -924,10 +946,17 @@ async function onMaterialFile(e) {
|
||||
<el-tag :type="itemTypeTagType(row.itemType)" size="small">{{ itemTypeText(row.itemType) }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="类型" width="140" align="center">
|
||||
<el-table-column label="类型" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.manageMode === 3 ? 'info' : (row.manageMode === 2 ? 'warning' : 'primary')" size="small">
|
||||
{{ row.manageMode === 3 ? '其他' : (row.manageMode === 2 ? '序列号' : '批次') }}
|
||||
{{ matTypeText(row.manageMode) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="序列号件" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="Number(row.snMode) === 1 ? 'warning' : 'success'" size="small">
|
||||
{{ snModeText(row.snMode) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -977,12 +1006,19 @@ async function onMaterialFile(e) {
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型" required>
|
||||
<el-select v-model="mForm.manageMode" placeholder="请选择" style="width:100%">
|
||||
<el-option :value="1" label="批次" />
|
||||
<el-option :value="2" label="序列号" />
|
||||
<el-select v-model="mForm.manageMode" placeholder="请选择" style="width:100%" @change="onMatTypeChange">
|
||||
<el-option :value="1" label="结构件" />
|
||||
<el-option :value="2" label="电气件" />
|
||||
<el-option :value="3" label="其他(辅料/工装/试验设备)" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="序列号件" required>
|
||||
<el-select v-model="mForm.snMode" placeholder="请选择" style="width:100%">
|
||||
<el-option :value="1" label="序列号件(逐件录SN)" />
|
||||
<el-option :value="2" label="批次件(按数量,不录SN)" />
|
||||
</el-select>
|
||||
<span style="color:#909399;font-size:12px;margin-left:8px">选类型时自动带默认,可手动更改;未选择不可出入库</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="安全库存" required>
|
||||
<el-input-number v-model="mForm.safetyStock" :min="0" :step="1" step-strictly style="width:100%" />
|
||||
<span style="color:#909399;font-size:12px;margin-left:8px">低于该值触发缺货预警(0=不预警)</span>
|
||||
|
||||
Reference in New Issue
Block a user