feat&refactor: 2026-09-22 半成品业务模型重构与功能完善
- 重构半成品流转逻辑:进度权威源改为 workpiece.currentStationNo,新增 completedText 快照字段,废除 doneProcessCodes - 清理物料品类中半成品类型,存量数据幂等清理,调整物料管理方式文案为批次/序列号 - 新增日排产状态专用更新接口,修复工单工艺校验逻辑 - 新增物料档案代理接口、深路径文件下载接口 - 优化前端界面文案与工位选择逻辑,补充追溯页半成品流转展示 - 调整WMS端物料品类校验与入库接口契约 - 新增/更新数据库表结构与实体类代码
This commit is contained in:
@@ -429,12 +429,12 @@ function openMatAttach(row) {
|
||||
Object.assign(attachDrawer, { visible: true, code: row.code, name: row.name })
|
||||
}
|
||||
|
||||
// 品类显示(1原材料/2半成品/3成品/4其他)
|
||||
// 品类显示(1原材料/3成品/4其他;半成品不是物料品类,防御性保留显示)
|
||||
function itemTypeText(t) {
|
||||
return t === 3 ? '成品' : t === 2 ? '半成品' : t === 4 ? '其他' : '原材料'
|
||||
return t === 3 ? '成品' : t === 4 ? '其他' : '原材料'
|
||||
}
|
||||
function itemTypeTagType(t) {
|
||||
return t === 3 ? 'success' : t === 2 ? 'warning' : t === 4 ? 'danger' : 'info'
|
||||
return t === 3 ? 'success' : t === 4 ? 'danger' : 'info'
|
||||
}
|
||||
|
||||
// 区域维护 / 物料档案共用同一组件:切换菜单时复用,watch(mode, immediate) 保证进入即加载
|
||||
@@ -867,15 +867,14 @@ 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>
|
||||
<el-form-item label="品类">
|
||||
<el-select v-model="matFilter.itemType" placeholder="全部" clearable style="width:120px" @change="searchMaterials">
|
||||
<el-option label="原材料" :value="1" />
|
||||
<el-option label="半成品" :value="2" />
|
||||
<el-option label="成品" :value="3" />
|
||||
<el-option label="其他" :value="4" />
|
||||
</el-select>
|
||||
@@ -892,7 +891,7 @@ async function onMaterialFile(e) {
|
||||
<el-button v-if="can('material:create')" type="success" @click="openMatCreate">新增物料</el-button>
|
||||
<el-button v-if="can('material:import')" type="warning" :loading="matImporting" @click="pickMaterialFile">导入</el-button>
|
||||
<el-button v-if="can('material:export')" :loading="matExporting" @click="exportMaterials">导出</el-button>
|
||||
<el-tooltip v-if="can('material:import')" content="Excel 首行表头按名称识别(列顺序可变、可含多余列):图号 | 名称 | 规格 | 单位 | 类型(结构件/电气件/其他) | 品类(原材料/半成品/成品/其他,可选) | 说明(除「说明」「品类」外均为必填)">
|
||||
<el-tooltip v-if="can('material:import')" content="Excel 首行表头按名称识别(列顺序可变、可含多余列):图号 | 名称 | 规格 | 单位 | 类型(结构件/电气件/其他) | 品类(原材料/成品/其他,可选;半成品不是物料品类) | 说明(除「说明」「品类」外均为必填)">
|
||||
<el-link type="info" :underline="false" style="margin-left:4px">导入说明</el-link>
|
||||
</el-tooltip>
|
||||
<input ref="matFileRef" type="file" accept=".xlsx,.xls" style="display:none" @change="onMaterialFile" />
|
||||
@@ -917,7 +916,7 @@ async function onMaterialFile(e) {
|
||||
<el-table-column label="类型" width="140" 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 ? '电气件(SN)' : '结构件(批次)') }}
|
||||
{{ row.manageMode === 3 ? '其他' : (row.manageMode === 2 ? '序列号' : '批次') }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -962,15 +961,14 @@ async function onMaterialFile(e) {
|
||||
<el-form-item label="品类" required>
|
||||
<el-select v-model="mForm.itemType" placeholder="请选择" style="width:100%">
|
||||
<el-option :value="1" label="原材料" />
|
||||
<el-option :value="2" label="半成品" />
|
||||
<el-option :value="3" label="成品" />
|
||||
<el-option :value="4" label="其他(辅料/工装/试验设备)" />
|
||||
</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="电气件(SN 管理)" />
|
||||
<el-option :value="1" label="批次" />
|
||||
<el-option :value="2" label="序列号" />
|
||||
<el-option :value="3" label="其他(辅料/工装/试验设备)" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
@@ -267,7 +267,7 @@ const inboundTypeLabel = (t) => {
|
||||
const m = { purchase: '采购入库', semi: '半成品入库', finished: '成品入库', return: '退库入库', other: '其他入库' }
|
||||
return m[t] || t || '-'
|
||||
}
|
||||
const pendingTargetLabel = (d) => (d.matManageMode === 3 ? '其他' : d.manageMode === 2 ? 'SN' : '批次')
|
||||
const pendingTargetLabel = (d) => (d.matManageMode === 3 ? '其他' : d.manageMode === 2 ? '序列号' : '批次')
|
||||
|
||||
function loadPending() {
|
||||
pendingLoading.value = true
|
||||
@@ -487,8 +487,8 @@ onMounted(() => {
|
||||
<!-- 目标类型:批次(结构件) / SN(电气件) / 其他(辅料·工装·试验设备) -->
|
||||
<el-form-item v-if="!isFinal" label="目标类型">
|
||||
<el-radio-group v-model="targetType" @change="onTargetTypeChange">
|
||||
<el-radio-button value="BATCH">批次 (结构件)</el-radio-button>
|
||||
<el-radio-button value="SN">序列号 SN (电气件)</el-radio-button>
|
||||
<el-radio-button value="BATCH">批次</el-radio-button>
|
||||
<el-radio-button value="SN">序列号</el-radio-button>
|
||||
<el-radio-button value="OTHER">其他 (辅料·工装·试验设备)</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
@@ -625,8 +625,8 @@ onMounted(() => {
|
||||
</el-form-item>
|
||||
<el-form-item label="目标类型">
|
||||
<el-select v-model="pendingFilters.targetType" placeholder="全部" clearable style="width:130px" @change="searchPending">
|
||||
<el-option label="结构件" value="BATCH" />
|
||||
<el-option label="电气件" value="SN" />
|
||||
<el-option label="批次" value="BATCH" />
|
||||
<el-option label="序列号" value="SN" />
|
||||
<el-option label="其他" value="OTHER" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
@@ -482,11 +482,11 @@ onMounted(loadDicts)
|
||||
<el-form-item label="出库类型">
|
||||
<template v-if="genForm.materialCode">
|
||||
<el-tag size="small" :type="pickedType === 'sn' ? 'warning' : 'info'">
|
||||
{{ pickedType === 'sn' ? '电气件(SN 管理)' : pickedType === 'other' ? '其他(按批次管理)' : '结构件(批次管理)' }}
|
||||
{{ pickedType === 'sn' ? '序列号' : pickedType === 'other' ? '其他(按批次管理)' : '批次' }}
|
||||
</el-tag>
|
||||
<span style="color:#909399;font-size:12px;margin-left:8px">类型由所选物料档案自动判定,无需手选</span>
|
||||
</template>
|
||||
<span v-else style="color:#909399;font-size:12px">请先选择物料,系统自动带出类型(电气件/结构件)</span>
|
||||
<span v-else style="color:#909399;font-size:12px">请先选择物料,系统自动带出类型(批次/序列号)</span>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="出库单号">
|
||||
|
||||
@@ -18,14 +18,15 @@ function openAttach(row) {
|
||||
}
|
||||
|
||||
/* ---------- 半成品入库(category=2) ----------
|
||||
* 成品由 MES 完工自动回流入库、经 WMS 完工检验,不在本页手工入库。 */
|
||||
* 成品由 MES 完工自动回流入库、经 WMS 完工检验,不在本页手工入库。
|
||||
* 「已完成至工位」是展示快照(completedText),WMS 原样存展示、不解析。 */
|
||||
|
||||
const operator = getRealName()
|
||||
const todayStr = new Date().toLocaleDateString('sv-SE')
|
||||
|
||||
function newInForm() {
|
||||
return {
|
||||
materialCode: '', zoneCode: '', orderNo: '', completedProcess: '',
|
||||
materialCode: '', zoneCode: '', orderNo: '', completedText: '',
|
||||
// 归属:与入库管理同口径——必选(无「无」选项),选其他可不填编号,工单号/科技项目号必填编号
|
||||
ownershipType: '', ownershipNo: '',
|
||||
productStatus: '', relatedStandard: '', testRecordNo: '',
|
||||
@@ -79,7 +80,7 @@ async function submitInbound(cat) {
|
||||
await request.post('/semi/inbound', {
|
||||
sn,
|
||||
materialCode: f.materialCode,
|
||||
completedProcess: f.completedProcess.trim(),
|
||||
completedText: f.completedText.trim(),
|
||||
zoneCode: f.zoneCode || undefined,
|
||||
orderNo: f.orderNo.trim() || undefined,
|
||||
operator,
|
||||
@@ -110,7 +111,7 @@ const outReasons = ['包装', '继续生产', '检验试验', '其他']
|
||||
const outForms = reactive({ 2: { sn: '', info: null, reason: '' } })
|
||||
const outbounding = reactive({ 2: false })
|
||||
|
||||
// 扫 SN 回车:带出该件信息(物料/已完成工序/工单/归属),再点原因按钮出库
|
||||
// 扫 SN 回车:带出该件信息(物料/已完成至工位/工单/归属),再点原因按钮出库
|
||||
async function scanSn(cat) {
|
||||
const f = outForms[cat]
|
||||
const sn = f.sn.trim()
|
||||
@@ -206,10 +207,10 @@ onMounted(() => {
|
||||
<el-tab-pane label="半成品入库">
|
||||
<el-form label-width="110px" style="max-width:680px">
|
||||
<el-form-item label="物料">
|
||||
<MaterialSelect v-model="inForms[2].materialCode" placeholder="选择物料(图号/名称搜索)" />
|
||||
<MaterialSelect v-model="inForms[2].materialCode" :item-type="3" placeholder="选择成品档案物料(图号/名称搜索)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="已完成工序">
|
||||
<el-input v-model="inForms[2].completedProcess" placeholder="如:1,3,5(可空)" clearable />
|
||||
<el-form-item label="已完成至工位">
|
||||
<el-input v-model="inForms[2].completedText" placeholder="如:工位5(可空=未报工)" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="工单号">
|
||||
<el-input v-model="inForms[2].orderNo" placeholder="来源工单号(可空)" clearable />
|
||||
@@ -275,7 +276,7 @@ onMounted(() => {
|
||||
</el-form>
|
||||
<el-alert v-if="outForms[2].info" type="info" :closable="false" style="max-width:680px;margin-bottom:12px">
|
||||
<div>图号:<b>{{ outForms[2].info.materialCode || '-' }}</b> 名称:{{ outForms[2].info.materialName || '-' }}</div>
|
||||
<div>已完成工序:{{ outForms[2].info.completedProcess || '-' }} 工单号:{{ outForms[2].info.orderNo || '-' }} 归属:{{ outForms[2].info.ownershipNo || '-' }}</div>
|
||||
<div>已完成至工位:{{ outForms[2].info.completedProcess || '-' }} 工单号:{{ outForms[2].info.orderNo || '-' }} 归属:{{ outForms[2].info.ownershipNo || '-' }}</div>
|
||||
</el-alert>
|
||||
<el-form label-width="110px" style="max-width:680px">
|
||||
<el-form-item label="出库原因">
|
||||
@@ -322,7 +323,7 @@ onMounted(() => {
|
||||
<el-table-column prop="materialName" label="名称" min-width="120">
|
||||
<template #default="{ row }">{{ row.materialName || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="completedProcess" label="已完成工序" min-width="100">
|
||||
<el-table-column prop="completedProcess" label="已完成至工位" min-width="100">
|
||||
<template #default="{ row }">{{ row.completedProcess || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="ownershipNo" label="归属单号" min-width="120">
|
||||
|
||||
Reference in New Issue
Block a user