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:
@@ -187,11 +187,11 @@
|
||||
<el-table-column label="单位" width="80">
|
||||
<template #default="{ row }"><el-input v-model="row.unit" disabled /></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="管控方式" width="110">
|
||||
<el-table-column label="管理方式" width="110">
|
||||
<template #default="{ row }">
|
||||
<el-select v-model="row.manageMode" disabled>
|
||||
<el-option value="1" label="批次" />
|
||||
<el-option value="2" label="序列号" />
|
||||
<el-select v-model="row.snMode" disabled>
|
||||
<el-option :value="1" label="序列号件" />
|
||||
<el-option :value="2" label="批次件" />
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -214,7 +214,7 @@
|
||||
<div style="display:flex;gap:10px;margin-top:10px;align-items:center">
|
||||
<el-button v-if="!materialsUnavailable" size="small" @click="addMaterial">新增物料行</el-button>
|
||||
<el-button size="small" type="primary" :loading="matSaving" @click="saveMaterials">保存物料清单</el-button>
|
||||
<span style="color:#909399;font-size:12px">物料编号取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/管控方式自动带出、不可改;备料需求 = 各工位分产量 × 单台用量 ×(1+损耗率%)。</span>
|
||||
<span style="color:#909399;font-size:12px">物料编号取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/管理方式自动带出、不可改;备料需求 = 各工位分产量 × 单台用量 ×(1+损耗率%)。</span>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
@@ -387,7 +387,7 @@ const flowDlg = reactive({
|
||||
const matSaving = ref(false)
|
||||
|
||||
function blankMaterial() {
|
||||
return { materialCode: '', materialName: '', spec: '', unit: '', manageMode: '2', unitQty: 1, lossRate: 0 }
|
||||
return { materialCode: '', materialName: '', spec: '', unit: '', snMode: 2, unitQty: 1, lossRate: 0 }
|
||||
}
|
||||
|
||||
/* ---------- 物料档案(物料清单「物料编号」下拉数据源) ---------- */
|
||||
@@ -405,14 +405,14 @@ async function loadMaterialArchive() {
|
||||
if (!materialOptions.value.length) materialsUnavailable.value = true
|
||||
}
|
||||
|
||||
// 选中物料编号后,快照字段(名称/规格/单位/管控方式)自动带出,均不可手改
|
||||
// 选中物料编号后,快照字段(名称/规格/单位/管理方式)自动带出,均不可手改
|
||||
function onMaterialPicked(row, code) {
|
||||
const m = materialOptions.value.find((x) => x.code === code)
|
||||
if (!m) return
|
||||
row.materialName = m.name || ''
|
||||
row.spec = m.spec || ''
|
||||
row.unit = m.unit || ''
|
||||
if (m.manageMode != null && m.manageMode !== '') row.manageMode = String(m.manageMode)
|
||||
if (m.snMode === 1 || m.snMode === 2) row.snMode = m.snMode
|
||||
}
|
||||
|
||||
// 加载该工艺的物料清单(整表编辑,保存时整表覆盖)
|
||||
@@ -423,7 +423,7 @@ async function loadMaterials(flowId) {
|
||||
const list = (await request.get(`/process-flows/${flowId}/materials`)) || []
|
||||
flowDlg.materials = list.map((m) => ({
|
||||
materialCode: m.materialCode || '', materialName: m.materialName || '', spec: m.spec || '',
|
||||
unit: m.unit || '', manageMode: m.manageMode || '2', unitQty: m.unitQty ?? 1, lossRate: m.lossRate ?? 0
|
||||
unit: m.unit || '', snMode: m.snMode === 1 ? 1 : 2, unitQty: m.unitQty ?? 1, lossRate: m.lossRate ?? 0
|
||||
}))
|
||||
} catch { /* 拦截器已提示 */ }
|
||||
}
|
||||
@@ -441,7 +441,7 @@ async function saveMaterials() {
|
||||
materialCode: (m.materialCode || '').trim(),
|
||||
materialName: (m.materialName || '').trim(),
|
||||
spec: m.spec || '', unit: m.unit || '',
|
||||
manageMode: m.manageMode || '2',
|
||||
snMode: m.snMode === 1 ? 1 : 2,
|
||||
unitQty: Number(m.unitQty) || 0,
|
||||
lossRate: Number(m.lossRate) || 0
|
||||
}))
|
||||
|
||||
Reference in New Issue
Block a user