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:
@@ -74,7 +74,8 @@ export const ackLineMove = (data) => request.post('/api/line/move/ack', data)
|
||||
// 点位人工记账:{pointNo, sn, orderNo, action: 'IN'|'OUT'}
|
||||
export const occupyLinePoint = (data) => request.post('/api/line/occupy', data)
|
||||
|
||||
// 工位叫料:{stationNo, dock, orderNo, items:[{materialCode, materialName, unit, manageMode, qty}]}
|
||||
// 工位叫料:{stationNo, orderNo, items:[{materialCode, materialName, unit, snMode, qty}]}
|
||||
// 接驳台不由前端传入:服务端按配置文件(Station.Dock)自动填充目标接驳台
|
||||
export const callLineMaterial = (data) => request.post('/api/line/call-material', data)
|
||||
|
||||
// 待接料列表(本工位):{stationNo, status, orderNo, planDate} → MES 备料单(待接料行)
|
||||
|
||||
@@ -84,7 +84,7 @@ export const helpPdf = {
|
||||
export const helpOnline = {
|
||||
title: '上线建档 使用说明',
|
||||
overview:
|
||||
'上线建档运行在产线进线口(工位号 0)。成品在此登记发号、按物料清单核对领料,建档上线后流转到第 1 道装配工位。\n\n标准流程:①选工单(带出产品与物料清单)→ ②按物料清单核对应领料 → ③扫描/生成工件 SN → ④点「确认建档上线」。\n\n数据链路:工单/物料清单(MES) → 建档上线(MES 生成在制工件,工位号 0) → 流转到装配工位。',
|
||||
'上线建档运行在产线进线口(工位号 0)。成品在此登记建档、按物料清单核对领料,建档上线后流转到第 1 道装配工位。\n\n标准流程:①选工单(带出产品、序列号件口径与物料清单)→ ②按物料清单核对应领料 → ③按口径录入工件 SN(序列号件扫来料SN / 批次件自动发号)→ ④点「确认建档上线」。\n\n数据链路:工单/物料清单/序列号件口径(MES) → 建档上线(MES 生成在制工件,工位号 0) → 流转到装配工位。',
|
||||
sections: [
|
||||
{
|
||||
title: '选工单与产品',
|
||||
@@ -104,9 +104,9 @@ export const helpOnline = {
|
||||
},
|
||||
{
|
||||
title: '工件 SN 与建档提交',
|
||||
overview: 'SN 是成品唯一编号,进线登记即系统发号,全程可追溯。',
|
||||
overview: 'SN 是成品唯一编号,按产品档案「序列号件」口径分流:序列号件须扫已在 WMS 入库登记的来料SN(不再自动发号);批次件提交后系统自动发号,全程可追溯。',
|
||||
fields: [
|
||||
{ name: '工件 SN', source: '扫码枪扫描 / 系统自动生成。', purpose: '唯一识别本台成品,拧紧/工艺/追溯都挂在此 SN 下', fill: '用扫码枪扫条码,或点「自动生成」由系统发号' },
|
||||
{ name: '工件 SN', source: '序列号件:扫码枪扫来料SN(需已在 WMS 入库登记);批次件:系统自动生成。', purpose: '唯一识别本台成品,拧紧/工艺/追溯都挂在此 SN 下', fill: '序列号件=扫描来料SN(必填,MES 校验其在 WMS 库存);批次件=无需手填,提交后系统自动发号' },
|
||||
{ name: '上线位在制品', source: 'MES 实时查询。工位号 0 的在制工件。', purpose: '看清已建档待流转的工件,防止重复建档', fill: '只读展示,点「刷新」更新' },
|
||||
{ name: '确认建档上线', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '正式建档上线,工件进入产线待第 1 工位加工', fill: '满足工单/SN/领料核对后点击并二次确认;MES 不可达时自动离线缓存重传' }
|
||||
]
|
||||
@@ -145,24 +145,24 @@ export const helpOffline = {
|
||||
export const helpMaterial = {
|
||||
title: '物料 / 叫料 使用说明',
|
||||
overview:
|
||||
'本页用于装配物料绑定与缺料叫料。电气件必须扫码 SN 绑定(一件一码可追溯),结构件按批次绑定;缺料时选本工位接驳台叫料,AGV 送达该接驳台。',
|
||||
'本页用于装配物料绑定与缺料叫料。序列号件必须扫码 SN 绑定(一件一码可追溯),批次件按批次绑定(口径=MES 物料档案「序列号件」);缺料时提交叫料,AGV 自动送达本工位固定接驳台(由工位终端配置文件设定)。',
|
||||
sections: [
|
||||
{
|
||||
title: '装配物料绑定',
|
||||
overview: '先在「作业」页扫描工件 SN,再按本工位应绑物料逐项扫码绑定。',
|
||||
fields: [
|
||||
{ name: '应绑物料', source: 'MES 物料清单。按产品与工位带出。', purpose: '列明本工位需绑定的物料及已绑/应绑数量', fill: '对照标签:电气件扫 SN、结构件扫批次号,回车或点「绑定」' },
|
||||
{ name: '应绑物料', source: 'MES 物料清单。按产品与工位带出。', purpose: '列明本工位需绑定的物料及已绑/应绑数量', fill: '对照标签:序列号件扫 SN、批次件扫批次号,回车或点「绑定」' },
|
||||
{ name: '已绑标签', source: 'MES 绑定记录。', purpose: '展示已绑定的 SN/批次,可点 × 撤销', fill: '绑错时点标签上的 × 撤销重绑' },
|
||||
{ name: '已绑齐/未绑齐', source: '系统统计。已绑数 / 应绑数。', purpose: '提示本工位物料是否齐套', fill: '未绑齐会红色提示缺料,需补齐后才能完工' }
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '叫料',
|
||||
overview: '选本工位接驳台,填写缺料明细提交,AGV 将物料送达接驳台。',
|
||||
overview: '填写缺料明细提交,AGV 将物料自动送达本工位固定接驳台(接驳台由配置文件设定,不可更改)。',
|
||||
fields: [
|
||||
{ name: '接驳台', source: '产线点位配置。本工位的 AGV 接驳点位。', purpose: '确定物料送达位置', fill: '下拉选本工位接驳台' },
|
||||
{ name: '本工位接驳台', source: '工位终端配置文件(etc yaml,Station.Dock)。', purpose: '确定物料送达位置', fill: '只读展示,不可选择;仅运维改配置并重启后生效' },
|
||||
{ name: '叫料明细', source: '手动录入 / 按缺料一键填充。', purpose: '列明需补的图号、名称、单位、数量', fill: '点「按缺料填充」自动生成,或「添加一行」手填' },
|
||||
{ name: '提交叫料', source: '按钮操作。数据上报到 MES/库管。', purpose: '发起补料请求,通知 AGV/库管送料', fill: '选接驳台 + 有效明细后点击提交' }
|
||||
{ name: '提交叫料', source: '按钮操作。数据上报到 MES/库管。', purpose: '发起补料请求,通知 AGV/库管送料', fill: '填写有效明细后点击提交' }
|
||||
]
|
||||
}
|
||||
]
|
||||
@@ -221,7 +221,7 @@ export const helpInspect = {
|
||||
fields: [
|
||||
{ name: '应急呼叫', source: '按钮操作。实时通知班长。', purpose: '设备故障/缺料/安全等紧急上报', fill: '填写说明后点「发送应急呼叫」' },
|
||||
{ name: '数量不符上报', source: '按钮操作。通知库管。', purpose: '应发与实收不一致时上报差异', fill: '填应发/实收数量,差异非 0 时可提交' },
|
||||
{ name: '工位退料', source: '按钮操作。待库管收货。', purpose: '多余物料退回库房', fill: '填图号/数量后提交,等库管确认收货' }
|
||||
{ name: '工位退料', source: '按钮操作。推送 WMS 库房收货。', purpose: '多余物料退回库房', fill: '填图号/数量后提交,推送 WMS 生成退库单,待库房收货入库' }
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@@ -21,6 +21,7 @@ import { getUser } from '../utils/request'
|
||||
|
||||
export const state = reactive({
|
||||
stationNo: 0,
|
||||
dock: '',
|
||||
orderNo: '',
|
||||
currentSn: '',
|
||||
task: null,
|
||||
@@ -51,6 +52,8 @@ export const orderNo = computed({
|
||||
set: (v) => { state.orderNo = v || '' }
|
||||
})
|
||||
export const stationNo = computed(() => state.stationNo)
|
||||
// 本工位固定接驳台(服务端 yaml 配置 Station.Dock,只读):叫料自动送达,工人不可选择
|
||||
export const stationDock = computed(() => state.dock)
|
||||
export const stepValues = computed(() => state.stepValues)
|
||||
export const stepChecks = computed(() => state.stepChecks)
|
||||
export const bindInputs = computed(() => state.bindInputs)
|
||||
@@ -202,6 +205,8 @@ export async function loadConfig() {
|
||||
const cfg = await getConfig()
|
||||
// 0=上线位、13=下线位为虚拟工位,需允许 stationNo=0(不能用 >0 否则上线位被当未配置)
|
||||
if (cfg && typeof cfg.stationNo === 'number' && cfg.stationNo >= 0) state.stationNo = cfg.stationNo
|
||||
// 本工位固定接驳台(服务端配置,只读展示用)
|
||||
if (cfg && typeof cfg.dock === 'string' && cfg.dock) state.dock = cfg.dock
|
||||
} catch { /* 静默 */ }
|
||||
}
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
<el-input v-model="done.remark" type="textarea" :rows="2" />
|
||||
</el-form-item>
|
||||
<el-alert v-if="!canReport" type="warning" :closable="false" title="本工位步骤未全部完成 / 物料未齐套,暂不能完工确认" />
|
||||
<el-button type="success" size="large" :disabled="!canReport" @click="submitDone">提交完工确认</el-button>
|
||||
<el-button type="success" size="large" :disabled="!canReport" @click="submitDone">确认该SN已完成生产</el-button>
|
||||
</el-form>
|
||||
</el-collapse-item>
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
<el-form-item label="原因">
|
||||
<el-input v-model="ret.reason" type="textarea" :rows="2" />
|
||||
</el-form-item>
|
||||
<el-button type="primary" size="large" :disabled="!ret.materialCode || ret.qty <= 0" @click="submitReturn">提交退料(待库管收货)</el-button>
|
||||
<el-button type="primary" size="large" :disabled="!ret.materialCode || ret.qty <= 0" @click="submitReturn">提交退料(推送 WMS 库房收货)</el-button>
|
||||
</el-form>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
@@ -154,7 +154,7 @@
|
||||
|
||||
<script setup>
|
||||
import { computed, ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import PhotoField from './PhotoField.vue'
|
||||
import { emergencyCall, qtyReport, returnMaterial, submitInspection } from '../../api'
|
||||
import { orderNo, sn as snState, stationNo, taskSteps, canReport } from '../../store/station'
|
||||
@@ -225,8 +225,19 @@ async function submitDone() {
|
||||
ElMessage.warning('本工位步骤未全部完成或物料未齐套,不能完工确认')
|
||||
return
|
||||
}
|
||||
const sn = done.value.sn || snState.value
|
||||
if (!sn) {
|
||||
ElMessage.warning('请先扫描或输入工件 SN')
|
||||
return
|
||||
}
|
||||
try {
|
||||
await submitInspection(base('DONE', { sn: done.value.sn || snState.value, photo: done.value.photo, remark: done.value.remark }))
|
||||
// 二次确认弹窗:客户要求文案「确认该SN已完成生产」
|
||||
await ElMessageBox.confirm(`确认该SN已完成生产?(SN:${sn})`, '完工确认', {
|
||||
type: 'warning', confirmButtonText: '确认完成', cancelButtonText: '取消'
|
||||
})
|
||||
} catch { return }
|
||||
try {
|
||||
await submitInspection(base('DONE', { sn, photo: done.value.photo, remark: done.value.remark }))
|
||||
ElMessage.success('完工确认已提交')
|
||||
done.value = { sn: '', photo: '', remark: '' }
|
||||
} catch (e) {}
|
||||
@@ -278,7 +289,7 @@ async function submitReturn() {
|
||||
unit: ret.value.unit,
|
||||
reason: ret.value.reason
|
||||
})
|
||||
ElMessage.success('退料已提交,待库管确认收货')
|
||||
ElMessage.success('已推送 WMS 库房,待收货入库')
|
||||
ret.value = { materialCode: '', materialName: '', spec: '', qty: 1, unit: '', sn: '', reason: '' }
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="mat-panel">
|
||||
<!-- ① 装配物料绑定(电气件必须扫码SN / 结构件扫批次) -->
|
||||
<!-- ① 装配物料绑定(序列号件必须扫码SN / 批次件扫批次) -->
|
||||
<section class="card">
|
||||
<div class="card-title">
|
||||
装配物料绑定
|
||||
@@ -20,8 +20,8 @@
|
||||
<div class="bind-meta">
|
||||
<span class="bind-name">{{ r.materialName || r.materialCode }}</span>
|
||||
<span class="bind-code">{{ r.materialCode }}</span>
|
||||
<el-tag size="small" :type="r.manageMode === '2' ? 'primary' : 'warning'">
|
||||
{{ r.manageMode === '2' ? '电气件·扫码SN' : '结构件·批次' }}
|
||||
<el-tag size="small" :type="r.snMode === 1 ? 'primary' : 'warning'">
|
||||
{{ r.snMode === 1 ? '序列号件·扫码SN' : '批次件·批次' }}
|
||||
</el-tag>
|
||||
<span class="bind-count" :class="r.complete ? 'ok' : 'ng'">{{ r.boundCount }}/{{ r.need }}</span>
|
||||
</div>
|
||||
@@ -39,7 +39,7 @@
|
||||
<el-input
|
||||
v-model.trim="bindInputs[r.materialCode]"
|
||||
size="large"
|
||||
:placeholder="r.manageMode === '2' ? '扫描电气件SN(必扫)' : '扫描/输入批次号'"
|
||||
:placeholder="r.snMode === 1 ? '扫描序列号件SN(必扫)' : '扫描/输入批次号'"
|
||||
clearable
|
||||
@keyup.enter="doBind(r)"
|
||||
/>
|
||||
@@ -48,14 +48,13 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- ② 叫料(选本工位接驳台,AGV 送达该接驳台) -->
|
||||
<!-- ② 叫料(AGV 送达本工位固定接驳台:接驳台由服务端配置文件设定,工人不可选) -->
|
||||
<section class="card">
|
||||
<div class="card-title">叫料(送到本工位接驳台)</div>
|
||||
<div class="call-row">
|
||||
<span class="lab">接驳台</span>
|
||||
<el-select v-model="dock" size="large" class="dock-el" placeholder="选择接驳台">
|
||||
<el-option v-for="d in myDocks" :key="d.pointNo" :label="d.label || d.pointNo" :value="d.pointNo" />
|
||||
</el-select>
|
||||
<span class="dock-readonly">
|
||||
本工位接驳台:<b>{{ stationDock || '未配置' }}</b>(由工位终端配置文件设定,不可更改)
|
||||
</span>
|
||||
<el-button size="large" @click="fillFromBind">按缺料填充</el-button>
|
||||
<el-button size="large" @click="addRow">添加一行</el-button>
|
||||
</div>
|
||||
@@ -150,11 +149,11 @@ import {
|
||||
bindInputs,
|
||||
flowId,
|
||||
loadBind,
|
||||
myDocks,
|
||||
operatorName,
|
||||
orderNo,
|
||||
sn,
|
||||
state,
|
||||
stationDock,
|
||||
stationNo
|
||||
} from '../../store/station'
|
||||
|
||||
@@ -162,7 +161,6 @@ const bindPanel = computed(() => state.bindPanel)
|
||||
const required = computed(() => (bindPanel.value?.required || []))
|
||||
const binding = ref(false)
|
||||
const calling = ref(false)
|
||||
const dock = ref('')
|
||||
const items = ref([])
|
||||
|
||||
// ③ 待接料
|
||||
@@ -222,7 +220,7 @@ onMounted(loadPending)
|
||||
|
||||
|
||||
function addRow() {
|
||||
items.value.push({ materialCode: '', materialName: '', unit: '个', manageMode: '1', qty: 1 })
|
||||
items.value.push({ materialCode: '', materialName: '', unit: '个', snMode: 2, qty: 1 })
|
||||
}
|
||||
|
||||
// 按绑定面板的缺料情况一键填充(数量 = 需求 - 已绑)
|
||||
@@ -233,7 +231,7 @@ function fillFromBind() {
|
||||
materialCode: r.materialCode,
|
||||
materialName: r.materialName || '',
|
||||
unit: r.unit || '个',
|
||||
manageMode: r.manageMode || '1',
|
||||
snMode: r.snMode === 1 ? 1 : 2,
|
||||
qty: Math.max(Number(r.need || 0) - Number(r.boundCount || 0), 1)
|
||||
}))
|
||||
if (!list.length) {
|
||||
@@ -246,7 +244,7 @@ function fillFromBind() {
|
||||
async function doBind(r) {
|
||||
const v = (bindInputs.value[r.materialCode] || '').trim()
|
||||
if (!v) {
|
||||
ElMessage.warning('请先扫描/输入' + (r.manageMode === '2' ? '电气件SN' : '批次号'))
|
||||
ElMessage.warning('请先扫描/输入' + (r.snMode === 1 ? '序列号件SN' : '批次号'))
|
||||
return
|
||||
}
|
||||
if (!sn.value) {
|
||||
@@ -283,10 +281,6 @@ async function removeBind(r, b) {
|
||||
}
|
||||
|
||||
async function doCall() {
|
||||
if (!dock.value) {
|
||||
ElMessage.warning('请选择接驳台')
|
||||
return
|
||||
}
|
||||
const list = items.value.filter((i) => i.materialCode && Number(i.qty) > 0)
|
||||
if (!list.length) {
|
||||
ElMessage.warning('请添加有效的叫料明细(图号 + 数量)')
|
||||
@@ -294,9 +288,9 @@ async function doCall() {
|
||||
}
|
||||
calling.value = true
|
||||
try {
|
||||
// 接驳台不再由用户选择/传入:服务端按工位配置文件自动填充目标接驳台
|
||||
const res = await callLineMaterial({
|
||||
stationNo: stationNo.value,
|
||||
dock: dock.value,
|
||||
orderNo: orderNo.value || '',
|
||||
operator: operatorName(),
|
||||
items: list
|
||||
@@ -372,6 +366,14 @@ async function doCall() {
|
||||
.call-row .lab {
|
||||
color: #909399;
|
||||
}
|
||||
.dock-readonly {
|
||||
color: #606266;
|
||||
font-size: 15px;
|
||||
}
|
||||
.dock-readonly b {
|
||||
color: #303133;
|
||||
font-size: 17px;
|
||||
}
|
||||
.dock-el {
|
||||
width: 260px;
|
||||
}
|
||||
|
||||
@@ -23,17 +23,17 @@
|
||||
v-model.trim="form.sn"
|
||||
size="large"
|
||||
class="grow"
|
||||
placeholder="扫描或输入工件 SN"
|
||||
:placeholder="snPlaceholder"
|
||||
clearable
|
||||
/>
|
||||
<el-button size="large" @click="genSn">自动生成</el-button>
|
||||
<el-button v-if="product.snMode === 2" size="large" @click="genSn">自动生成</el-button>
|
||||
</div>
|
||||
|
||||
<el-alert
|
||||
type="info"
|
||||
:type="product.snMode === 1 ? 'warning' : 'info'"
|
||||
:closable="false"
|
||||
show-icon
|
||||
title="SN 为成品唯一编号,进线登记即系统发号,全程可追溯;成品 SN 与工件 SN 一致。"
|
||||
:title="snTip"
|
||||
style="margin-top:6px"
|
||||
/>
|
||||
</section>
|
||||
@@ -61,8 +61,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="管理方式" width="130" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" :type="String(row.manageMode) === '2' ? 'primary' : 'warning'">
|
||||
{{ String(row.manageMode) === '2' ? '电气件' : '结构件' }}
|
||||
<el-tag size="small" :type="row.snMode === 1 ? 'primary' : 'warning'">
|
||||
{{ row.snMode === 1 ? '序列号件' : '批次件' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -115,12 +115,27 @@ import { getBom, onlineRegister, queryOrder } from '../../api'
|
||||
import { loadWip, operatorName, wip } from '../../store/station'
|
||||
|
||||
const form = reactive({ orderNo: '', sn: '', materialChecked: false })
|
||||
const product = reactive({ code: '', name: '', workOrderId: 0 })
|
||||
const product = reactive({ code: '', name: '', workOrderId: 0, snMode: 0 })
|
||||
const bomItems = ref([])
|
||||
const orders = ref([])
|
||||
const loadingOrder = ref(false)
|
||||
const submitting = ref(false)
|
||||
|
||||
// SN 口径按产品型号/物料档案 sn_mode 分流(2026-09-30 解耦定稿):
|
||||
// 1=序列号件:SN 输入必填,扫已在 WMS 入库登记的来料SN,工件 SN=来料SN(不自动发号);
|
||||
// 2=批次件:提交后系统自动发号(提交时若未填则本地自动生成);
|
||||
// 0=未选择:不可建档,提示先去产品型号/物料档案选择序列号件。
|
||||
const snPlaceholder = computed(() => {
|
||||
if (product.snMode === 1) return '请扫描来料SN(已在WMS入库登记)'
|
||||
if (product.snMode === 2) return '提交后系统自动发号'
|
||||
return '请先在产品型号/物料档案选择序列号件'
|
||||
})
|
||||
const snTip = computed(() => {
|
||||
if (product.snMode === 1) return '该产品为「序列号件」:请扫描来料SN(需已在 WMS 入库登记),建档后工件 SN = 来料SN,不再自动发号。'
|
||||
if (product.snMode === 2) return '该产品为「批次件」:提交后系统自动发号,全程可追溯;成品 SN 与工件 SN 一致。'
|
||||
return '该产品的序列号件未选择:请先在 MES 产品型号/物料档案选择「序列号件/批次件」,否则无法建档上线。'
|
||||
})
|
||||
|
||||
// 上线位在制品:in-process 接口 stationNo<=0 返回全部,此处按 currentStation===0 筛选上线位
|
||||
const onlineWip = computed(() => (wip.value || []).filter((r) => Number(r.currentStation) === 0))
|
||||
|
||||
@@ -137,11 +152,16 @@ const orderOptions = computed(() =>
|
||||
)
|
||||
|
||||
const canSubmit = computed(
|
||||
() => !!form.orderNo && !!form.sn && (!bomItems.value.length || form.materialChecked)
|
||||
() =>
|
||||
!!form.orderNo &&
|
||||
product.snMode !== 0 &&
|
||||
(product.snMode === 2 || !!form.sn) &&
|
||||
(!bomItems.value.length || form.materialChecked)
|
||||
)
|
||||
const blockTip = computed(() => {
|
||||
if (!form.orderNo) return '请先选择工单号'
|
||||
if (!form.sn) return '请扫描或生成工件 SN'
|
||||
if (product.snMode === 0) return '请先在产品型号/物料档案选择序列号件'
|
||||
if (product.snMode === 1 && !form.sn) return '请扫描来料SN(已在WMS入库登记)'
|
||||
if (bomItems.value.length && !form.materialChecked) return '请勾选「已按物料清单核对领料」'
|
||||
return ''
|
||||
})
|
||||
@@ -162,13 +182,15 @@ async function loadOrders() {
|
||||
loadingOrder.value = false
|
||||
}
|
||||
|
||||
// 选工单 → 带出产品编码/名称 → 查物料清单应领料
|
||||
// 选工单 → 带出产品编码/名称/序列号件口径 → 查物料清单应领料
|
||||
async function onOrderChange(orderNo) {
|
||||
product.code = ''
|
||||
product.name = ''
|
||||
product.workOrderId = 0
|
||||
product.snMode = 0
|
||||
bomItems.value = []
|
||||
form.materialChecked = false
|
||||
form.sn = ''
|
||||
if (!orderNo) return
|
||||
const opt = orderOptions.value.find((o) => o.value === orderNo)
|
||||
const wo = opt && opt.raw
|
||||
@@ -176,7 +198,10 @@ async function onOrderChange(orderNo) {
|
||||
product.code = wo.productCode || ''
|
||||
product.name = wo.productName || ''
|
||||
product.workOrderId = wo.id || 0
|
||||
product.snMode = Number(wo.productSnMode) || 0
|
||||
}
|
||||
// 批次件:进入即自动生成 SN(提交后系统发号口径),工人无需手填
|
||||
if (product.snMode === 2) genSn()
|
||||
if (product.code) {
|
||||
loadingOrder.value = true
|
||||
try {
|
||||
@@ -201,6 +226,8 @@ async function onSubmit() {
|
||||
ElMessage.warning(blockTip.value || '当前不满足建档条件')
|
||||
return
|
||||
}
|
||||
// 批次件:提交时兜底自动发号(序列号件必须扫来料SN,不自动生成)
|
||||
if (product.snMode === 2 && !form.sn) genSn()
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认建档上线?工件 ${form.sn} · 工单 ${form.orderNo}${product.name ? ' · 产品 ' + product.name : ''}`,
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<input
|
||||
ref="fileRef"
|
||||
type="file"
|
||||
accept="image/*"
|
||||
accept="image/*,.pdf"
|
||||
capture="environment"
|
||||
style="display: none"
|
||||
@change="onPick"
|
||||
|
||||
Reference in New Issue
Block a user