feat: 工单工艺组合改为按工序工位严格校验

- 新增 ValidateWorkOrderComboStrict 方法,实现工序工位硬校验规则
- 删除旧的 ComboOrderConflict 顺序校验方法
- 前端 UI 改为工序工位选择模式,支持动态推荐和约束
- 更新文档说明,同步工艺组合到工序工位的业务规则
This commit is contained in:
SunYF
2026-10-21 09:55:31 +08:00
parent b0c048d9aa
commit 4b14f9540a
9 changed files with 433 additions and 384 deletions
+4 -4
View File
@@ -39,7 +39,7 @@ export const helpWorkOrder = {
{ name: '归属编号', source: '手工填写。随归属类型填合同号或科技项目号。', purpose: '一级归属编号(合同号/科技项目号二选一)', fill: '如 HT-2026-001 或 KJ-2026-001;选「其他」可不填' },
{ name: '产品序号', source: '手工填写。', purpose: '三级归属:本工单内每台产品的序号,用于区分同批不同台', fill: '如 01、02(可空)' },
{ name: '数量', source: '手工填写整数。', purpose: '本工单生产总数量(合同台数),决定需求量与排产上限', fill: '整数 ≥1,如 100' },
{ name: '工艺组合', source: '按工艺分组勾选工位(数据来自「工位绑定」页的工位↔工艺绑定)。保存为 [{flowId,stationNo}]。', purpose: '本工单的执行路线;自动排产/备料拆分/产线下发均按此组合派生', fill: '默认每个已绑定工艺的工位全选;至少选一道工艺;全不选某工艺则该工艺不进入组合;执行顺序=工位号升序,可跳过未选工位' },
{ name: '工序工位', source: '按产品工艺的工序顺序,每道工序从下拉选一个工位(候选=工位管理里绑定该工序的启用工位)。保存为 [{flowId,stationNo}]。', purpose: '本工单的执行路线;自动排产/备料拆分/产线下发均按此组合派生', fill: '系统按工艺顺序自动推荐工位(第1道取候选最小工位,第N道取大于上一道已选且候选最小的工位);可逐道修改,下拉只列合法候选(第N道候选=绑定该工序且工位号>第N-1道已选);工位号须按工序顺序严格递增' },
{ name: '状态', source: '新建时选"已创建",后续由流程推进。', purpose: '工单生命周期:创建→发布→生产→完成', fill: '新建时选"已创建";也可在列表操作列点「状态」快捷流转(发布/开工/完工)' },
{ name: '要求完成日期', source: '手工填写,建单/编辑时必填。', purpose: '记录工单要求/承诺完成日期,用于交付与绩效统计;与「实际完成」(系统记录的真实完工时间)是两个独立字段', fill: '建单时选择日期,必填' },
{ name: '时间字段口径', source: '建单填写 + 系统自动记录。', purpose: '计划开始/计划完成=建单填写的计划区间;实际开始=首次"下发并开工"的时间(系统落库);实际完成=本工单全部工件报工完成、置"已完成"的时间(系统落库)。("完成日期"是要求/承诺完成日期,属上一条独立字段)', fill: '建单填计划开始/计划完成(选填);实际开始/实际完成由系统自动写,无需手填' },
@@ -54,10 +54,10 @@ export const helpWorkOrder = {
]
},
{
title: '工艺组合(路线)',
overview: '新建/编辑工单时勾选「工艺组合」:按工艺分组,每组勾选该工艺要执行的工位。\n组合结果按工位号升序只读展示为路线条(如 2→5→6→8)——执行顺序=工位号升序,可跳过未选工位。\n「自动排产」要求工单已配置工艺组合:组合为空时按钮置灰,提示"请先选择工艺组合"。\n半成品再上线:编辑工单,只勾剩余要走的工位即可。',
title: '工序工位(路线)',
overview: '新建/编辑工单时按产品工艺的工序顺序,每道工序从下拉选一个工位(工序顺序固定显示)。\n系统按工艺顺序自动推荐:第1道选候选最小工位,第N道选大于上一道已选且候选最小的工位;可逐道修改,下拉只列合法候选(第N道候选=绑定该工序且工位号>第N-1道已选),选不到非法组合。\n组合结果按工位号升序只读展示为路线条(如 2→5→6→8)——执行顺序=工位号升序,工位号须严格递增。\n「自动排产」要求工单已配置工艺组合:组合为空时按钮置灰,提示"请先选择工艺组合"。\n半成品再上线:编辑工单,只选剩余要走的工序对应工位即可。',
fields: [
{ name: '工艺组合', source: '按工艺分组勾选工位。', purpose: '本工单经过的工位与其工艺,产线设备按组合下发', fill: '勾选即可,按工位号升序执行;至少选一道' }
{ name: '工序工位', source: '按工序顺序逐道选一个工位(候选=绑定该工序的启用工位)。', purpose: '本工单经过的工位与其工艺,产线设备按组合下发', fill: '逐道选择,下拉只列合法候选;至少选一道工序;工位号须按工序顺序严格递增' }
]
},
{
+210 -66
View File
@@ -137,13 +137,14 @@
<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-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" />
</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]" />
<el-alert v-if="comboStaleWarn" type="warning" :closable="false" style="margin-top:6px" :title="comboStaleWarn" />
<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>
@@ -161,23 +162,36 @@
<el-date-picker v-model="dialog.planEnd" type="date" value-format="YYYY-MM-DD"
placeholder="计划完成日期(选填)" style="width:100%" />
</el-form-item>
<el-form-item label="工艺组合">
<el-form-item label="工序工位" required>
<div style="width:100%">
<el-checkbox-group v-model="selStations" class="combo-group">
<template v-for="g in flowGroups" :key="g.key">
<div class="combo-group-title" :class="{ 'combo-empty': g.flowId === 0 }">
{{ g.title }}({{ g.stations.length }} 个工位)
<el-alert v-if="!dialog.productProcessId" type="info" :closable="false" style="margin-bottom:8px"
title="未选择产品工艺:请先选择产品型号(自动带出产品工艺)以按工序推荐工位;若该产品尚未配置产品工艺,可到「产品工艺」页创建后再选。" />
<template v-if="processRows.length">
<div class="combo-table">
<div class="combo-row combo-head">
<span class="combo-col-seq">工序</span>
<span class="combo-col-flow">工序(工艺)</span>
<span class="combo-col-station">工位(按工序顺序递增)</span>
</div>
<el-checkbox v-for="st in g.stations" :key="st.stationNo" :label="st.stationNo" :disabled="g.flowId === 0">
工位{{ st.stationNo }}<span v-if="st.name" class="combo-station-name">{{ st.name }}</span>
</el-checkbox>
</template>
</el-checkbox-group>
<div v-if="routeText" class="combo-route">
执行路线:{{ routeText }}
<span class="combo-route-tip">(执行顺序=工位号升序,可跳过未选工位)</span>
</div>
<div class="combo-tip">仅显示已绑定启用工位的工艺;工艺组合可稍后配置,排产/开工前必须已有组合;默认每个工艺的启用工位全选,全不选某工艺则该工艺不进入组合。</div>
<div v-for="(r, i) in processRows" :key="r.flowId" class="combo-row">
<span class="combo-col-seq">第 {{ i + 1 }} 道</span>
<span class="combo-col-flow">{{ r.flowName || ('工序' + r.flowId) }}</span>
<span class="combo-col-station">
<el-select v-model="r.stationNo" placeholder="请选择工位" style="width:100%" @change="onProcessStationChange(i)">
<el-option v-for="o in r.options" :key="o.stationNo" :value="o.stationNo"
:label="'工位' + o.stationNo + (o.name ? '(' + o.name + ')' : '')" />
</el-select>
</span>
</div>
</div>
<el-alert v-if="comboError" type="error" :closable="false" style="margin-top:8px" :title="comboError" />
<div v-if="routeText" class="combo-route">
执行路线:{{ routeText }}
<span class="combo-route-tip">(执行顺序=工位号升序,可跳过未选工位)</span>
</div>
<div class="combo-tip">系统按「工序顺序 + 工位号严格递增(产线单向不回头)」自动推荐默认工位;改某道后,后续工序候选自动重算,非法组合无法选到。保存时后端仍会二次校验。</div>
</template>
<div v-else class="combo-tip">该产品暂无产品工艺或工艺未配置工序,暂无可推荐的工序工位。可到「产品工艺」页创建后重新选择产品型号;不选产品工艺时工单可不带工艺组合(排产/开工前须配置)。</div>
</div>
</el-form-item>
</el-form>
@@ -450,50 +464,160 @@ function resetFilters() {
const list = ref([])
const productTypes = ref([])
// 工艺组合:数据源=工位(含 flowId/flowName)+ 工艺列表;按工艺分组勾选工位
// 工序工位:数据源=工位(含 flowId/flowName/stationNo/status/name)+ 产品工艺工序顺序
// 模型=「每道工序选一个工位」(2026-10-20 工单建单需求:自动推荐+用户可改+动态约束)
// processRows 每行 { seq, flowId, flowName, stationNo, options:[{stationNo,name}], error }
const stations = ref([])
const flows = ref([])
const selStations = ref([])
const processRows = ref([])
// comboError:前端即时红字(该道无候选);保存由后端兜底
const comboError = ref('')
// comboStaleWarn:打开存量工单时组合已失效(工位管理已调整)的黄条提示,不拦
const comboStaleWarn = ref('')
const flowGroups = computed(() => {
const map = new Map()
stations.value.forEach((s) => {
const fid = s.flowId || 0
if (!map.has(fid)) map.set(fid, { flowId: fid, flowName: s.flowName || '', stations: [] })
map.get(fid).stations.push(s)
})
flows.value.forEach((f) => {
if (map.has(f.id) && f.name) map.get(f.id).flowName = f.name
})
// 只显示「至少绑定了一个启用工位」的工艺;未绑定工位、或绑定的工位全部停用的工艺整组隐藏
const arr = Array.from(map.values()).filter((g) => g.flowId > 0 && g.stations.some((s) => s.status === 'ENABLED'))
arr.sort((a, b) => (a.flowName || '').localeCompare(b.flowName || '', 'zh'))
return arr.map((g) => ({
key: g.flowId,
flowId: g.flowId,
title: g.flowName || `工艺${g.flowId}`,
stations: [...g.stations].sort((a, b) => (a.stationNo || 0) - (b.stationNo || 0))
}))
})
// 候选工位:绑定该工序 且 启用的工位(按工位号升序)
function boundStations(flowId) {
return stations.value
.filter((s) => s.flowId === flowId && s.status === 'ENABLED')
.map((s) => ({ stationNo: s.stationNo, name: s.name || '' }))
.sort((a, b) => a.stationNo - b.stationNo)
}
// 组合结果 [{flowId,stationNo}]:勾选工位映射其绑定工艺;按工位号升序即执行路线
// 按产品工艺工序顺序构建工序行,并贪心填默认工位:
// 第1道取候选最小工位;第N道(N≥2)取「大于第N-1道已选工位」的候选最小工位
function buildProcessRows(pp) {
comboStaleWarn.value = ''
if (!pp || !pp.flows || !pp.flows.length) {
processRows.value = []
comboError.value = ''
return
}
processRows.value = pp.flows
.slice()
.sort((a, b) => (a.seq || 0) - (b.seq || 0))
.map((it) => ({
seq: it.seq,
flowId: it.flowId,
flowName: it.flowName || ('工序' + it.flowId),
stationNo: 0,
options: [],
error: ''
}))
recomputeCandidates(0)
}
// 从 fromIdx 起重算候选 + 自动修正后续已选(不在新候选中则替换为最小候选)+ 收集红字
function recomputeCandidates(fromIdx) {
let prev = fromIdx > 0 ? processRows.value[fromIdx - 1].stationNo : 0
for (let i = fromIdx; i < processRows.value.length; i++) {
const r = processRows.value[i]
const lower = i === 0 ? -1 : prev // 第1道无下限;后续=上一道已选工位号
const cands = boundStations(r.flowId).filter((o) => o.stationNo > lower)
r.options = cands
if (r.stationNo > 0 && cands.some((o) => o.stationNo === r.stationNo)) {
// 当前选择仍合法,保留
} else if (cands.length) {
r.stationNo = cands[0].stationNo // 自动替换为最小合法候选
} else {
r.stationNo = 0 // 无候选:留空,由红字提示
}
prev = r.stationNo
}
collectComboError()
}
// 收集红字提示:找到第一处「该道无候选」给出"工位X 之后没有能做工序Y 的工位"
function collectComboError() {
for (let i = 0; i < processRows.value.length; i++) {
const r = processRows.value[i]
if (r.stationNo === 0 && r.options.length === 0) {
const prevNo = i > 0 ? processRows.value[i - 1].stationNo : 0
const prevName = i > 0 ? processRows.value[i - 1].flowName : ''
comboError.value = `工位${prevNo} 之后没有能做工序「${r.flowName}」的工位,请改选第${i}道工序`
return
}
}
comboError.value = ''
}
// 用户改某道工序的工位 → 后续候选自动重算(非法组合下拉里就没有,选不到)
function onProcessStationChange(i) {
recomputeCandidates(i + 1)
}
// 组合结果(按工位号升序即执行路线):仅含已选工序
const flowCombination = computed(() =>
stations.value
.filter((s) => s.flowId > 0 && selStations.value.includes(s.stationNo))
.map((s) => ({ flowId: s.flowId, stationNo: s.stationNo }))
processRows.value
.filter((r) => r.stationNo > 0)
.map((r) => ({ flowId: r.flowId, stationNo: r.stationNo }))
.sort((a, b) => a.stationNo - b.stationNo)
)
const routeText = computed(() => flowCombination.value.map((c) => c.stationNo).join('→'))
const hasCombination = (row) => Array.isArray(row.flowCombination) && row.flowCombination.length > 0
function defaultSelStations() {
// 默认全选「可见工艺组」内的启用工位(被隐藏工艺组下的工位不参与组合)
const visible = new Set(flowGroups.value.map((g) => g.flowId))
return stations.value
.filter((s) => s.flowId > 0 && visible.has(s.flowId) && s.status === 'ENABLED')
.map((s) => s.stationNo)
.sort((a, b) => a - b)
// 编辑回填:优先用来源产品工艺工序顺序;无产品工艺则从已存组合按工位号升序推导工序行
function buildEditProcessRows(row) {
const pp = row.productProcessId ? productProcesses.value.find((p) => p.id === row.productProcessId) : null
const combo = Array.isArray(row.flowCombination) ? row.flowCombination : []
if (pp && pp.flows && pp.flows.length) {
buildProcessRows(pp)
for (const r of processRows.value) {
const c = combo.find((x) => x.flowId === r.flowId && x.stationNo > 0)
if (c) r.stationNo = c.stationNo
}
recomputeCandidates(0) // 已保存合法则保留,失效则自动修正
} else if (combo.length) {
const byFlow = new Map()
for (const c of combo) {
if (c.flowId > 0 && c.stationNo > 0) {
const cur = byFlow.get(c.flowId)
if (cur === undefined || c.stationNo < cur) byFlow.set(c.flowId, c.stationNo)
}
}
const ordered = [...byFlow.entries()].sort((a, b) => a[1] - b[1])
processRows.value = ordered.map(([fid, no], i) => {
const f = flows.value.find((x) => x.id === fid)
return { seq: i + 1, flowId: fid, flowName: f ? f.name : ('工序' + fid), stationNo: no, options: boundStations(fid), error: '' }
})
comboError.value = ''
} else {
processRows.value = []
comboError.value = ''
}
checkComboStale(row) // 存量失效软提示(工位管理已调整)
}
// 存量失效软提示:工位仍绑定该工序 + 工位号递增;不满足则黄条提示,不拦(2026-10-20 工单建单需求·三)
function checkComboStale(row) {
comboStaleWarn.value = ''
const combo = Array.isArray(row.flowCombination) ? row.flowCombination : []
if (!combo.length) return
const byNo = new Map(stations.value.map((s) => [s.stationNo, s]))
const msgs = []
for (const c of combo) {
const st = byNo.get(c.stationNo)
if (!st) { msgs.push(`工位${c.stationNo} 不存在`); continue }
if (st.status !== 'ENABLED') msgs.push(`工位${c.stationNo} 已停用`)
else if (st.flowId !== c.flowId) msgs.push(`工位${c.stationNo} 当前绑定工艺已变更(与原工序不匹配)`)
}
const pp = row.productProcessId ? productProcesses.value.find((p) => p.id === row.productProcessId) : null
if (pp && pp.flows && pp.flows.length) {
const seq = pp.flows.slice().sort((a, b) => (a.seq || 0) - (b.seq || 0))
let prev = 0
for (const it of seq) {
const sts = combo.filter((c) => c.flowId === it.flowId).map((c) => c.stationNo).sort((a, b) => a - b)
if (!sts.length) continue
if (prev > 0 && sts[0] <= prev) {
msgs.push(`工序「${it.flowName || ('工序' + it.flowId)}」的工位(${sts[0]})不大于上一道工序的工位(${prev}),组合已失效`)
break
}
prev = sts[0]
}
}
if (msgs.length) {
comboStaleWarn.value = '该工单工艺组合已失效(工位管理已调整):' + msgs.join(';') + '。可重新选择工序工位后保存。'
}
}
async function loadComboData() {
@@ -641,19 +765,26 @@ async function loadProductProcesses() {
}
}
// 选产品工艺 → 自动推导:每道工艺的全部启用工位填入组合(与既有勾选模型一致,可手改)
// 选产品工艺 → 按工序顺序构建「每道工序一个工位」行,并贪心填默认工位(用户可逐道改)
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 {
// 拦截器已提示
comboStaleWarn.value = ''
if (!id) {
processRows.value = []
comboError.value = ''
return
}
const pp = productProcesses.value.find((p) => p.id === id)
if (!pp) {
processRows.value = []
comboError.value = ''
return
}
buildProcessRows(pp)
// 某道无绑定工位(无解):提示(工位管理阶段就该发现)
const noCand = processRows.value.find((r) => r.options.length === 0)
if (noCand) {
ppWarnings.value = [`工序「${noCand.flowName}」没有可用的绑定工位(工位管理未绑定或已停用),暂无法自动推荐工位。请先在「工位管理」为该工序绑定启用工位。`]
}
}
@@ -692,16 +823,16 @@ function openCreate() {
Object.assign(dialog, { show: true, id: 0, workOrderNo: genOrderNo(), productTypeId: null, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', planEnd: '', status: 'CREATED', productProcessId: 0 })
productProcesses.value = []
ppWarnings.value = []
selStations.value = defaultSelStations()
processRows.value = []
comboError.value = ''
comboStaleWarn.value = ''
}
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) : '', planEnd: row.planEnd ? String(row.planEnd).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 = []
comboError.value = ''
if (row.productCode) {
try {
productProcesses.value = (await request.get('/product-processes', { params: { productCode: row.productCode, status: 'ACTIVE' } })) || []
@@ -709,6 +840,7 @@ async function openEdit(row) {
productProcesses.value = []
}
}
buildEditProcessRows(row)
}
async function save() {
if (!dialog.dueDate) return ElMessage.warning('请选择要求完成日期(必填)')
@@ -717,6 +849,11 @@ async function save() {
if (dialog.ownershipType !== 'other' && !String(dialog.contractNo || '').trim()) {
return ElMessage.warning(dialog.ownershipType === 'project' ? '归属类型为科技项目号,请填写归属编号' : '归属类型为合同号,请填写归属编号')
}
// 工序工位:带产品工艺时每道工序必须选工位(前端即时拦,后端仍兜底)
if (dialog.productProcessId > 0 && processRows.value.some((r) => r.stationNo === 0)) {
const miss = processRows.value.filter((r) => r.stationNo === 0).map((r) => r.flowName).join('、')
return ElMessage.warning('请为每道工序选择工位:' + miss)
}
// 建单不强制工艺组合(工单≠开工):排产/开工时由后端校验组合非空
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, planEnd: dialog.planEnd, flowCombination: flowCombination.value, productProcessId: dialog.productProcessId || 0 }
@@ -870,4 +1007,11 @@ onMounted(async () => { load(); loadProducts(); loadComboData() })
.combo-route { margin-top: 8px; font-size: 13px; color: #1668dc; background: #ecf3fe; padding: 6px 10px; border-radius: 4px; width: 100%; }
.combo-route-tip { color: #909399; font-size: 12px; }
.combo-tip { font-size: 12px; color: #909399; margin-top: 6px; line-height: 1.5; width: 100%; }
.combo-table { border: 1px solid #ebeef5; border-radius: 4px; overflow: hidden; width: 100%; }
.combo-row { display: flex; align-items: center; border-bottom: 1px solid #ebeef5; }
.combo-row:last-child { border-bottom: none; }
.combo-head { background: #f5f7fa; font-weight: 600; color: #303133; font-size: 12px; }
.combo-col-seq { width: 80px; padding: 8px 10px; flex: none; text-align: center; color: #606266; }
.combo-col-flow { width: 200px; padding: 8px 10px; flex: none; color: #303133; }
.combo-col-station { flex: 1; padding: 6px 10px; }
</style>