feat: 来料检处置项实体与复检、日排产达成对比、PLC/WMS 传输日志
- WMS 新增「检验处置项」实体(schema + ent 生成码),配套检验记录实体调整与复检接口,完善来料检/不良退货/入库检验前端 - MES 日排产:新增达成率统计与计划对比逻辑,调整日排产前端与流程卡/工序流 - 日志与传输:MES 新增 PLC 日志与 WMS 客户端传输日志,WMS 新增 MES 客户端传输日志 - MES 其他:扫码、工单/工件、AGV 客户端与告警、产品导入等逻辑完善及前端调整 - 工位终端:上线面板/作业面板、工件 handler 与 MES 客户端调整 - 配置与文档:更新 mes-api.yaml、三端构建产物与问题记录文档
This commit is contained in:
@@ -331,7 +331,7 @@ onMounted(() => loadZones())
|
||||
<div style="width:100%">
|
||||
<el-input v-model="form.productWorkNo" placeholder="手填(可空)" clearable style="width:260px"
|
||||
@blur="checkWorkNo" @clear="checkWorkNo" />
|
||||
<div v-if="workNoState === 'miss'" style="color:#f56c6c;font-size:12px;line-height:1.6">未找到对应的工单,请确认产品工号是否正确</div>
|
||||
<div v-if="workNoState === 'miss'" style="color:#f56c6c;font-size:12px;line-height:1.6">未在 MES 找到该产品工号对应的工单;产品工号可留空,不影响入库,如手填请核对是否与 MES 工单号一致</div>
|
||||
<div v-else-if="workNoState === 'net'" style="color:#f56c6c;font-size:12px;line-height:1.6">网络异常,未能校验工单号,请稍后确认</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
@@ -34,12 +34,12 @@ export const helpInspection = Q('来料检验', '判定一旦写下去就不能
|
||||
{ q: '判定之后还能改结论吗?', a: '不能。复检是新增一条记录覆盖判定,原记录保留可查。' },
|
||||
{ q: '「清空」会丢什么?', a: '会丢已经选好但还没送检的清单;切换入库单时也会清空已选。选好了就别中途切单。' },
|
||||
{ q: '一次能送多少?', a: '单次上限 100 条,多了分批送。待检明细的条数是动态生成的,按实际件数来。' },
|
||||
{ q: '部分入库到底怎么记?', a: '一次部分入库只能针对单批次。不合格的那部分会自动拆成带 -NG 后缀的待处置行,跟合格部分不是同一条账;要先想清楚「处置方式」再提交,不然不合格品会悬在那里没有去向。' }
|
||||
{ q: '不合格部分怎么处置?', a: '2026-11-16 起处置按明细行记:判「不合格」后逐行填退货 / 返修 / 报废并拆数量,多行数量合计必须等于不合格数;备注可空,退货的物流单号等信息填备注。提交时按行执行库存动作(退货→待退、返修→不合格隔离、报废→报废)。' }
|
||||
], ['判定合格/不合格会直接改变这批货能不能出库。'], [
|
||||
{ t: '功能定位', text: 'WMS 只做来料检验;过程检、完工检属于 MES,两边不要互相找记录。' },
|
||||
{ t: '必填与选填', items: [
|
||||
'必填 11 项:至少 1 条待检项;目标类型(批次 / SN / 其他);归属类型;归属编号(归属为合同号 / 科技项目时必填);每条待检编号;记录人;处置方式(有不合格时必填);退货运单号(处置=退货时必填);第几批 / 共几件(批次行、序列号=否,均 ≥1);合格数守恒(≤ 检验数,判合格时相等);部分入库限单批次。',
|
||||
'选填 5 项:检测单号、报检单号、生产厂家、相关标准、相关标准说明,表单里都标了「可空」。'
|
||||
'必填:至少 1 条待检项;目标类型(批次 / SN / 其他);归属类型;归属编号(归属为合同号 / 科技项目时必填);每条待检编号;记录人;处置明细行(有不合格时必填,退货 / 返修 / 报废按数量拆分,多行合计=不合格数);合格数守恒(≤ 检验数,判合格时相等)。',
|
||||
'选填:检测单号、报检单号、生产厂家、相关标准、相关标准说明、处置备注,表单里都标了「可空」;退货运单号概念已废除,物流信息填备注。'
|
||||
] },
|
||||
{ t: '异常场景', text: '检验结论还没录机、系统里查不到检测单号时不会报错,实物检验责任仍在库管;记录补进来之后会自动关联。' }
|
||||
], [
|
||||
|
||||
@@ -224,7 +224,7 @@ onMounted(() => {
|
||||
<el-alert type="warning" :closable="false" show-icon class="mb12">
|
||||
<template #title>
|
||||
<div style="font-size:12px;line-height:1.7">
|
||||
已出库/已消耗的物料,产线使用中发现不良 → 在此登记退回。<b>系统会重建隔离库存行(质量=不合格)</b>,随后到「库存查询→库位明细」按质量筛选「不合格」找到该行,走「在库处置」(退货/换修/报废)完成闭环。<br />
|
||||
已出库/已消耗的物料,产线使用中发现不良 → 在此登记退回。<b>系统会重建隔离库存行(质量=不合格)</b>,随后到「库存查询→库位明细」按质量筛选「不合格」找到该行,走「在库处置」(退货/返修/报废)完成闭环。<br />
|
||||
序列号=是(按 产品序号(SN) 记账)请逐行录入 产品序号(SN);序列号=否(按批次记账)可填批次号,留空系统自动生成。
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -36,8 +36,6 @@ const ownershipType = ref('other')
|
||||
const ownershipNo = ref('')
|
||||
const relatedStandard = ref('')
|
||||
const manufacturer = ref('')
|
||||
const disposalType = ref('NONE')
|
||||
const returnTrackingNo = ref('')
|
||||
|
||||
// 待检编号列表(逐个判定:每条独立结论/检验数/合格数)
|
||||
const items = ref([]) // { targetId, status, inspectQty, passQty, snMode, batchSeq, batchTotal }
|
||||
@@ -113,7 +111,7 @@ function addItem(targetId, qty, materialCode = '', materialName = '', inboundNo
|
||||
if (!targetId) return
|
||||
if (items.value.some((i) => i.targetId === targetId)) return
|
||||
const iq = Number(snMode) !== 1 ? (Number(qty) || 1) : 1
|
||||
items.value.push({ targetId, materialCode, materialName, inboundNo, snMode, status: '合格', inspectQty: iq, passQty: iq, batchSeq: null, batchTotal: null })
|
||||
items.value.push({ targetId, materialCode, materialName, inboundNo, snMode, status: '合格', inspectQty: iq, passQty: iq, disposals: [], batchSeq: null, batchTotal: null })
|
||||
}
|
||||
async function addFromInput() {
|
||||
if (sourceInboundNo.value) {
|
||||
@@ -163,7 +161,19 @@ function clearAll() {
|
||||
items.value = []
|
||||
sourceInboundNo.value = '' // 解除入库单绑定,回到自由录入模式
|
||||
}
|
||||
// 结论变化:SN/其他 自动定检验数=1、合格数随结论;批次合格时合格数=检验数
|
||||
// 结论变化:SN/其他 自动定检验数=1、合格数随结论;批次合格时合格数=检验数。
|
||||
// 2026-11-16 拍板:处置下放明细行——行判「不合格」时初始化一条处置明细(默认全量退货),
|
||||
// 可按数量拆分为退货/返修/报废多行;运单号概念废除,物流信息填备注。
|
||||
function rejectQtyOfRow(row) {
|
||||
return Math.max(0, (Number(row.inspectQty) || 0) - (Number(row.passQty) || 0))
|
||||
}
|
||||
function disposalSum(row) {
|
||||
return (row.disposals || []).reduce((s, d) => s + (Number(d.qty) || 0), 0)
|
||||
}
|
||||
function addDisposalLine(row) {
|
||||
if (!row.disposals) row.disposals = []
|
||||
row.disposals.push({ type: 'RETURN', qty: Math.max(1, rejectQtyOfRow(row) - disposalSum(row)), remark: '' })
|
||||
}
|
||||
function onItemStatus(row) {
|
||||
if (!isRowBatch(row)) {
|
||||
row.inspectQty = 1
|
||||
@@ -171,6 +181,13 @@ function onItemStatus(row) {
|
||||
} else if (row.status === '合格') {
|
||||
row.passQty = row.inspectQty
|
||||
}
|
||||
if (row.status === '不合格') {
|
||||
if (!row.disposals || !row.disposals.length) {
|
||||
row.disposals = [{ type: 'RETURN', qty: rejectQtyOfRow(row) || 1, remark: '' }]
|
||||
}
|
||||
} else {
|
||||
row.disposals = []
|
||||
}
|
||||
}
|
||||
function onTargetTypeChange() {
|
||||
clearAll()
|
||||
@@ -232,18 +249,24 @@ async function submitInspection() {
|
||||
ElMessage.warning('请填写记录人')
|
||||
return
|
||||
}
|
||||
const hasFail = items.value.some((i) => i.status === '不合格')
|
||||
if (hasFail && disposalType.value === 'NONE') {
|
||||
ElMessage.warning('有不合格项时必须选择处置方式(退货 / 换修 / 报废 / 部分入库)')
|
||||
return
|
||||
}
|
||||
if (hasFail && disposalType.value === 'RETURN' && !returnTrackingNo.value.trim()) {
|
||||
ElMessage.warning('退货处置必须填写货运单号')
|
||||
return
|
||||
}
|
||||
if (hasFail && disposalType.value === 'PARTIAL' && (items.value.length !== 1 || !isRowBatch(items[0]))) {
|
||||
ElMessage.warning('「部分入库」一次只能处理 1 个批次,请分开提交')
|
||||
return
|
||||
// 处置明细校验(2026-11-16 拍板):不合格行必须带处置明细,Σqty=不合格数,逐行数量>0;
|
||||
// 运单号概念废除,退货物流信息填备注(可空)
|
||||
for (const it of items.value) {
|
||||
if (it.status !== '不合格') continue
|
||||
if (!it.disposals || !it.disposals.length) {
|
||||
ElMessage.warning(`批次/SN「${it.targetId}」判定不合格,请至少填写一条处置明细(退货 / 返修 / 报废)`)
|
||||
return
|
||||
}
|
||||
const rq = rejectQtyOfRow(it)
|
||||
const sum = disposalSum(it)
|
||||
if (it.disposals.some((d) => (Number(d.qty) || 0) <= 0)) {
|
||||
ElMessage.warning(`批次/SN「${it.targetId}」处置明细行数量必须大于 0`)
|
||||
return
|
||||
}
|
||||
if (sum !== rq) {
|
||||
ElMessage.warning(`批次/SN「${it.targetId}」处置明细数量合计(${sum})必须等于不合格数量(${rq})`)
|
||||
return
|
||||
}
|
||||
}
|
||||
// 报检数守恒校验(批次:合格数 ≤ 检验数;合格时两者相等)
|
||||
for (const it of items.value) {
|
||||
@@ -265,9 +288,9 @@ async function submitInspection() {
|
||||
status: it.status,
|
||||
inspectQty: Number(it.inspectQty) || 0,
|
||||
passQty: Number(it.passQty) || 0,
|
||||
disposalType: it.status === '不合格' ? disposalType.value : 'NONE',
|
||||
returnTrackingNo: returnTrackingNo.value.trim(),
|
||||
disposalRemark: '',
|
||||
disposals: it.status === '不合格'
|
||||
? (it.disposals || []).map((d) => ({ type: d.type, qty: Number(d.qty) || 0, remark: (d.remark || '').trim() }))
|
||||
: [],
|
||||
ownershipType: ownershipType.value,
|
||||
ownershipNo: ownershipNo.value.trim(),
|
||||
relatedStandard: relatedStandard.value.trim(),
|
||||
@@ -286,17 +309,15 @@ async function submitInspection() {
|
||||
if (!allPass) {
|
||||
// 2026-11-14:文案统一取规则表第 19 条,菜单路径按对象域「物料 → 通用出库」。
|
||||
showNextStep(manualPayload(19, {
|
||||
title: `已登记 ${n} 条检验记录,不合格部分挂「待处置」`,
|
||||
title: `已登记 ${n} 条检验记录,不合格部分已按处置明细隔离`,
|
||||
primaryNo: passedNo || '',
|
||||
tip: '处置为退货时再去「物料 → 通用出库」按退货运单号出库;刷新本页后此提示消失。'
|
||||
tip: '退货明细的物料随后在「物料 → 通用出库」按批次出库退回供应商;刷新本页后此提示消失。'
|
||||
}))
|
||||
}
|
||||
clearAll()
|
||||
checkDesc.value = ''
|
||||
reportNo.value = ''
|
||||
inspectionNo.value = ''
|
||||
disposalType.value = 'NONE'
|
||||
returnTrackingNo.value = ''
|
||||
ownershipType.value = 'other'
|
||||
ownershipNo.value = ''
|
||||
relatedStandard.value = ''
|
||||
@@ -435,24 +456,20 @@ function sendSelectedFromDrawer() {
|
||||
}
|
||||
|
||||
/* ===================== 不合格处置 ===================== */
|
||||
const disposeDialog = reactive({ visible: false, row: null, type: 'RETURN', remark: '', trackingNo: '' })
|
||||
const disposeDialog = reactive({ visible: false, row: null, type: 'RETURN', remark: '' })
|
||||
function openDispose(row) {
|
||||
if (row.status !== '不合格') {
|
||||
ElMessage.warning('仅「不合格」记录可执行处置')
|
||||
return
|
||||
}
|
||||
Object.assign(disposeDialog, { visible: true, row, type: 'RETURN', remark: '', trackingNo: '' })
|
||||
Object.assign(disposeDialog, { visible: true, row, type: 'RETURN', remark: '' })
|
||||
}
|
||||
async function submitDispose() {
|
||||
if (disposeDialog.type === 'RETURN' && !disposeDialog.trackingNo.trim()) {
|
||||
ElMessage.warning('退货必须填写货运单号')
|
||||
return
|
||||
}
|
||||
await request.post('/inspection/dispose', {
|
||||
recordId: disposeDialog.row.id,
|
||||
disposalType: disposeDialog.type,
|
||||
disposalRemark: disposeDialog.remark.trim(),
|
||||
returnTrackingNo: disposeDialog.trackingNo.trim(),
|
||||
operator: getRealName(),
|
||||
})
|
||||
ElMessage.success('处置完成')
|
||||
disposeDialog.visible = false
|
||||
@@ -497,9 +514,14 @@ function targetTypeLabel(t) {
|
||||
return t === 'SN' ? '序列号' : t === 'BATCH' ? '批次' : t === 'OTHER' ? '其他' : (t || '-')
|
||||
}
|
||||
function disposalLabel(t) {
|
||||
const m = { RETURN: '退货', SCRAP: '报废', PARTIAL: '部分入库', REWORK: '换修' }
|
||||
const m = { RETURN: '退货', SCRAP: '报废', REWORK: '返修' }
|
||||
return m[t] || '未处置'
|
||||
}
|
||||
// 2026-11-16 拍板:处置明细子表行文本(后端 query/export 附加 disposalLines:"退货×5(备注);返修×5")
|
||||
function disposalLinesText(row) {
|
||||
if (!row || !row.disposalLines) return ''
|
||||
return String(row.disposalLines)
|
||||
}
|
||||
// 三维度之三:不合格品处置状态(独立于检验结论与数量拆分)
|
||||
function rejectQtyOf(row) {
|
||||
if (!row) return 0
|
||||
@@ -692,17 +714,6 @@ onMounted(() => {
|
||||
<el-radio-button value="OTHER">其他 (辅料·工装·试验设备)</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="处置方式" v-if="items.some(i=>i.status==='不合格')">
|
||||
<el-radio-group v-model="disposalType">
|
||||
<el-radio-button value="RETURN">退货</el-radio-button>
|
||||
<el-radio-button value="REWORK">换修</el-radio-button>
|
||||
<el-radio-button value="SCRAP">报废</el-radio-button>
|
||||
<el-radio-button v-if="targetType !== 'OTHER' && !items.every(i => Number(i.snMode) === 1)" value="PARTIAL">部分入库</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="disposalType==='RETURN' && items.some(i=>i.status==='不合格')" label="货运单号">
|
||||
<el-input v-model="returnTrackingNo" placeholder="退货运单号(必填)" clearable style="width:280px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="记录人">
|
||||
<el-input v-model="inspector" placeholder="记录人姓名" clearable style="width:260px" />
|
||||
</el-form-item>
|
||||
@@ -801,6 +812,30 @@ onMounted(() => {
|
||||
<el-table-column label="不合格数" width="100" align="center">
|
||||
<template #default="{ row }">{{ (Number(row.inspectQty)||0) - (Number(row.passQty)||0) }}</template>
|
||||
</el-table-column>
|
||||
<!-- 2026-11-16 拍板:处置下放明细行——按数量拆退货/返修/报废,Σqty=不合格数;备注可空(退货物流信息也填此处) -->
|
||||
<el-table-column label="处置明细" min-width="280">
|
||||
<template #default="{ row }">
|
||||
<div v-if="row.status === '不合格'" style="width:100%">
|
||||
<div v-for="(d, di) in row.disposals" :key="di" style="display:flex;gap:4px;margin-bottom:4px;align-items:center">
|
||||
<el-select v-model="d.type" size="small" style="width:86px">
|
||||
<el-option label="退货" value="RETURN" />
|
||||
<el-option label="返修" value="REWORK" />
|
||||
<el-option label="报废" value="SCRAP" />
|
||||
</el-select>
|
||||
<el-input-number v-model="d.qty" size="small" :min="1" :max="999999" controls-position="right" style="width:100px" />
|
||||
<el-input v-model="d.remark" size="small" placeholder="备注(可空)" style="flex:1;min-width:90px" />
|
||||
<el-button link type="danger" size="small" @click="row.disposals.splice(di, 1)">删</el-button>
|
||||
</div>
|
||||
<div style="display:flex;gap:8px;align-items:center">
|
||||
<el-button link type="primary" size="small" @click="addDisposalLine(row)">+ 添加处置行</el-button>
|
||||
<span v-if="disposalSum(row) !== rejectQtyOfRow(row)" style="color:#f56c6c;font-size:12px">
|
||||
已拆 {{ disposalSum(row) }}/{{ rejectQtyOfRow(row) }},需等于不合格数
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="90" align="center">
|
||||
<template #default="{ row, $index }">
|
||||
<el-button link type="danger" size="small" @click="removeAt($index)">移除</el-button>
|
||||
@@ -890,9 +925,9 @@ onMounted(() => {
|
||||
<el-tag :type="row.status === '合格' ? 'success' : row.status === '不合格' ? 'danger' : 'info'" size="small">{{ row.status || '未检' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="处置方式" width="100" align="center">
|
||||
<el-table-column label="处置明细" min-width="160">
|
||||
<template #default="{ row }">
|
||||
<span v-if="row.status === '不合格'">{{ disposalLabel(row.disposalType) }}</span>
|
||||
<span v-if="row.status === '不合格' && disposalLinesText(row)">{{ disposalLinesText(row) }}</span>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -946,8 +981,8 @@ onMounted(() => {
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="170" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button v-if="row.status === '不合格'" type="primary" size="small" @click="openDispose(row)">处置</el-button>
|
||||
<el-button v-if="row.status === '不合格' && row.disposalType && row.disposalType !== 'NONE'" link type="primary" size="small" @click="openResult(row)">处理结果</el-button>
|
||||
<el-button v-if="row.status === '不合格' && row.disposalStatus !== '已处置'" type="primary" size="small" @click="openDispose(row)">处置</el-button>
|
||||
<el-button v-if="row.status === '不合格' && disposalLinesText(row)" link type="primary" size="small" @click="openResult(row)">处理结果</el-button>
|
||||
<el-button link type="primary" size="small" @click="openAttach(row)">附件</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -1010,7 +1045,7 @@ onMounted(() => {
|
||||
</div>
|
||||
</el-drawer>
|
||||
|
||||
<!-- 不合格处置弹窗 -->
|
||||
<!-- 不合格处置弹窗(2026-11-16 拍板:运单号概念废除,备注统一非必填) -->
|
||||
<el-dialog v-model="disposeDialog.visible" title="不合格品处置" width="480px">
|
||||
<el-form label-width="96px">
|
||||
<el-form-item label="批次/产品序号(SN)">
|
||||
@@ -1024,7 +1059,7 @@ onMounted(() => {
|
||||
</el-form-item>
|
||||
<el-form-item label="不合格数量">
|
||||
<el-input :model-value="String(rejectQtyOf(disposeDialog.row))" disabled />
|
||||
<span class="tip">= 检验数 − 合格数;这部分不会进入合格库存,需在本弹窗完成处置</span>
|
||||
<span class="tip">= 检验数 − 合格数;这部分不会进入合格库存,本弹窗一次性完成处置</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="处置状态">
|
||||
<el-tag :type="disposalStatusTag(disposeDialog.row?.disposalStatus)" size="small">
|
||||
@@ -1034,16 +1069,14 @@ onMounted(() => {
|
||||
<el-form-item label="处置方式" required>
|
||||
<el-radio-group v-model="disposeDialog.type">
|
||||
<el-radio-button value="RETURN">退货</el-radio-button>
|
||||
<el-radio-button value="REWORK">换修</el-radio-button>
|
||||
<el-radio-button value="REWORK">返修</el-radio-button>
|
||||
<el-radio-button value="SCRAP">报废</el-radio-button>
|
||||
<el-radio-button v-if="disposeDialog.row && disposeDialog.row.targetType === 'BATCH'" value="PARTIAL">部分入库</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="disposeDialog.type === 'RETURN'" label="货运单号" required>
|
||||
<el-input v-model="disposeDialog.trackingNo" placeholder="退货运单号" clearable />
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="disposeDialog.remark" type="textarea" :rows="2" maxlength="255"
|
||||
placeholder="可空;退货的物流单号等信息填此处" />
|
||||
</el-form-item>
|
||||
<el-alert v-if="disposeDialog.type === 'PARTIAL'" type="info" :closable="false"
|
||||
title="部分入库:按「合格数」拆分批次,合格部分入库、差额部分隔离待处置。" />
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="disposeDialog.visible = false">取消</el-button>
|
||||
@@ -1052,15 +1085,19 @@ onMounted(() => {
|
||||
</el-dialog>
|
||||
|
||||
<!-- 处理结果/处理记录查看(条2:不合格处置后查看处置结果入口) -->
|
||||
<el-dialog v-model="resultDlg.show" title="处理结果" width="480px">
|
||||
<el-dialog v-model="resultDlg.show" title="处理结果" width="520px">
|
||||
<el-descriptions border :column="1" size="small" v-if="resultDlg.row">
|
||||
<el-descriptions-item label="批次/产品序号(SN)">{{ resultDlg.row.targetId }}</el-descriptions-item>
|
||||
<el-descriptions-item label="图号">{{ resultDlg.row.materialCode }}</el-descriptions-item>
|
||||
<el-descriptions-item label="处置方式">
|
||||
<el-tag size="small" type="warning">{{ disposalLabel(resultDlg.row.disposalType) }}</el-tag>
|
||||
<el-descriptions-item label="处置状态">
|
||||
<el-tag :type="disposalStatusTag(resultDlg.row.disposalStatus)" size="small">
|
||||
{{ disposalStatusLabel(resultDlg.row.disposalStatus) }}
|
||||
</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="处置明细">
|
||||
<span v-if="disposalLinesText(resultDlg.row)">{{ disposalLinesText(resultDlg.row) }}</span>
|
||||
<span v-else>-</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="退货运单号">{{ resultDlg.row.returnTrackingNo || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="处置备注">{{ resultDlg.row.disposalRemark || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="记录日期">{{ fmtTime(resultDlg.row.createdAt) }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<template #footer>
|
||||
|
||||
@@ -338,7 +338,8 @@ function gotoInbound(no) {
|
||||
}
|
||||
|
||||
// ---- 在库不合格处置(POST /inspection/inventory-dispose,inventoryId=库存行 id) ----
|
||||
const disposeDlg = reactive({ show: false, saving: false, id: 0, label: '', disposalType: '', returnTrackingNo: '', disposalRemark: '', qty: 0, quantity: 0, snMode: 0 })
|
||||
// 2026-11-16 拍板:运单号概念废除,退货物流信息填处置说明(可空)
|
||||
const disposeDlg = reactive({ show: false, saving: false, id: 0, label: '', disposalType: '', disposalRemark: '', qty: 0, quantity: 0, snMode: 0 })
|
||||
|
||||
// 序列号=否(按批次记账)且处置方式=退货/返修/报废时支持部分数量处置(序列号=是 单件,不显示)
|
||||
const showDisposeQty = computed(() => disposeDlg.snMode === 2 && ['RETURN', 'REWORK', 'SCRAP'].includes(disposeDlg.disposalType))
|
||||
@@ -347,16 +348,13 @@ function openDispose(row) {
|
||||
const label = `${detailId(row) || row.id} · ${row.materialCode || ''} ${row.materialName || ''}`
|
||||
Object.assign(disposeDlg, {
|
||||
show: true, saving: false, id: row.id, label,
|
||||
disposalType: '', returnTrackingNo: '', disposalRemark: '',
|
||||
disposalType: '', disposalRemark: '',
|
||||
snMode: row.snMode || 0, quantity: row.quantity || 0, qty: row.quantity || 0
|
||||
})
|
||||
}
|
||||
|
||||
async function submitDispose() {
|
||||
if (!disposeDlg.disposalType) return ElMessage.warning('请选择处置方式')
|
||||
if (disposeDlg.disposalType === 'RETURN' && !disposeDlg.returnTrackingNo.trim()) {
|
||||
return ElMessage.warning('退货处置必须填写退货运单号')
|
||||
}
|
||||
if (showDisposeQty.value && (!disposeDlg.qty || disposeDlg.qty < 1 || disposeDlg.qty > disposeDlg.quantity)) {
|
||||
return ElMessage.warning('处置数量须在 1 与行数量之间')
|
||||
}
|
||||
@@ -365,7 +363,6 @@ async function submitDispose() {
|
||||
await request.post('/inspection/inventory-dispose', {
|
||||
inventoryId: disposeDlg.id,
|
||||
disposalType: disposeDlg.disposalType,
|
||||
returnTrackingNo: disposeDlg.returnTrackingNo.trim(),
|
||||
disposalRemark: disposeDlg.disposalRemark,
|
||||
qty: showDisposeQty.value ? disposeDlg.qty : 0,
|
||||
operator: ''
|
||||
@@ -378,30 +375,26 @@ async function submitDispose() {
|
||||
}
|
||||
}
|
||||
|
||||
// ---- 复检(换修闭环):针对「在库 + 不合格」库存行重新判定,闭合换修 / 不合格处置后续 ----
|
||||
const reinspectDlg = reactive({ show: false, saving: false, id: 0, label: '', result: 'pass', disposalType: 'RETURN', returnTrackingNo: '', remark: '' })
|
||||
// ---- 复检(返修闭环):针对「在库 + 不合格」库存行重新判定,闭合返修 / 不合格处置后续 ----
|
||||
const reinspectDlg = reactive({ show: false, saving: false, id: 0, label: '', result: 'pass', disposalType: 'RETURN', remark: '' })
|
||||
|
||||
function openReinspect(row) {
|
||||
const label = `${detailId(row) || row.id} · ${row.materialCode || ''} ${row.materialName || ''}`
|
||||
Object.assign(reinspectDlg, {
|
||||
show: true, saving: false, id: row.id, label,
|
||||
result: 'pass', disposalType: 'RETURN', returnTrackingNo: '', remark: ''
|
||||
result: 'pass', disposalType: 'RETURN', remark: ''
|
||||
})
|
||||
}
|
||||
|
||||
async function submitReinspect() {
|
||||
if (!reinspectDlg.result) return ElMessage.warning('请选择复检结果')
|
||||
if (reinspectDlg.result === 'fail' && !reinspectDlg.disposalType) return ElMessage.warning('请选择不合格处置方式')
|
||||
if (reinspectDlg.result === 'fail' && reinspectDlg.disposalType === 'RETURN' && !reinspectDlg.returnTrackingNo.trim()) {
|
||||
return ElMessage.warning('退货处置必须填写退货运单号')
|
||||
}
|
||||
reinspectDlg.saving = true
|
||||
try {
|
||||
const res = await request.post('/inspection/reinspect', {
|
||||
inventoryId: reinspectDlg.id,
|
||||
result: reinspectDlg.result,
|
||||
disposalType: reinspectDlg.result === 'fail' ? reinspectDlg.disposalType : '',
|
||||
returnTrackingNo: reinspectDlg.returnTrackingNo.trim(),
|
||||
remark: reinspectDlg.remark,
|
||||
operator: ''
|
||||
})
|
||||
@@ -863,7 +856,7 @@ onMounted(() => {
|
||||
<el-table-column label="入库时间" width="155" align="center">
|
||||
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
|
||||
</el-table-column>
|
||||
<!-- 在库处置:仅「在库」行可发起(出库/锁定/报废行不可处置);不合格在库行可复检(换修闭环) -->
|
||||
<!-- 在库处置:仅「在库」行可发起(出库/锁定/报废行不可处置);不合格在库行可复检(返修闭环) -->
|
||||
<el-table-column label="操作" width="130" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<template v-if="row.status === '在库'">
|
||||
@@ -891,7 +884,7 @@ onMounted(() => {
|
||||
<el-form-item label="处置方式">
|
||||
<el-radio-group v-model="disposeDlg.disposalType">
|
||||
<el-radio value="RETURN">退货</el-radio>
|
||||
<el-radio value="REWORK">换修</el-radio>
|
||||
<el-radio value="REWORK">返修</el-radio>
|
||||
<el-radio value="SCRAP">报废</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
@@ -906,10 +899,11 @@ onMounted(() => {
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="disposeDlg.disposalType === 'RETURN'" label="退货运单号" required>
|
||||
<el-input v-model="disposeDlg.returnTrackingNo" placeholder="退货处置必填" />
|
||||
<el-form-item v-if="disposeDlg.disposalType === 'RETURN'" label="处置说明">
|
||||
<el-input v-model="disposeDlg.disposalRemark" type="textarea" :rows="2" maxlength="255"
|
||||
placeholder="可空;退货的物流单号等信息填此处" />
|
||||
</el-form-item>
|
||||
<el-form-item label="处置说明">
|
||||
<el-form-item v-else label="处置说明">
|
||||
<el-input v-model="disposeDlg.disposalRemark" type="textarea" :rows="3" placeholder="处置说明(可空)" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -919,8 +913,8 @@ onMounted(() => {
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 复检弹窗(换修 / 隔离不合格品修复后重新判定,闭合换修回路) -->
|
||||
<el-dialog v-model="reinspectDlg.show" title="复检(换修闭环)" width="480px">
|
||||
<!-- 复检弹窗(返修 / 隔离不合格品修复后重新判定,闭合返修回路) -->
|
||||
<el-dialog v-model="reinspectDlg.show" title="复检(返修闭环)" width="480px">
|
||||
<el-form :model="reinspectDlg" label-width="100px">
|
||||
<el-form-item label="库存行">
|
||||
<el-input :model-value="reinspectDlg.label" disabled />
|
||||
@@ -938,12 +932,10 @@ onMounted(() => {
|
||||
<el-radio value="SCRAP">报废</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="reinspectDlg.disposalType === 'RETURN'" label="退货运单号" required>
|
||||
<el-input v-model="reinspectDlg.returnTrackingNo" placeholder="退货处置必填" />
|
||||
</el-form-item>
|
||||
</template>
|
||||
<el-form-item label="复检说明">
|
||||
<el-input v-model="reinspectDlg.remark" type="textarea" :rows="3" placeholder="复检说明(可空)" />
|
||||
<el-input v-model="reinspectDlg.remark" type="textarea" :rows="3" maxlength="255"
|
||||
placeholder="可空;退货的物流单号等信息填此处" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
|
||||
@@ -22,7 +22,7 @@ export const NEXT_STEP_RULES = [
|
||||
no: 19, scene: '入库作业 → 来料检验', action: '检验判定提交', method: 'POST', api: '/inspection/batch-flip',
|
||||
kind: '单据', cross: false, manual: true, next: '入库作业 → 来料检验(不合格品处置)',
|
||||
title: '已登记检验记录',
|
||||
text: '下一步:本页「不合格品处置」对不合格部分选退货 / 换修 / 返修 / 报废;合格部分才进合格库存。',
|
||||
text: '下一步:本页按处置明细行对不合格部分拆退货 / 返修 / 报废(多行合计=不合格数);合格部分才进合格库存。',
|
||||
tip: '本条由页面按合格/不合格分支生成文案,不走自动触发;刷新页面后此提示消失。',
|
||||
noField: '', noFrom: 'resp'
|
||||
},
|
||||
@@ -30,7 +30,7 @@ export const NEXT_STEP_RULES = [
|
||||
no: 20, scene: '入库作业 → 来料检验', action: '不合格品处置', method: 'POST', api: '/inspection/dispose',
|
||||
kind: '单据', cross: false, manual: false, next: '入库作业 → 来料入库',
|
||||
title: '不合格品已处置',
|
||||
text: '下一步:处置为退货时到「出库与配送 → 通用出库」按退货运单号出库;合格部分到「入库作业 → 来料入库」办理入库。',
|
||||
text: '下一步:处置为退货的物料到「出库与配送 → 通用出库」按批次办理退供应商出库;合格部分到「入库作业 → 来料入库」办理入库。',
|
||||
tip: '不合格部分不会进入合格库存;刷新页面后此提示消失。',
|
||||
noField: '', noFrom: 'resp'
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user