feat: 新增产品工艺管理与工序审核功能
- 新增产品工艺(product_process)及明细(product_process_item)数据模型 - 新增工序审核开关(need_audit)与审核角色(audit_role)字段 - 新增待审核签字页面与路由 - 优化 WMS/MES 接口交互,增加业务错误处理与友好提示 - 补充库存过滤逻辑,避免返回已出库 SN 数据 - 调整默认查询时间范围为近一个月,优化用户体验
This commit is contained in:
@@ -106,7 +106,7 @@
|
||||
<el-form :model="dialog" label-width="90px">
|
||||
<el-form-item label="产品工号" required><el-input v-model="dialog.workOrderNo" /></el-form-item>
|
||||
<el-form-item label="产品型号" required>
|
||||
<el-select v-model="dialog.productTypeId" placeholder="---请选择---" style="width:100%" @change="onProductTypeChange">
|
||||
<el-select v-model="dialog.productTypeId" placeholder="请选择" style="width:100%" @change="onProductTypeChange">
|
||||
<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>
|
||||
@@ -126,6 +126,19 @@
|
||||
:placeholder="dialog.ownershipType === 'project' ? '科技项目号(必填)' : dialog.ownershipType === 'other' ? '选「其他」可不填' : '合同号(必填)'" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品序号"><el-input v-model="dialog.productSerial" placeholder="本工单内每台产品的序号" /></el-form-item>
|
||||
<el-form-item label="产品工艺">
|
||||
<div style="width:100%">
|
||||
<el-select v-model="dialog.productProcessId" clearable placeholder="选择后自动带出工艺组合(可手动增删工位)" style="width:100%" @change="applyProductProcess">
|
||||
<el-option v-for="p in productProcesses" :key="p.id" :value="p.id" :label="p.name + (p.isDefault ? '(默认)' : '')" />
|
||||
</el-select>
|
||||
<el-alert v-if="ppWarnings.length" type="warning" :closable="false" style="margin-top:6px"
|
||||
:title="ppWarnings.length > 1 ? ppWarnings.map((w, i) => (i + 1) + '. ' + w).join(';') : ppWarnings[0]" />
|
||||
<div v-else-if="dialog.productProcessId" class="combo-tip">
|
||||
已按产品工艺自动填入工艺组合(快捷选择,可手动增删工位;与产品工艺的工艺个数/顺序不符时保存会有偏差提示,不阻断)。
|
||||
<el-link type="primary" :underline="false" style="margin-left:6px" @click="goProductProcess">查看产品工艺/路线卡</el-link>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="数量" required><el-input-number v-model="dialog.quantity" :min="1" /></el-form-item>
|
||||
<el-form-item label="完成日期" required>
|
||||
<el-date-picker v-model="dialog.dueDate" type="date" value-format="YYYY-MM-DD"
|
||||
@@ -285,6 +298,7 @@
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, computed, onMounted } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
import { can } from '../utils/perm'
|
||||
@@ -432,7 +446,51 @@ async function openDetail(row) {
|
||||
}
|
||||
}
|
||||
|
||||
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED' })
|
||||
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: null, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED', productProcessId: 0 })
|
||||
|
||||
// ---------- 产品工艺(2026-10-09):建单选产品自动带出默认产品工艺,自动填工艺组合(快捷选择+偏差提示) ----------
|
||||
const productProcesses = ref([])
|
||||
const ppWarnings = ref([])
|
||||
const router = useRouter()
|
||||
// 工单不嵌路线卡(客户裁定):想看定义层就跳「产品工艺」页查看/打印路线卡
|
||||
function goProductProcess() {
|
||||
router.push('/product-process')
|
||||
}
|
||||
|
||||
async function loadProductProcesses() {
|
||||
productProcesses.value = []
|
||||
dialog.productProcessId = 0
|
||||
ppWarnings.value = []
|
||||
if (!dialog.productCode) return
|
||||
try {
|
||||
productProcesses.value = (await request.get('/product-processes', { params: { productCode: dialog.productCode, status: 'ACTIVE' } })) || []
|
||||
} catch {
|
||||
productProcesses.value = []
|
||||
}
|
||||
if (productProcesses.value.length) {
|
||||
const d = productProcesses.value.find((x) => x.isDefault) || productProcesses.value[0]
|
||||
dialog.productProcessId = d.id
|
||||
await applyProductProcess(d.id)
|
||||
} else {
|
||||
ppWarnings.value = ['该产品尚未配置产品工艺(可在「产品工艺」页创建),工艺组合需手动勾选']
|
||||
}
|
||||
}
|
||||
|
||||
// 选产品工艺 → 自动推导:每道工艺的全部启用工位填入组合(与既有勾选模型一致,可手改)
|
||||
async function applyProductProcess(id) {
|
||||
ppWarnings.value = []
|
||||
if (!id) return
|
||||
try {
|
||||
const d = await request.get('/product-processes/derive', { params: { id } })
|
||||
if (!d) return
|
||||
ppWarnings.value = d.warnings || []
|
||||
const enabled = new Set(stations.value.filter((s) => s.flowId > 0 && s.status === 'ENABLED').map((s) => s.stationNo))
|
||||
const nos = (d.combination || []).map((c) => c.stationNo).filter((n) => enabled.has(n))
|
||||
selStations.value = [...new Set(nos)].sort((a, b) => a - b)
|
||||
} catch {
|
||||
// 拦截器已提示
|
||||
}
|
||||
}
|
||||
|
||||
async function load() {
|
||||
const [dueFrom, dueTo] = query.dueRange || []
|
||||
@@ -453,6 +511,7 @@ function genOrderNo() {
|
||||
return `WO-${ymd}-001`
|
||||
}
|
||||
// Q1=A:选产品型号后自动带出图号/名称(只读,避免手填错位;图号=产品编码,同值)
|
||||
// 2026-10-09:同时带出该产品的产品工艺(默认优先),自动填工艺组合
|
||||
function onProductTypeChange(id) {
|
||||
const p = productTypes.value.find((x) => x.id === id)
|
||||
if (p) {
|
||||
@@ -462,16 +521,29 @@ function onProductTypeChange(id) {
|
||||
dialog.productCode = ''
|
||||
dialog.productName = ''
|
||||
}
|
||||
loadProductProcesses()
|
||||
}
|
||||
function openCreate() {
|
||||
Object.assign(dialog, { show: true, id: 0, workOrderNo: genOrderNo(), productTypeId: 0, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED' })
|
||||
Object.assign(dialog, { show: true, id: 0, workOrderNo: genOrderNo(), productTypeId: null, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED', productProcessId: 0 })
|
||||
productProcesses.value = []
|
||||
ppWarnings.value = []
|
||||
selStations.value = defaultSelStations()
|
||||
}
|
||||
function openEdit(row) {
|
||||
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, contractNo: row.contractNo || '', ownershipType: row.ownershipType || '', productSerial: row.productSerial || '', quantity: row.quantity, dueDate: row.dueDate ? String(row.dueDate).slice(0, 10) : '', planStart: row.planStart ? String(row.planStart).slice(0, 10) : '', status: row.status })
|
||||
async function openEdit(row) {
|
||||
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, contractNo: row.contractNo || '', ownershipType: row.ownershipType || '', productSerial: row.productSerial || '', quantity: row.quantity, dueDate: row.dueDate ? String(row.dueDate).slice(0, 10) : '', planStart: row.planStart ? String(row.planStart).slice(0, 10) : '', status: row.status, productProcessId: row.productProcessId || 0 })
|
||||
selStations.value = hasCombination(row)
|
||||
? [...new Set(row.flowCombination.map((c) => c.stationNo))].sort((a, b) => a - b)
|
||||
: defaultSelStations()
|
||||
// 编辑:只带出该产品可选的产品工艺(不自动重填组合,保留已保存的组合)
|
||||
productProcesses.value = []
|
||||
ppWarnings.value = []
|
||||
if (row.productCode) {
|
||||
try {
|
||||
productProcesses.value = (await request.get('/product-processes', { params: { productCode: row.productCode, status: 'ACTIVE' } })) || []
|
||||
} catch {
|
||||
productProcesses.value = []
|
||||
}
|
||||
}
|
||||
}
|
||||
async function save() {
|
||||
if (!dialog.dueDate) return ElMessage.warning('请选择完成日期(必填)')
|
||||
@@ -482,10 +554,18 @@ async function save() {
|
||||
}
|
||||
// 建单不强制工艺组合(工单≠开工):排产/开工时由后端校验组合非空
|
||||
if (!flowCombination.value.length) ElMessage.warning('未选择工艺组合:排产/开工前须配置')
|
||||
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, contractNo: dialog.contractNo, ownershipType: dialog.ownershipType, productSerial: dialog.productSerial, quantity: dialog.quantity, dueDate: dialog.dueDate, planStart: dialog.planStart, flowCombination: flowCombination.value }
|
||||
if (dialog.id) await request.put('/work-orders', body)
|
||||
else await request.post('/work-orders', body)
|
||||
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, contractNo: dialog.contractNo, ownershipType: dialog.ownershipType, productSerial: dialog.productSerial, quantity: dialog.quantity, dueDate: dialog.dueDate, planStart: dialog.planStart, flowCombination: flowCombination.value, productProcessId: dialog.productProcessId || 0 }
|
||||
let resp = null
|
||||
if (dialog.id) resp = await request.put('/work-orders', body)
|
||||
else resp = await request.post('/work-orders', body)
|
||||
ElMessage.success('保存成功')
|
||||
// 产品工艺偏差警告(仅提示不阻断,2026-10-09 定稿:覆盖/顺序/个数不符时警告提示)
|
||||
const ws = (resp && resp.warnings) || []
|
||||
if (ws.length) {
|
||||
ElMessageBox.alert(ws.map((w, i) => (i + 1) + '. ' + w).join('\n'), '与产品工艺存在偏差(已保存)', {
|
||||
type: 'warning', confirmButtonText: '知道了'
|
||||
}).catch(() => {})
|
||||
}
|
||||
dialog.show = false
|
||||
load()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user