chore: 批量完成项目多模块迭代优化

1. 废弃半成品库存表并统一库存主表
2. 修复列表排序与搜索大小写不敏感问题
3. 新增用户最近登录时间、工单BOM名称字段
4. 完善角色管理、工位选择器功能
5. 增加拧紧数据补录、成品自动回流WMS能力
6. 统一导出时间范围校验规则
7. 丰富物料/备料单筛选条件
8. 调整菜单与权限命名适配产品型号业务
This commit is contained in:
SunYF
2026-09-08 11:44:04 +08:00
parent 06689970e2
commit e852c7cd37
96 changed files with 4528 additions and 542 deletions
+29 -7
View File
@@ -27,6 +27,11 @@
<el-table-column prop="workOrderNo" label="工单号" min-width="140" />
<el-table-column prop="productCode" label="产品编码" min-width="120" />
<el-table-column prop="productName" label="产品名称" min-width="120" />
<el-table-column prop="bomName" label="BOM" width="100" align="center">
<template #default="{ row }">
<el-tag size="small" effect="plain">{{ row.bomName || '默认' }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" width="70" />
<el-table-column prop="finishedNum" label="已完工" width="70" />
<el-table-column label="工位组合" min-width="170" show-overflow-tooltip>
@@ -61,12 +66,18 @@
<el-dialog v-model="dialog.show" :title="dialog.id ? '编辑工单' : '新建工单'" width="560px">
<el-form :model="dialog" label-width="90px">
<el-form-item label="工单号"><el-input v-model="dialog.workOrderNo" /></el-form-item>
<el-form-item label="产品类型">
<el-select v-model="dialog.productTypeId" placeholder="请选择产品类型" style="width:100%">
<el-form-item label="产品型号">
<el-select v-model="dialog.productTypeId" placeholder="请选择产品型号" style="width:100%">
<el-option v-for="p in productTypes" :key="p.id" :label="p.name + (p.code ? ' / ' + p.code : '')" :value="p.id" />
</el-select>
</el-form-item>
<el-form-item label="产品编码"><el-input v-model="dialog.productCode" placeholder="请输入产品编码" /></el-form-item>
<el-form-item label="产品编码"><el-input v-model="dialog.productCode" placeholder="请输入产品编码" @change="loadBomNames" /></el-form-item>
<el-form-item label="BOM 名称">
<el-select v-model="dialog.bomName" filterable allow-create default-first-option placeholder="该编码下并存的BOM(可输入新名)" style="width:100%">
<el-option v-for="b in bomNames" :key="b.bomName" :label="`${b.bomName}(${b.itemCount}料)`" :value="b.bomName" />
</el-select>
<div style="color:#909399;font-size:12px;line-height:1.4;width:100%">同一型号多份 BOM 按名称区分(不同厂家/含半成品),备料与装机校验按此 BOM 计算。</div>
</el-form-item>
<el-form-item label="产品名称"><el-input v-model="dialog.productName" placeholder="请输入产品名称" /></el-form-item>
<el-form-item label="数量"><el-input-number v-model="dialog.quantity" :min="1" /></el-form-item>
<el-form-item label="工位组合">
@@ -160,8 +171,17 @@ const query = reactive({ orderNo: '', productCode: '', productName: '', status:
const list = ref([])
const productTypes = ref([])
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', productName: '', quantity: 1, processSeq: '', status: 'CREATED' })
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', bomName: '', productName: '', quantity: 1, processSeq: '', status: 'CREATED' })
const seq = reactive({ show: false, id: 0, orderNo: '', productCode: '', productName: '', processSeq: '' })
const bomNames = ref([])
// 按产品编码拉取该型号下并存的 BOM 名称(建单选 BOM)
async function loadBomNames() {
const code = (dialog.productCode || '').trim()
if (!code) { bomNames.value = []; return }
bomNames.value = (await request.get('/bom/names', { params: { productCode: code } })) || []
if (!dialog.bomName && bomNames.value.length) dialog.bomName = bomNames.value[0].bomName
}
async function load() {
const data = await request.get('/work-orders', { params: query })
@@ -171,13 +191,15 @@ async function loadProducts() {
productTypes.value = (await request.get('/product-types')) || []
}
function openCreate() {
Object.assign(dialog, { show: true, id: 0, workOrderNo: `WO${Date.now()}`, productTypeId: 0, productCode: '', productName: '', quantity: 1, processSeq: '1,2,3,4,5,6,7,8,9,10,11,12', status: 'CREATED' })
Object.assign(dialog, { show: true, id: 0, workOrderNo: `WO${Date.now()}`, productTypeId: 0, productCode: '', bomName: '', productName: '', quantity: 1, processSeq: '1,2,3,4,5,6,7,8,9,10,11,12', status: 'CREATED' })
bomNames.value = []
}
function openEdit(row) {
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, quantity: row.quantity, processSeq: row.processSeq || '1,2,3,4,5,6,7,8,9,10,11,12', status: row.status })
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, bomName: row.bomName || '', productName: row.productName, quantity: row.quantity, processSeq: row.processSeq || '1,2,3,4,5,6,7,8,9,10,11,12', status: row.status })
loadBomNames()
}
async function save() {
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, quantity: dialog.quantity, processSeq: dialog.processSeq }
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, bomName: dialog.bomName || '默认', productName: dialog.productName, quantity: dialog.quantity, processSeq: dialog.processSeq }
if (dialog.id) await request.put('/work-orders', body)
else await request.post('/work-orders', body)
ElMessage.success('保存成功')