feat: 两库对等物料管理及产品工号贯通全流程
- 新增 MES 本地物料表及双向同步接口,WMS 物料变更自动同步 - 全流程新增产品工号字段,贯通入库/库存/出库/检验环节 - 工单管理支持多工单混产,移除单工单互斥限制 - 新增批次号/SN 字段支持质量检验联动 WMS 库存处置 - 修复权限规则,仅内置管理员账号不允许修改删除 - 工位终端新增 SN 扫码自动切换所属工单功能
This commit is contained in:
@@ -252,6 +252,7 @@ const layerBatchForm = reactive({ zoneCode: '', shelfNo: '', layerStart: 1, laye
|
||||
const layerBatchPreview = ref([])
|
||||
const layerBatchPreviewing = ref(false)
|
||||
const layerBatchSubmitting = ref(false)
|
||||
const editLayerKey = ref('') // 当前点击编辑层名称的层号(点击层名称变输入框,回车/失焦保存到预览行)
|
||||
|
||||
function openLayerBatchGen() {
|
||||
Object.assign(layerBatchForm, { zoneCode: '', shelfNo: '', layerStart: 1, layerEnd: 1 })
|
||||
@@ -277,7 +278,11 @@ async function submitLayerBatch() {
|
||||
if (!go) return
|
||||
layerBatchSubmitting.value = true
|
||||
try {
|
||||
const data = await request.post('/zone/batch-generate', { ...layerBatchForm, level: 3, preview: false })
|
||||
const data = await request.post('/zone/batch-generate', {
|
||||
...layerBatchForm, level: 3, preview: false,
|
||||
// 提交时带上预览表里(可能被手改过的)层名称,后端优先采用
|
||||
layers: layerBatchPreview.value.map((x) => ({ layerNo: x.layerNo, layerName: x.layerName }))
|
||||
})
|
||||
ElMessage.success(`已生成 ${data?.created || 0} 个层,跳过已存在 ${data?.skipped || 0} 个`)
|
||||
layerBatchDialog.value = false
|
||||
zoneTabLoaded[3] = false
|
||||
@@ -839,13 +844,19 @@ async function onMaterialFile(e) {
|
||||
</el-form>
|
||||
<el-table v-if="layerBatchPreview.length" :data="layerBatchPreview" border size="small" max-height="300">
|
||||
<el-table-column prop="layerNo" label="层号" width="90" align="center" />
|
||||
<el-table-column prop="layerName" label="层名称" min-width="200" />
|
||||
<el-table-column label="层名称" min-width="200">
|
||||
<template #default="{ row }">
|
||||
<el-input v-if="editLayerKey === row.layerNo" v-model="row.layerName" size="small" maxlength="50"
|
||||
@keyup.enter="editLayerKey = ''" @blur="editLayerKey = ''" />
|
||||
<span v-else style="cursor:pointer" title="点击修改层名称" @click="editLayerKey = row.layerNo">{{ row.layerName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否已存在" width="110" align="center">
|
||||
<template #default="{ row }"><el-tag :type="row.exists ? 'info' : 'success'" size="small">{{ row.exists ? '已存在' : '新增' }}</el-tag></template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div v-if="layerBatchPreview.length" style="color:#909399;font-size:12px;margin-top:6px">
|
||||
共 {{ layerBatchPreview.length }} 个层,其中已存在 {{ layerBatchPreview.filter(x=>x.exists).length }} 个(生成时自动跳过)。
|
||||
共 {{ layerBatchPreview.length }} 个层,其中已存在 {{ layerBatchPreview.filter(x=>x.exists).length }} 个(生成时自动跳过)。层名称可点击修改,确认生成时按修改后名称入库。
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
@@ -867,9 +878,9 @@ 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="序列号" :value="2" />
|
||||
<el-option label="其他(辅料/工装/试验设备)" :value="3" />
|
||||
<el-option label="结构件(批次)" :value="1" />
|
||||
<el-option label="电气件(SN)" :value="2" />
|
||||
<el-option label="其他" :value="3" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="品类">
|
||||
|
||||
Reference in New Issue
Block a user