Files
bj_power/bj_power_mes/frontend/src/pages/WorkOrder.vue
T
SunYF d609ff8a9e refactor: 重构工艺工序相关命名与数据模型
1.  全局替换"工序"为"工艺"统一术语,包括页面文案、枚举、注释
2.  重构工单与工件工艺数据模型:
    - 新增工艺组合表flow_material作为备料/齐套唯一源头
    - 新增工位状态表station_state支持自主停单/恢复接单
    - 移除station_process派工表,改用工单工艺组合作为路线唯一源头
    - 替换processCode为flowId作为工艺关联标识
    - 重构工件当前进度字段为currentStationNo
3.  删除冗余的静态备份资源文件
4.  调整物料选择组件默认启用仅显示激活物料
5.  优化工单创建/编辑逻辑,新增工艺组合校验与保存
2026-09-22 11:32:29 +08:00

436 lines
23 KiB
Vue
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
<template>
<div>
<el-card>
<el-form inline>
<el-form-item label="工单号">
<el-input v-model="query.orderNo" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="产品编号">
<el-input v-model="query.productCode" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="产品名称">
<el-input v-model="query.productName" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="合同号">
<el-input v-model="query.contractNo" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="工程编号">
<el-input v-model="query.projectNo" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="完成日期">
<el-date-picker v-model="query.dueRange" type="daterange" value-format="YYYY-MM-DD"
start-placeholder="开始日期" end-placeholder="结束日期" style="width:250px" @change="load" />
</el-form-item>
<el-form-item label="状态">
<el-select v-model="query.status" clearable placeholder="请选择状态" style="width:150px">
<el-option v-for="s in statusOptions" :key="s.v" :label="s.l" :value="s.v" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="load">查询</el-button>
<el-button v-if="can('produce.workorder:add')" @click="openCreate">新建工单</el-button>
</el-form-item>
</el-form>
<el-table :data="list" border stripe size="small">
<el-table-column prop="id" label="ID" width="55" />
<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="contractNo" label="合同号" min-width="110" show-overflow-tooltip />
<el-table-column prop="projectNo" label="工程编号" min-width="110" show-overflow-tooltip />
<el-table-column prop="productSerial" label="产品序号" min-width="110" show-overflow-tooltip />
<el-table-column prop="quantity" label="数量" width="70" />
<el-table-column prop="finishedNum" label="已完工" width="70" />
<el-table-column prop="status" label="状态" width="100">
<template #default="{ row }">{{ statusText(row.status) }}</template>
</el-table-column>
<el-table-column prop="createdBy" label="创建人" width="100">
<template #default="{ row }">{{ row.createdBy || '-' }}</template>
</el-table-column>
<el-table-column label="创建日期" width="160">
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
</el-table-column>
<el-table-column label="完成日期" width="110">
<template #default="{ row }">{{ fmtDateOnly(row.dueDate) }}</template>
</el-table-column>
<el-table-column label="开始时间" width="110">
<template #default="{ row }">{{ fmtDateOnly(row.planStart) }}</template>
</el-table-column>
<el-table-column label="操作" width="300" fixed="right">
<template #default="{ row }">
<el-tooltip v-if="can('produce.workorder:dailyplan') && !['DONE','CANCELLED'].includes(row.status)"
:disabled="hasCombination(row)" content="请先选择工艺组合" placement="top">
<span style="margin-right:12px">
<el-button size="small" type="success" plain :disabled="!hasCombination(row)" @click="openAutoSchedule(row)">自动排产</el-button>
</span>
</el-tooltip>
<el-dropdown
v-if="can('produce.workorder:edit') && statusActions(row.status).length"
trigger="click" @command="(cmd) => changeStatus(row, cmd)">
<el-button size="small" type="primary">{{ statusActionBtn(row.status) }}</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item v-for="a in statusActions(row.status)" :key="a.v" :command="a.v">{{ a.l }}</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<el-dropdown
v-if="(row.status === 'CREATED' && can('produce.workorder:edit')) || (can('produce.workorder:delete') && ['CREATED','PENDING','CONFIRMED'].includes(row.status))"
trigger="click" @command="(cmd) => moreAction(row, cmd)">
<el-button size="small">更多 ▾</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item v-if="can('produce.workorder:edit') && row.status === 'CREATED'" command="edit">编辑</el-dropdown-item>
<el-dropdown-item v-if="can('produce.workorder:delete') && ['CREATED','PENDING','CONFIRMED'].includes(row.status)" command="del" divided>删除</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
</el-table-column>
</el-table>
</el-card>
<!-- 新建/编辑工单 -->
<el-dialog v-model="dialog.show" :title="dialog.id ? '编辑工单' : '新建工单'" width="640px">
<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-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="随产品型号自动带出" :disabled="dialog.productTypeId > 0" />
</el-form-item>
<el-form-item label="产品名称">
<el-input v-model="dialog.productName" placeholder="随产品型号自动带出" :disabled="dialog.productTypeId > 0" />
</el-form-item>
<el-form-item label="合同号"><el-input v-model="dialog.contractNo" placeholder="一个合同对应一个工程编号" /></el-form-item>
<el-form-item label="工程编号"><el-input v-model="dialog.projectNo" placeholder="工程编号下挂各产品序号" /></el-form-item>
<el-form-item label="产品序号"><el-input v-model="dialog.productSerial" placeholder="本产品在该工程下的序号" /></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"
placeholder="请选择完成日期(必填)" style="width:100%" />
</el-form-item>
<el-form-item label="开始时间">
<el-date-picker v-model="dialog.planStart" type="date" value-format="YYYY-MM-DD"
placeholder="计划开始日期(选填)" style="width:100%" />
</el-form-item>
<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 }} 个工位)
</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>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialog.show=false">取消</el-button>
<el-button v-if="can('produce.workorder:add') || can('produce.workorder:edit')" type="primary" @click="save">保存</el-button>
</template>
</el-dialog>
<!-- 自动排产(引导式,Item K) -->
<el-dialog v-model="sched.show" :title="`自动排产 - ${sched.orderNo}`" width="640px">
<el-alert type="info" :closable="false" style="margin-bottom:14px"
title="自动排产仅排「未开工数量 = 工单总数 − 已完工 − 在产未完工」,生成后状态为未启用(PENDING),需到「日排产」页面人工启用后生效。" />
<el-alert type="info" :closable="false" style="margin-bottom:14px"
:title="`项目开始:${fmtDateOnly(sched.planStart)} 结束:${fmtDateOnly(sched.dueDate)} 工单数量:${sched.quantity} 已完工:${sched.finishedNum}`" />
<el-form :model="sched" label-width="100px">
<el-form-item label="排产模式">
<el-radio-group v-model="sched.mode">
<el-radio value="AVG">平均分摊</el-radio>
<el-radio value="FIXED">固定日产</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="sched.mode === 'FIXED'" label="每日产量">
<el-input-number v-model="sched.dailyQty" :min="1" />
</el-form-item>
<el-form-item label="日期区间">
<div style="width:100%">
<div v-for="(seg, i) in sched.segments" :key="i" style="display:flex;gap:8px;margin-bottom:8px;align-items:center">
<el-date-picker v-model="seg.range" type="daterange" value-format="YYYY-MM-DD"
start-placeholder="开始" end-placeholder="结束" style="width:280px" />
<el-button v-if="sched.segments.length > 1" type="danger" plain size="small" @click="removeSegment(i)">删除</el-button>
</div>
<el-button size="small" @click="addSegment">+ 添加区间</el-button>
<div class="sched-tip">可多段(如 6/23-26 + 6/28-29),区间并集去重排序</div>
</div>
</el-form-item>
<el-form-item label="预览">
<div class="sched-preview">
<div>共 {{ previewDates.length }} 天:{{ previewDates.join('、') || '-' }}</div>
<div v-if="sched.mode === 'AVG' && previewDates.length">平均分摊到 {{ previewDates.length }} 天(余数补前几天)</div>
<div v-if="sched.mode === 'FIXED' && previewDates.length">每日 {{ sched.dailyQty }} 件 × {{ previewDates.length }} 天(超未开工数量将被拒)</div>
<div v-if="sched.mode === 'FIXED' && previewDates.length" :class="{ 'sched-warn': previewTotal > sched.quantity }">
本次计划总量 {{ previewTotal }},工单数量 {{ sched.quantity }}<span v-if="previewTotal > sched.quantity">(超出工单数量,保存将被拒绝)</span>
</div>
</div>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="sched.show=false">取消</el-button>
<el-button v-if="can('produce.workorder:dailyplan')" type="primary" @click="submitAutoSchedule">确认排产</el-button>
</template>
</el-dialog>
</div>
<PageHelp :data="helpWorkOrder" page="WorkOrder" />
</template>
<script setup>
import { ref, reactive, computed, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import request from '../utils/request'
import { can } from '../utils/perm'
import { fmtDateOnly, fmtTime } from '../utils/format'
import PageHelp from '../components/PageHelp.vue'
import { helpWorkOrder } from '../help'
const statusOptions = [
{ v: 'CREATED', l: '已创建' }, { v: 'RELEASED', l: '已下发' },
{ v: 'IN_PROGRESS', l: '执行中' }, { v: 'PAUSED', l: '已暂停' },
{ v: 'DONE', l: '已完成' }, { v: 'CANCELLED', l: '已取消' }
]
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || s
// 状态流转:给出当前状态可执行的下一个动作(按钮文案随当前状态变化)
function statusActionBtn(status) {
const map = {
CREATED: '下发 ▾', PENDING: '下发 ▾', CONFIRMED: '开工 ▾',
RELEASED: '开工 ▾', IN_PROGRESS: '执行中 ▾', PAUSED: '已暂停 ▾'
}
return map[status] || ''
}
function statusActions(status) {
const map = {
CREATED: [{ v: 'RELEASED', l: '下发工单' }, { v: 'CANCELLED', l: '取消工单' }],
PENDING: [{ v: 'RELEASED', l: '下发工单' }, { v: 'CANCELLED', l: '取消工单' }],
CONFIRMED: [{ v: 'IN_PROGRESS', l: '开始执行' }, { v: 'CANCELLED', l: '取消工单' }],
RELEASED: [{ v: 'IN_PROGRESS', l: '开始执行' }, { v: 'CANCELLED', l: '取消工单' }],
IN_PROGRESS: [{ v: 'PAUSED', l: '暂停' }, { v: 'DONE', l: '完工' }],
PAUSED: [{ v: 'IN_PROGRESS', l: '恢复执行' }, { v: 'CANCELLED', l: '取消工单' }]
}
return map[status] || []
}
const query = reactive({ orderNo: '', productCode: '', productName: '', contractNo: '', projectNo: '', status: '', dueRange: null })
const list = ref([])
const productTypes = ref([])
// 工艺组合:数据源=工位(含 flowId/flowName)+ 工艺列表;按工艺分组勾选工位
const stations = ref([])
const flows = ref([])
const selStations = 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())
arr.sort((a, b) => {
if (a.flowId === 0) return 1
if (b.flowId === 0) return -1
return (a.flowName || '').localeCompare(b.flowName || '', 'zh')
})
return arr.map((g) => ({
key: g.flowId,
flowId: g.flowId,
title: g.flowId ? (g.flowName || `工艺${g.flowId}`) : '未绑定工艺',
stations: [...g.stations].sort((a, b) => (a.stationNo || 0) - (b.stationNo || 0))
}))
})
// 组合结果 [{flowId,stationNo}]:勾选工位映射其绑定工艺;按工位号升序即执行路线
const flowCombination = computed(() =>
stations.value
.filter((s) => s.flowId > 0 && selStations.value.includes(s.stationNo))
.map((s) => ({ flowId: s.flowId, stationNo: s.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() {
return stations.value.filter((s) => s.flowId > 0).map((s) => s.stationNo).sort((a, b) => a - b)
}
async function loadComboData() {
try {
stations.value = (await request.get('/stations')) || []
} catch { stations.value = [] }
try {
flows.value = (await request.get('/process-flows', { params: { page: 1, pageSize: 1000 } }))?.list || []
} catch { flows.value = [] }
}
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED' })
async function load() {
const [dueFrom, dueTo] = query.dueRange || []
const params = {
orderNo: query.orderNo, productCode: query.productCode, productName: query.productName,
contractNo: query.contractNo, projectNo: query.projectNo, status: query.status,
dueFrom: dueFrom || '', dueTo: dueTo || ''
}
const data = await request.get('/work-orders', { params })
list.value = data || []
}
async function loadProducts() {
productTypes.value = (await request.get('/product-types', { params: { isActive: 'true' } })) || []
}
function genOrderNo() {
const d = new Date()
const ymd = `${d.getFullYear()}${String(d.getMonth() + 1).padStart(2, '0')}${String(d.getDate()).padStart(2, '0')}`
return `WO-${ymd}-001`
}
// Q1=A:选产品型号后自动带出产品编号/名称(只读,避免手填错位)
function onProductTypeChange(id) {
const p = productTypes.value.find((x) => x.id === id)
if (p) {
dialog.productCode = p.code || ''
dialog.productName = p.name || ''
} else {
dialog.productCode = ''
dialog.productName = ''
}
}
function openCreate() {
Object.assign(dialog, { show: true, id: 0, workOrderNo: genOrderNo(), productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', status: 'CREATED' })
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 || '', projectNo: row.projectNo || '', 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 })
selStations.value = hasCombination(row)
? [...new Set(row.flowCombination.map((c) => c.stationNo))].sort((a, b) => a - b)
: defaultSelStations()
}
async function save() {
if (!dialog.dueDate) return ElMessage.warning('请选择完成日期(必填)')
if (!flowCombination.value.length) return ElMessage.warning('请至少勾选一个工位形成工艺组合')
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, contractNo: dialog.contractNo, projectNo: dialog.projectNo, 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)
ElMessage.success('保存成功')
dialog.show = false
load()
}
async function changeStatus(row, status) {
const label = statusText(status)
// 取消/暂停允许填原因(可选),写入操作日志
let reason = ''
if (status === 'CANCELLED' || status === 'PAUSED') {
try {
const r = await ElMessageBox.prompt(
`确认将工单「${row.workOrderNo}」${label}?可填写原因(用于操作日志,可留空)。`,
label, { type: 'warning', confirmButtonText: '确认' })
reason = (r.value || '').trim()
} catch {
return // 用户取消输入 → 放弃本次操作
}
} else {
await ElMessageBox.confirm(`确认将工单「${row.workOrderNo}」${label}?`, '提示', { type: 'warning' })
}
await request.post('/work-orders/status', { id: row.id, status, reason })
ElMessage.success(`已${label}`)
load()
}
async function del(row) {
await ElMessageBox.confirm(
`确认删除工单「${row.workOrderNo}」?\n仅「已创建」状态且无排产、备料、生产数据的工单可删除。`,
'删除工单', { type: 'warning', confirmButtonText: '删除', confirmButtonClass: 'el-button--danger' })
await request.delete(`/work-orders/${row.id}`)
ElMessage.success('工单已删除')
load()
}
// 操作列「更多」菜单分发:工位组合 / 编辑 / 删除
function moreAction(row, cmd) {
if (cmd === 'edit') openEdit(row)
else if (cmd === 'del') del(row)
}
// ---- 自动排产(引导式,Item K)----
const sched = reactive({ show: false, orderNo: '', mode: 'AVG', dailyQty: 1, segments: [{ range: null }], planStart: '', dueDate: '', quantity: 0, finishedNum: 0 })
function openAutoSchedule(row) {
Object.assign(sched, {
show: true, orderNo: row.workOrderNo, mode: 'AVG', dailyQty: 1, segments: [{ range: null }],
planStart: row.planStart || '', dueDate: row.dueDate || '', quantity: row.quantity || 0, finishedNum: row.finishedNum || 0
})
}
function addSegment() { sched.segments.push({ range: null }) }
function removeSegment(i) { sched.segments.splice(i, 1) }
// 客户端展开日期区间(与后端 expandDates 一致):并集去重升序,仅用于预览
const previewDates = computed(() => {
const seen = new Set()
const out = []
const p = (n) => String(n).padStart(2, '0')
for (const seg of sched.segments) {
const r = seg.range
if (!r || r.length !== 2 || !r[0] || !r[1]) continue
const start = new Date(r[0] + 'T00:00:00')
const end = new Date(r[1] + 'T00:00:00')
if (Number.isNaN(start.getTime()) || Number.isNaN(end.getTime()) || end < start) continue
for (const d = new Date(start); d <= end; d.setDate(d.getDate() + 1)) {
const ds = `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`
if (!seen.has(ds)) { seen.add(ds); out.push(ds) }
}
}
return out.sort()
})
// 本次排产计划总量(仅用于前端提示);AVG 模式后端按未开工数量自动均摊,此处不预估精确值
const previewTotal = computed(() => {
if (!previewDates.length) return 0
if (sched.mode === 'FIXED') return sched.dailyQty * previewDates.length
return 0
})
async function submitAutoSchedule() {
const segments = sched.segments
.filter((s) => s.range && s.range.length === 2 && s.range[0] && s.range[1])
.map((s) => ({ start: s.range[0], end: s.range[1] }))
if (!segments.length) return ElMessage.warning('请至少选择一个日期区间')
if (sched.mode === 'FIXED' && sched.dailyQty <= 0) return ElMessage.warning('固定日产需填写每日产量(>0)')
await request.post('/work-orders/auto-schedule', {
orderNo: sched.orderNo, mode: sched.mode, dailyQty: sched.dailyQty, segments
})
ElMessage.success('自动排产已生成(待人工启用)')
sched.show = false
}
onMounted(async () => { load(); loadProducts(); loadComboData() })
</script>
<style scoped>
.sched-tip { font-size: 12px; color: #909399; margin-top: 4px; }
.sched-preview { font-size: 13px; color: #606266; line-height: 1.7; background: #f5f7fa; padding: 8px 12px; border-radius: 4px; width: 100%; }
.combo-group { display: flex; flex-wrap: wrap; gap: 4px 12px; align-items: flex-start; width: 100%; }
.combo-group-title { width: 100%; font-size: 12px; font-weight: 600; color: #303133; background: #f5f7fa; padding: 4px 8px; border-radius: 4px; margin-top: 4px; }
.combo-group-title.combo-empty { color: #909399; font-weight: 500; }
.combo-station-name { margin-left: 6px; font-size: 12px; color: #909399; }
.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%; }
</style>