feat: 移除工艺物料与混产模板实体、新增产线清线与 PLC 监控实时推送、看板双屏增强
- 移除实体:MES 删除 FlowMaterial(工艺物料)与 MixProductionTemplate(混产模板)全套(schema/ent 生成码/handler/logic),清理关联路由与种子 - 新增功能:产线清线(line_clearance handler + logic)、PLC 监控 WebSocket 实时推送(ws/plc_monitor_hub + handler) - 看板增强:新增管理屏与 KPI 组件(BoardManage/BoardKpi),调整演示屏 Mock 与各看板面板 - MES 完善:PLC 匹配/扭矩扫描/签收、工艺卡 PDF 与工单、AGV 链路、叫料/备料/在制品/短料预测等逻辑与前端调整 - 工位终端:删除离线面板 OfflinePanel,调整主界面/物料面板与 api/store/handler/路由 - WMS:AGV 托盘、物料与 MES 客户端调整及前端帮助/基础数据/叫料/托盘页 - 文档:更新产线API/客户问题/案例/部署手册/问题记录
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
<el-option label="停用" value="INACTIVE" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="工序数≥">
|
||||
<el-form-item label="工艺数≥">
|
||||
<el-input-number v-model="flowStepMin" :min="0" :max="200" controls-position="right" style="width:120px" @change="loadFlows" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
@@ -193,67 +193,6 @@
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 物料清单子表(整表覆盖保存;物料编码下拉选择,快照信息取自物料档案) -->
|
||||
<el-form-item label="物料清单">
|
||||
<div style="width:100%">
|
||||
<el-alert v-if="!flowDlg.id" type="info" :closable="false" style="margin-bottom:8px"
|
||||
title="新工艺请先保存,保存后即可维护物料清单。" />
|
||||
<template v-else>
|
||||
<el-alert v-if="materialsUnavailable" type="warning" :closable="false" style="margin-bottom:8px"
|
||||
title="物料档案服务暂不可用,可手动输入图号(名称/规格等可留空,保存时仅做基础校验);恢复后可重新选图号自动带出档案信息。" />
|
||||
<el-table :data="flowDlg.materials" border size="small">
|
||||
<el-table-column label="图号" min-width="150">
|
||||
<template #default="{ row }">
|
||||
<el-select v-model="row.materialCode" filterable remote clearable allow-create default-first-option
|
||||
:remote-method="(kw) => searchMaterials(kw)"
|
||||
placeholder="请选择图号(可输入图号/名称模糊搜索,也可直接手输)" style="width:100%"
|
||||
@focus="searchMaterials('')"
|
||||
@change="(code) => onMaterialPicked(row, code)">
|
||||
<el-option v-for="m in materialOptions" :key="m.code" :label="(m.code || '') + (m.name ? ' ' + m.name : '')" :value="m.code" />
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料名称" min-width="120">
|
||||
<template #default="{ row }"><el-input v-model="row.materialName" disabled /></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" min-width="110">
|
||||
<template #default="{ row }"><el-input v-model="row.spec" disabled /></template>
|
||||
</el-table-column>
|
||||
<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">
|
||||
<template #default="{ row }">
|
||||
<el-select v-model="row.snMode" disabled>
|
||||
<el-option :value="1" label="序列号=是" />
|
||||
<el-option :value="2" label="序列号=否" />
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单台用量" width="120">
|
||||
<template #default="{ row }">
|
||||
<el-input-number v-model="row.unitQty" :min="0" size="small" controls-position="right" style="width:100%" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="损耗率%" width="110">
|
||||
<template #default="{ row }">
|
||||
<el-input-number v-model="row.lossRate" :min="0" size="small" controls-position="right" style="width:100%" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="danger" size="small" @click="removeMaterial(row)">删</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div style="display:flex;gap:10px;margin-top:10px;align-items:center">
|
||||
<el-button 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>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="text-align:right;margin-top:8px">
|
||||
<el-button @click="activeTab = 'list'">取消</el-button>
|
||||
@@ -358,7 +297,7 @@ async function loadPPOptions() {
|
||||
ppOptions.value = [...new Set(list.map((p) => p.name).filter(Boolean))].sort()
|
||||
} catch { ppOptions.value = [] }
|
||||
}
|
||||
// 工艺列表搜索(A7-3):名称模糊 / 状态 / 工序数下限
|
||||
// 工艺列表搜索(A7-3):名称模糊 / 状态 / 工艺数下限
|
||||
const flowName = ref('')
|
||||
const flowStatus = ref('')
|
||||
const flowStepMin = ref(null)
|
||||
@@ -453,92 +392,8 @@ async function onPdfChange(e) {
|
||||
|
||||
const flowDlg = reactive({
|
||||
id: 0, name: '', stations: [], pdfFile: '', status: 'ACTIVE',
|
||||
remark: '', uploading: false, steps: [blankStep(1)], materials: []
|
||||
remark: '', uploading: false, steps: [blankStep(1)]
|
||||
})
|
||||
const matSaving = ref(false)
|
||||
|
||||
function blankMaterial() {
|
||||
return { materialCode: '', materialName: '', spec: '', unit: '', snMode: 2, unitQty: 1, lossRate: 0 }
|
||||
}
|
||||
|
||||
/* ---------- 物料档案(工艺物料清单「图号」下拉数据源) ---------- */
|
||||
// 大数据量治理:下拉改为远程搜索,按需按 keyword 拉取(后端 limit 默认100、封顶200),不再一次性全量。
|
||||
// pickedMaterials 缓存已选图号对应档案,保证已选行即使不在当前搜索结果内也始终显示「图号 + 名称」。
|
||||
const materialOptions = ref([])
|
||||
const pickedMaterials = reactive({})
|
||||
const materialsUnavailable = ref(false)
|
||||
|
||||
async function searchMaterials(kw) {
|
||||
materialsUnavailable.value = false
|
||||
try {
|
||||
const list = (await request.get('/materials', { params: { keyword: (kw || '').trim(), limit: 100 } })) || []
|
||||
const merged = {}
|
||||
Object.values(pickedMaterials).forEach((m) => { if (m && m.code) merged[m.code] = m })
|
||||
;(Array.isArray(list) ? list : []).forEach((m) => { merged[m.code] = m })
|
||||
materialOptions.value = Object.values(merged)
|
||||
} catch {
|
||||
materialOptions.value = Object.values(pickedMaterials)
|
||||
}
|
||||
if (!materialOptions.value.length) materialsUnavailable.value = true
|
||||
}
|
||||
|
||||
// 选中物料编码后,快照字段(名称/规格/单位/序列号)自动带出,均不可手改
|
||||
function onMaterialPicked(row, code) {
|
||||
const m = materialOptions.value.find((x) => x.code === code)
|
||||
if (!m) return
|
||||
pickedMaterials[code] = m
|
||||
row.materialName = m.name || ''
|
||||
row.spec = m.spec || ''
|
||||
row.unit = m.unit || ''
|
||||
if (m.snMode === 1 || m.snMode === 2) row.snMode = m.snMode
|
||||
}
|
||||
|
||||
// 加载该工艺的物料清单(整表编辑,保存时整表覆盖)
|
||||
async function loadMaterials(flowId) {
|
||||
flowDlg.materials = []
|
||||
if (!flowId) return
|
||||
try {
|
||||
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 || '', snMode: m.snMode === 1 ? 1 : 2, unitQty: m.unitQty ?? 1, lossRate: m.lossRate ?? 0
|
||||
}))
|
||||
// 已保存行:把图号+名称等档案预入 pickedMaterials,并使已选直接进入选项池,
|
||||
// 这样已选下拉无需聚焦即显示「图号 名称」,而非裸图号
|
||||
flowDlg.materials.forEach((m) => {
|
||||
if (m.materialCode) pickedMaterials[m.materialCode] = { code: m.materialCode, name: m.materialName, spec: m.spec, unit: m.unit, snMode: m.snMode }
|
||||
})
|
||||
materialOptions.value = Object.values(pickedMaterials)
|
||||
} catch { /* 拦截器已提示 */ }
|
||||
}
|
||||
|
||||
function addMaterial() {
|
||||
flowDlg.materials.push(blankMaterial())
|
||||
}
|
||||
function removeMaterial(row) {
|
||||
const i = flowDlg.materials.indexOf(row)
|
||||
if (i >= 0) flowDlg.materials.splice(i, 1)
|
||||
}
|
||||
async function saveMaterials() {
|
||||
if (!flowDlg.id) return ElMessage.warning('请先保存工艺,再维护物料清单')
|
||||
const items = flowDlg.materials.map((m) => ({
|
||||
materialCode: (m.materialCode || '').trim(),
|
||||
materialName: (m.materialName || '').trim(),
|
||||
spec: m.spec || '', unit: m.unit || '',
|
||||
snMode: m.snMode === 1 ? 1 : 2,
|
||||
unitQty: Number(m.unitQty) || 0,
|
||||
lossRate: Number(m.lossRate) || 0
|
||||
}))
|
||||
if (items.some((m) => !m.materialCode)) return ElMessage.warning('存在未选择物料编码的行,请补全或删除')
|
||||
matSaving.value = true
|
||||
try {
|
||||
await request.post(`/process-flows/${flowDlg.id}/materials`, { items })
|
||||
ElMessage.success('物料清单已保存')
|
||||
} catch { /* 拦截器已提示 */ } finally {
|
||||
matSaving.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function openFlow(row) {
|
||||
if (row) {
|
||||
flowDlg.id = row.id
|
||||
@@ -559,10 +414,9 @@ function openFlow(row) {
|
||||
attachment: (s.attachment || []).map((a) => ({ ...a })),
|
||||
criteria: (s.criteria || []).map((c) => ({ ...c }))
|
||||
}))
|
||||
loadMaterials(row.id)
|
||||
} else {
|
||||
Object.assign(flowDlg, {
|
||||
id: 0, name: '', stations: [], pdfFile: '', status: 'ACTIVE', remark: '', steps: [], materials: []
|
||||
id: 0, name: '', stations: [], pdfFile: '', status: 'ACTIVE', remark: '', steps: []
|
||||
})
|
||||
}
|
||||
if (!flowDlg.steps.length) flowDlg.steps.push(blankStep(1))
|
||||
@@ -578,7 +432,7 @@ function removeStep(row) {
|
||||
if (i >= 0) flowDlg.steps.splice(i, 1)
|
||||
}
|
||||
|
||||
/* ---------- 步骤图纸/附件(Item J:图纸绑定工艺步骤,按工序分发到工位终端)---------- */
|
||||
/* ---------- 步骤图纸/附件(Item J:图纸绑定工艺步骤,按工艺分发到工位终端)---------- */
|
||||
async function uploadStepAttachment(option, row) {
|
||||
const fd = new FormData()
|
||||
fd.append('file', option.file)
|
||||
|
||||
Reference in New Issue
Block a user