feat: 大屏多订单改为同屏并列展示,物料申请新增跨工位借料来源并移除工单完成日期
This commit is contained in:
@@ -43,7 +43,7 @@ export const helpWorkOrder = {
|
||||
{ name: '数量', source: '手工填写整数。', purpose: '本工单生产总数量(合同台数),决定需求量与排产上限', fill: '整数 ≥1,如 100' },
|
||||
{ name: '工序工位', source: '按产品工艺的工序顺序,每道工序从下拉选一个工位(候选=工位管理里绑定该工序的启用工位)。保存为 [{flowId,stationNo}]。', purpose: '本工单的执行路线;自动排产/备料拆分/产线下发均按此组合派生', fill: '系统按工艺顺序自动推荐工位(第1道取候选最小工位,第N道取大于上一道已选且候选最小的工位);可逐道修改,下拉只列合法候选(第N道候选=绑定该工序且工位号>第N-1道已选);工位号须按工序顺序严格递增' },
|
||||
{ name: '状态', source: '新建时选"已创建",后续由流程推进。', purpose: '工单生命周期:创建→发布→生产→完成', fill: '新建时选"已创建";也可在列表操作列点「状态」快捷流转(发布/开工/完工)' },
|
||||
{ name: '要求完成日期', source: '手工填写,建单/编辑时必填。', purpose: '记录工单要求/承诺完成日期,用于交付与绩效统计;与「实际完成」(系统记录的真实完工时间)是两个独立字段', fill: '建单时选择日期,必填' },
|
||||
{ name: '计划开始 / 计划完成', source: '建单/编辑时选填(计划开始可空)。', purpose: '记录工单计划交付窗口;系统不再单独维护「要求完成日期」字段(已移除)', fill: '建单时选择日期' },
|
||||
{ name: '时间字段口径', source: '建单填写 + 系统自动记录。', purpose: '计划开始/计划完成=建单填写的计划区间;实际开始=首次"下发并开工"的时间(系统落库);实际完成=本工单全部工件报工完成、置"已完成"的时间(系统落库)。("完成日期"是要求/承诺完成日期,属上一条独立字段)', fill: '建单填计划开始/计划完成(选填);实际开始/实际完成由系统自动写,无需手填' },
|
||||
{ name: '创建人', source: '系统自动记录(当前登录账号)。', purpose: '追溯工单由谁创建', fill: '只读,自动带入' }
|
||||
]
|
||||
|
||||
@@ -63,8 +63,10 @@ import { helpAlertRule } from '../help'
|
||||
// 各类型规则含义与阈值单位(前端展示用,阈值统一存 float;0=未配置不触发)
|
||||
const ruleMeta = {
|
||||
inspection_ng: { label: '检验不合格', unit: '', note: '事件触发型:出现检验不合格即报警,阈值暂不使用' },
|
||||
inventory_low: { label: '库存低于阈值', unit: '件', note: '当某物料可用库存低于该件数时报警' },
|
||||
task_overdue: { label: '任务超期', unit: '小时', note: '当工单超过该小时数仍未完工时报警' }
|
||||
inventory_low: { label: '库存低于阈值', unit: '件', note: '当某物料可用库存低于该件数时报警(库存真源在 WMS,常规缺货预警用 WMS 侧规则)' },
|
||||
task_overdue: { label: '任务超期', unit: '小时', note: '当工单计划结束时间已过且未完工超过该小时数时报警;0=任何超期即报' },
|
||||
call_overdue: { label: '叫料备料超时', unit: '小时', note: '叫料单待备料(PENDING)超过该小时数即报警;0=超 1 小时即报' },
|
||||
agv_failed: { label: 'AGV任务失败', unit: '', note: '事件型:AGV 派车任务失败(近24小时内)即报警,阈值不使用' }
|
||||
}
|
||||
|
||||
const rules = ref([])
|
||||
|
||||
@@ -272,7 +272,6 @@
|
||||
<template #default="{ row }">{{ productNameOfUnplanned(row) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="quantity" label="数量" width="80" />
|
||||
<el-table-column prop="dueDate" label="完成日期" width="120" />
|
||||
<el-table-column label="状态" width="100">
|
||||
<template #default="{ row }"><el-tag size="small">{{ woStatusText(row.status) }}</el-tag></template>
|
||||
</el-table-column>
|
||||
@@ -336,7 +335,7 @@ const total = ref(0)
|
||||
const page = ref(1)
|
||||
const pageSize = ref(50)
|
||||
const productTypes = ref([])
|
||||
const dialog = reactive({ show: false, id: 0, orderNo: '', planDate: '', planRange: [], mode: 'AVG', planQty: 1, productType: '', productCode: '', productName: '', woQty: '', woStart: '', woDue: '', stationPlanQty: {}, combination: [] })
|
||||
const dialog = reactive({ show: false, id: 0, orderNo: '', planDate: '', planRange: [], mode: 'AVG', planQty: 1, productType: '', productCode: '', productName: '', woQty: '', woStart: '', woPlanEnd: '', stationPlanQty: {}, combination: [] })
|
||||
|
||||
// 工位号→接驳台编码、工位号→名称
|
||||
const stationDockMap = ref({})
|
||||
@@ -583,7 +582,7 @@ async function loadWorkOrderInfo() {
|
||||
const wo = await ensureWorkOrder(dialog.orderNo)
|
||||
if (!wo) {
|
||||
dialog.productType = ''; dialog.productCode = ''; dialog.productName = ''; dialog.woQty = ''
|
||||
dialog.combination = []; dialog.woStart = ''; dialog.woDue = ''
|
||||
dialog.combination = []; dialog.woStart = ''; dialog.woPlanEnd = ''
|
||||
return
|
||||
}
|
||||
dialog.productCode = wo.productCode || ''
|
||||
@@ -593,18 +592,18 @@ async function loadWorkOrderInfo() {
|
||||
const pt = productTypes.value.find((p) => p.id === wo.productTypeId)
|
||||
dialog.productType = pt ? (pt.name + (pt.code ? ' / ' + pt.code : '')) : ''
|
||||
dialog.woStart = wo.planStart ? String(wo.planStart).slice(0, 10) : ''
|
||||
dialog.woDue = wo.dueDate ? String(wo.dueDate).slice(0, 10) : ''
|
||||
dialog.woPlanEnd = wo.planEnd ? String(wo.planEnd).slice(0, 10) : ''
|
||||
if (!dialog.id) {
|
||||
const today = todayStr()
|
||||
const start = dialog.woStart || today
|
||||
const end = dialog.woDue || addDays(7)
|
||||
const end = dialog.woPlanEnd || addDays(7)
|
||||
// 起期不晚于止期;若起期晚于止期(如止期已过期)则退化为单日,避免 el-date-picker 报错
|
||||
dialog.planRange = start <= end ? [start, end] : [end, end]
|
||||
}
|
||||
}
|
||||
async function onOrderChange() {
|
||||
await loadWorkOrderInfo()
|
||||
if (dialog.id && (dialog.woStart || dialog.woDue)) dialog.planDate = dialog.woStart || dialog.woDue
|
||||
if (dialog.id && (dialog.woStart || dialog.woPlanEnd)) dialog.planDate = dialog.woStart || dialog.woPlanEnd
|
||||
}
|
||||
function openAdd(presetOrderNo) {
|
||||
Object.assign(dialog, {
|
||||
@@ -624,7 +623,7 @@ function openEdit(row) {
|
||||
loadAlloc()
|
||||
}
|
||||
function warnOutOfWindow(dates) {
|
||||
const s = dialog.woStart || ''; const e = dialog.woDue || ''
|
||||
const s = dialog.woStart || ''; const e = dialog.woPlanEnd || ''
|
||||
if ((!s && !e) || !dialog.orderNo) return
|
||||
if (dates.some((d) => (s && d < s) || (e && d > e))) ElMessage.warning('所选日期超出工单执行期间')
|
||||
}
|
||||
|
||||
@@ -49,6 +49,12 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="stationNo" label="工位" width="70" align="center" />
|
||||
<el-table-column prop="targetDock" label="接驳台" width="100" align="center" />
|
||||
<el-table-column label="借料来源" min-width="170" align="center">
|
||||
<template #default="{row}">
|
||||
<span v-if="hasBorrow(row)" style="color:#e6a23c">{{ borrowText(row) }}</span>
|
||||
<span v-else>—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="reqQty" label="请求量" width="90" align="center" />
|
||||
<el-table-column label="实发量" width="90" align="center">
|
||||
<template #default="{row}">{{ Number(row.sentQty || 0) > 0 ? fmtQty(row.sentQty) : '—' }}</template>
|
||||
@@ -103,6 +109,21 @@ const STATUS_TAG = {
|
||||
const statusText = (s) => STATUS_TEXT[s] || s || '—'
|
||||
const statusTag = (s) => STATUS_TAG[s] || 'info'
|
||||
|
||||
// 借料来源:material_request.borrow_from(stationNo→借用量);本工位自取不计,仅展示真正借出的兄弟工位
|
||||
function hasBorrow(row) {
|
||||
const b = row.borrowFrom || {}
|
||||
const self = String(row.stationNo)
|
||||
return Object.entries(b).some(([k, v]) => Number(v) > 0 && String(k) !== self)
|
||||
}
|
||||
function borrowText(row) {
|
||||
const b = row.borrowFrom || {}
|
||||
const self = String(row.stationNo)
|
||||
const parts = Object.entries(b)
|
||||
.filter(([k, v]) => Number(v) > 0 && String(k) !== self)
|
||||
.map(([k, v]) => `工位${k}:${fmtQty(v)}`)
|
||||
return parts.length ? parts.join(',') : '—'
|
||||
}
|
||||
|
||||
function fmtQty(v) {
|
||||
const n = Number(v || 0)
|
||||
return Number.isInteger(n) ? String(n) : n.toFixed(2)
|
||||
@@ -116,13 +137,13 @@ async function load() {
|
||||
async function exportCsv() {
|
||||
if (!(await confirmExport(list.value.length, '叫料单记录'))) return
|
||||
const header = ['叫料单号', '来源', '图号', '物料名称', '单位', '序列号方式', '工位', '接驳台',
|
||||
'请求量', '实发量', '退库量', '跨日', 'WMS出库单号', '状态', '驳回理由', '数量不符单号', '操作人']
|
||||
'借料来源', '请求量', '实发量', '退库量', '跨日', 'WMS出库单号', '状态', '驳回理由', '数量不符单号', '操作人']
|
||||
const srcOf = (r) => (r.source === 'REFILL' ? '数量不符补发' : '工位叫料')
|
||||
const lines = [header.join(',')]
|
||||
for (const r of list.value) {
|
||||
const cells = [
|
||||
r.requestNo, srcOf(r), r.materialCode, r.materialName, r.unit,
|
||||
r.snMode === 1 ? '序列号=是' : '序列号=否', r.stationNo, r.targetDock,
|
||||
r.snMode === 1 ? '序列号=是' : '序列号=否', r.stationNo, r.targetDock, borrowText(r),
|
||||
r.reqQty, r.sentQty, r.returnedQty, r.crossDay ? '非当日' : '',
|
||||
r.outboundNo, statusText(r.status), r.rejectReason, r.refReportNo, r.operator
|
||||
]
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:10px"
|
||||
title="产品工艺 = 某产品的加工工序顺序(第1道、第2道…)。新建工单选产品型号后,系统按这里的工序顺序,自动为每道工序推荐一个工位:后道工位号必须大于前道(工件在产线上单向流转、不回头),每道可改,改后后续候选自动更新。本页同时可打印路线卡给车间使用。" />
|
||||
<el-form inline>
|
||||
<el-form-item label="产品">
|
||||
<el-input v-model="query.productCode" placeholder="产品序号/名称 模糊" clearable style="width:170px" @keyup.enter="load" />
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<el-button @click="resetFilters">重置</el-button>
|
||||
<el-button v-if="can('produce.product:add')" type="primary" plain @click="openAdd">新增物料档案</el-button>
|
||||
<el-button v-if="can('produce.product:add')" @click="downloadTemplate">模板下载</el-button>
|
||||
<el-button v-if="can('produce.product:add')" @click="triggerImport">Excel 导入</el-button>
|
||||
<el-button v-if="can('produce.product:add')" :loading="importing" @click="triggerImport">Excel 导入</el-button>
|
||||
<el-button @click="exportXlsx">导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -255,30 +255,48 @@ async function downloadTemplate() {
|
||||
a.click()
|
||||
URL.revokeObjectURL(a.href)
|
||||
} catch (e) {
|
||||
ElMessage.error('模板下载失败')
|
||||
ElMessage.error(e?.response?.data?.message || '模板下载失败:网络异常,请稍后重试')
|
||||
}
|
||||
}
|
||||
|
||||
// Excel 导入:隐藏 file input 触发 → 上传 → 展示结果(成功/失败行明细)
|
||||
// Excel 导入(2026-11-02 条目16:与 WMS 物料档案导入同风格):
|
||||
// 选文件 → 二次确认(文件名+影响说明)→ 上传 → 结构化结果(成功条数 / 失败行明细弹窗)→ 刷新列表
|
||||
const importInput = ref(null)
|
||||
const importing = ref(false)
|
||||
function triggerImport() { importInput.value && importInput.value.click() }
|
||||
async function onImportFile(e) {
|
||||
const file = e.target.files && e.target.files[0]
|
||||
if (e.target.value) e.target.value = '' // 允许重复选同一文件
|
||||
if (!file) return
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认导入物料文件「${file.name}」?导入将批量写入物料档案,失败行明细将在导入后逐行列出。`,
|
||||
'批量导入确认', { type: 'warning', confirmButtonText: '确认导入', cancelButtonText: '取消' })
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
importing.value = true
|
||||
const fd = new FormData()
|
||||
fd.append('file', file)
|
||||
try {
|
||||
const res = await request.post('/product-types/import', fd, { headers: { 'Content-Type': 'multipart/form-data' } })
|
||||
const r = res || {}
|
||||
const detail = (r.errors || []).slice(0, 8).map((x) => `第${x.row}行:${x.message}`).join('\n')
|
||||
ElMessage.success(`导入完成:成功 ${r.success || 0} 行,失败 ${r.failed || 0} 行${detail ? '\n' + detail : ''}`)
|
||||
if ((r.failed || 0) > 0) {
|
||||
console.warn('物料档案导入失败明细', r.errors)
|
||||
const errs = r.errors || []
|
||||
if (errs.length) {
|
||||
const lines = errs.slice(0, 10).map((x) => `第${x.row}行 ${x.materialCode || ''}:${x.message}`).join(';')
|
||||
ElMessageBox.alert(
|
||||
lines + (errs.length > 10 ? ` …(共 ${errs.length} 条失败明细,请修正后重新导入失败行)` : '(请修正后重新导入失败行)'),
|
||||
`导入完成:成功 ${r.success || 0} 行,失败 ${errs.length} 行`,
|
||||
{ type: 'warning', confirmButtonText: '知道了' }
|
||||
).catch(() => {})
|
||||
} else {
|
||||
ElMessage.success(`导入成功 ${r.success || 0} 条`)
|
||||
}
|
||||
load()
|
||||
} catch (err) {
|
||||
ElMessage.error(err?.response?.data?.message || err?.message || '导入失败')
|
||||
} finally {
|
||||
importing.value = false
|
||||
}
|
||||
}
|
||||
async function exportXlsx() {
|
||||
|
||||
@@ -35,6 +35,10 @@
|
||||
<el-input-number v-model="form.allowCrossDay" :min="0" :max="1" />
|
||||
<div class="tip">1=允许(默认,叫料池含非今日排产时工位端预警提示,仓库可正常发也可按「非当日」驳回);0=禁止</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许跨工位借料">
|
||||
<el-input-number v-model="form.allowBorrow" :min="0" :max="1" />
|
||||
<div class="tip">1=允许(默认):工位自身额度不足时,可手动从「同工艺其他工位」的剩余额度借料;0=禁止,超额叫料直接拒绝</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="拧紧不合格报警">
|
||||
<el-switch v-model="form.torqueNgAlert" />
|
||||
<div class="tip">开启(默认)后,拧紧扭矩不合格立即在预警中心产生报警;关闭则只记录不合格标记、不弹报警</div>
|
||||
@@ -95,7 +99,7 @@ const loading = ref(false)
|
||||
const saving = ref(false)
|
||||
const testing = ref(false)
|
||||
const testMsg = ref('')
|
||||
const form = reactive({ wmsBaseURL: '', demandDays: 5, extrapWindow: 3, extrapCap: 365, logRetentionDays: 0, pipelineCache: 0, allowCrossDay: 1, torqueNgAlert: true, dashboardRefreshSeconds: 5, archiveRemindDays: 7, dashboardTitle: '', dashboardVoice: true })
|
||||
const form = reactive({ wmsBaseURL: '', demandDays: 5, extrapWindow: 3, extrapCap: 365, logRetentionDays: 0, pipelineCache: 0, allowCrossDay: 1, allowBorrow: 1, torqueNgAlert: true, dashboardRefreshSeconds: 5, archiveRemindDays: 7, dashboardTitle: '', dashboardVoice: true })
|
||||
const info = ref({})
|
||||
|
||||
async function load() {
|
||||
@@ -110,6 +114,7 @@ async function load() {
|
||||
logRetentionDays: data.logRetentionDays ?? 0,
|
||||
pipelineCache: data.pipelineCache ?? 0,
|
||||
allowCrossDay: data.allowCrossDay ?? 1,
|
||||
allowBorrow: data.allowBorrow ?? 1,
|
||||
torqueNgAlert: data.torqueNgAlert ?? true,
|
||||
dashboardRefreshSeconds: data.dashboardRefreshSeconds ?? 5,
|
||||
archiveRemindDays: data.archiveRemindDays ?? 7,
|
||||
|
||||
@@ -94,20 +94,13 @@
|
||||
<span v-else style="color:#909399">全部显示</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="120" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="230" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<div style="display:flex;align-items:center;justify-content:center;gap:8px">
|
||||
<div style="display:flex;align-items:center;justify-content:center;gap:8px;flex-wrap:wrap">
|
||||
<el-button v-if="can('produce.station:edit') && !row.isBuiltin && row.stationType !== 'OFFLINE'" link type="primary" size="small" @click="openName(row)">编辑</el-button>
|
||||
<el-dropdown trigger="click" @command="(c) => stationCommand(row, c)">
|
||||
<el-button link type="primary" size="small">更多 ▾</el-button>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item command="tabs">页签</el-dropdown-item>
|
||||
<el-dropdown-item v-if="can('produce.station:edit')" :command="row.status === 'ENABLED' ? 'disable' : 'enable'" :style="row.status === 'ENABLED' ? 'color:#e6a23c' : ''">{{ row.status === 'ENABLED' ? '停用' : '启用' }}</el-dropdown-item>
|
||||
<el-dropdown-item v-if="can('produce.station:delete') && !row.isBuiltin" command="del" divided style="color:#f56c6c">删除</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
<el-button link type="primary" size="small" @click="openTabs(row)">页签</el-button>
|
||||
<el-button v-if="can('produce.station:edit')" link size="small" :type="row.status === 'ENABLED' ? 'warning' : 'success'" @click="toggleStationStatus(row)">{{ row.status === 'ENABLED' ? '停用' : '启用' }}</el-button>
|
||||
<el-button v-if="can('produce.station:delete') && !row.isBuiltin" link type="danger" size="small" @click="remove(row)">删除</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -116,21 +109,25 @@
|
||||
<el-dialog v-model="dlg.show" :title="dlg.title" width="440px">
|
||||
<el-form :model="dlg" label-width="90px">
|
||||
<el-form-item label="工位号" required>
|
||||
<el-input-number v-model="dlg.stationNo" :min="0" :max="999" :disabled="!dlg.isAdd" style="width:100%" />
|
||||
<el-input-number v-model="dlg.stationNo" :min="-999" :max="999" :disabled="!dlg.isAdd" style="width:100%" />
|
||||
<div v-if="dlg.isAdd && dlg.stationNo >= 1 && dlg.stationNo <= 12" style="color:#F56C6C;font-size:12px;line-height:1.5;margin-top:4px">
|
||||
物理工位 1~12 为硬件锁定,不可新增
|
||||
</div>
|
||||
<div v-if="dlg.isAdd" style="color:#909399;font-size:12px;line-height:1.5;margin-top:4px">
|
||||
1~12 为物理产线工位(已锁定),0 为虚拟工位,≥13 为扩展工位。创建后不可修改。
|
||||
1~12 为物理产线工位(已锁定,中间连续、不可插入虚拟工位);负数(-1、-2…)为产线前段虚拟工位(排在工位1之前);≥13 为扩展工位。创建后不可修改。
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="工位名称" required>
|
||||
<el-input v-model="dlg.name" placeholder="如 一号装配工位" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工位类型">
|
||||
<span>{{ dlg.stationType === 'OFFLINE' ? '线下位(虚拟,不连 PLC)' : '线上位(连 PLC)' }}</span>
|
||||
<el-select v-if="!dlg.isBuiltin" v-model="dlg.stationType" style="width:100%">
|
||||
<el-option value="OFFLINE" label="线下位(虚拟,不连 PLC,仅记录)" />
|
||||
<el-option value="LINE" label="线上位(连 PLC)" />
|
||||
</el-select>
|
||||
<span v-else>{{ dlg.stationType === 'OFFLINE' ? '线下位(虚拟,不连 PLC)' : '线上位(连 PLC)' }}</span>
|
||||
<div style="color:#909399;font-size:12px;line-height:1.5;margin-top:4px">
|
||||
工位类型由系统按产线初始配置固定,不可修改。
|
||||
{{ dlg.isBuiltin ? '内置工位类型由产线初始配置固定,不可修改。' : '非内置工位可调整类型(看板按「线下位」统计虚拟工位)。' }}
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -232,12 +229,7 @@ async function toggleStationStatus(row) {
|
||||
load()
|
||||
}
|
||||
|
||||
// 操作列「更多 ▾」分发:页签 / 停用·启用 / 删除(启停互斥:启用显「停用」、停用显「启用」)
|
||||
function stationCommand(row, c) {
|
||||
if (c === 'tabs') openTabs(row)
|
||||
else if (c === 'disable' || c === 'enable') toggleStationStatus(row)
|
||||
else if (c === 'del') remove(row)
|
||||
}
|
||||
// 操作列按钮已外露(2026-11-02):页签/停用·启用/删除直接绑定,不再经"更多"下拉分发
|
||||
|
||||
const dlg = reactive({ show: false, isAdd: false, title: '', id: 0, stationNo: 1, name: '', stationType: 'OFFLINE', isBuiltin: false })
|
||||
|
||||
|
||||
@@ -19,10 +19,6 @@
|
||||
<el-form-item label="归属编号">
|
||||
<el-input v-model="query.contractNo" placeholder="合同号/科技项目号 模糊查询" clearable style="width:170px" @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" />
|
||||
@@ -69,9 +65,6 @@
|
||||
<el-table-column label="创建日期" width="160">
|
||||
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="要求完成日期" width="120">
|
||||
<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>
|
||||
@@ -144,16 +137,12 @@
|
||||
: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>
|
||||
已按该产品的「产品工艺」自动为每道工序推荐一个执行工位(工件在产线上不回头,后道工位号必须大于前道);每道可改,改后后续工序的候选自动更新。
|
||||
<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"
|
||||
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%" />
|
||||
@@ -162,6 +151,8 @@
|
||||
<el-date-picker v-model="dialog.planEnd" type="date" value-format="YYYY-MM-DD"
|
||||
placeholder="计划完成日期(选填)" style="width:100%" />
|
||||
</el-form-item>
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:8px"
|
||||
title="交付日期以「计划开始 / 计划完成」为准;本系统不再单独维护「要求完成日期」字段。" />
|
||||
<el-form-item label="工序工位" required>
|
||||
<div style="width:100%">
|
||||
<el-alert v-if="!dialog.productProcessId" type="info" :closable="false" style="margin-bottom:8px"
|
||||
@@ -171,13 +162,14 @@
|
||||
<div class="combo-row combo-head">
|
||||
<span class="combo-col-seq">工序</span>
|
||||
<span class="combo-col-flow">工序(工艺)</span>
|
||||
<span class="combo-col-station">工位(按工序顺序递增)</span>
|
||||
<span class="combo-col-station">工位(可多选,按工序顺序递增)</span>
|
||||
</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-select v-model="r.stationNos" multiple collapse-tags collapse-tags-tooltip
|
||||
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>
|
||||
@@ -187,9 +179,9 @@
|
||||
<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>
|
||||
<span class="combo-route-tip">(按工位号从小到大依次执行)</span>
|
||||
</div>
|
||||
<div class="combo-tip">系统按「工序顺序 + 工位号严格递增(产线单向不回头)」自动推荐默认工位;改某道后,后续工序候选自动重算,非法组合无法选到。保存时后端仍会二次校验。</div>
|
||||
<div class="combo-tip">每道工序执行一个工位;推荐规则与组合校验说明见「产品工艺」页顶部说明。</div>
|
||||
</template>
|
||||
<div v-else class="combo-tip">该产品暂无产品工艺或工艺未配置工序,暂无可推荐的工序工位。可到「产品工艺」页创建后重新选择产品型号;不选产品工艺时工单可不带工艺组合(排产/开工前须配置)。</div>
|
||||
</div>
|
||||
@@ -206,7 +198,7 @@
|
||||
<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}`" />
|
||||
:title="`项目开始:${fmtDateOnly(sched.planStart)} 工单数量:${sched.quantity} 已完工:${sched.finishedNum}`" />
|
||||
<el-form :model="sched" label-width="100px">
|
||||
<el-form-item label="排产模式">
|
||||
<el-radio-group v-model="sched.mode">
|
||||
@@ -267,7 +259,7 @@
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:12px"
|
||||
title="物料跟着工单走:按该工单的工艺组合 × 各工艺的物料清单实时汇总(同成品不同工单可用不同工艺)。单台含损耗用量 = Σ 各行单台用量 × (1+损耗率%),是备料/反冲的计算口径。" />
|
||||
<el-table :data="usage.rows" border size="small" v-loading="usage.loading"
|
||||
empty-text="该工单工艺组合未配置物料清单">
|
||||
:empty-text="usage.emptyTip || '该工单工艺组合未配置物料清单'">
|
||||
<el-table-column prop="materialCode" label="图号" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="spec" label="规格" min-width="120" show-overflow-tooltip />
|
||||
@@ -345,7 +337,7 @@
|
||||
<el-descriptions-item label="已排产量">{{ detail.row.scheduledQty ?? 0 }} 台</el-descriptions-item>
|
||||
<el-descriptions-item label="剩余未排产量">{{ detail.row.remainQty ?? 0 }} 台</el-descriptions-item>
|
||||
<el-descriptions-item label="产品序号">{{ detail.row.productSerial || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="要求完成日期">{{ fmtDateOnly(detail.row.dueDate) }}</el-descriptions-item>
|
||||
<el-descriptions-item label="计划完成">{{ fmtDateOnly(detail.row.planEnd) }}</el-descriptions-item>
|
||||
<el-descriptions-item label="计划开始">{{ fmtDateOnly(detail.row.planStart) }}</el-descriptions-item>
|
||||
<el-descriptions-item label="计划完成">{{ fmtDateOnly(detail.row.planEnd) }}</el-descriptions-item>
|
||||
<el-descriptions-item label="实际开始">{{ fmtDateOnly(detail.row.actualStart) }}</el-descriptions-item>
|
||||
@@ -437,7 +429,7 @@ const ownershipText = (t) => (ownershipOptions.find((o) => o.v === t) || {}).l |
|
||||
// 工件SN列表(详情抽屉):状态/当前工位/类型(sn_mode:1=序列号=是 2=序列号=否,取自产品图号对应物料档案)
|
||||
const pieceStatusMap = { NEW: '待上线', ONLINE: '已上线', PROCESSING: '在制', SEMI_STORED: '半成品入库', DONE: '完工', SCRAPPED: '报废' }
|
||||
const pieceStatusText = (s) => pieceStatusMap[s] || s
|
||||
const stationText = (n) => (n > 0 ? '工位' + n : '-')
|
||||
const stationText = (n) => (n !== 0 ? '工位' + n : '-')
|
||||
const snModeText = (m) => (m === 1 ? '序列号=是' : m === 2 ? '序列号=否' : '-')
|
||||
|
||||
// 状态流转:给出当前状态可执行的下一个动作(按钮文案随当前状态变化,方案 A)
|
||||
@@ -456,17 +448,18 @@ function statusActions(status) {
|
||||
return map[status] || []
|
||||
}
|
||||
|
||||
const query = reactive({ orderNo: '', productCode: '', productName: '', contractNo: '', ownershipType: '', status: '', dueRange: null })
|
||||
const query = reactive({ orderNo: '', productCode: '', productName: '', contractNo: '', ownershipType: '', status: '' })
|
||||
function resetFilters() {
|
||||
Object.assign(query, { orderNo: '', productCode: '', productName: '', contractNo: '', ownershipType: '', status: '', dueRange: null })
|
||||
Object.assign(query, { orderNo: '', productCode: '', productName: '', contractNo: '', ownershipType: '', status: '' })
|
||||
load()
|
||||
}
|
||||
const list = ref([])
|
||||
const productTypes = ref([])
|
||||
|
||||
// 工序工位:数据源=工位(含 flowId/flowName/stationNo/status/name)+ 产品工艺工序顺序
|
||||
// 模型=「每道工序选一个工位」(2026-10-20 工单建单需求:自动推荐+用户可改+动态约束)
|
||||
// processRows 每行 { seq, flowId, flowName, stationNo, options:[{stationNo,name}], error }
|
||||
// 模型=「每道工序可绑定多个有序工位」(2026-11-02 多工位同工序:工件按工位号升序依次经过各工位,
|
||||
// 同一工序的多个工位整体须排在上一道工序之后;产线单向不回头)。
|
||||
// processRows 每行 { seq, flowId, flowName, stationNos:[int], options:[{stationNo,name}], error }
|
||||
const stations = ref([])
|
||||
const flows = ref([])
|
||||
const processRows = ref([])
|
||||
@@ -483,8 +476,13 @@ function boundStations(flowId) {
|
||||
.sort((a, b) => a.stationNo - b.stationNo)
|
||||
}
|
||||
|
||||
// 按产品工艺工序顺序构建工序行,并贪心填默认工位:
|
||||
// 第1道取候选最小工位;第N道(N≥2)取「大于第N-1道已选工位」的候选最小工位
|
||||
// 已选工位中的最大工位号(无则返回 -Infinity,便于首道工序允许负数虚拟工位)
|
||||
function maxSelected(arr) {
|
||||
if (!arr || !arr.length) return -Infinity
|
||||
return Math.max(...arr)
|
||||
}
|
||||
|
||||
// 按产品工艺工序顺序构建工序行
|
||||
function buildProcessRows(pp) {
|
||||
comboStaleWarn.value = ''
|
||||
if (!pp || !pp.flows || !pp.flows.length) {
|
||||
@@ -499,29 +497,29 @@ function buildProcessRows(pp) {
|
||||
seq: it.seq,
|
||||
flowId: it.flowId,
|
||||
flowName: it.flowName || ('工序' + it.flowId),
|
||||
stationNo: 0,
|
||||
stationNos: [],
|
||||
options: [],
|
||||
error: ''
|
||||
}))
|
||||
recomputeCandidates(0)
|
||||
}
|
||||
|
||||
// 从 fromIdx 起重算候选 + 自动修正后续已选(不在新候选中则替换为最小候选)+ 收集红字
|
||||
// 从 fromIdx 起重算候选 + 自动修正(去掉越界选择、空则补最小候选)+ 收集红字。
|
||||
// 单调约束:本道工序全部工位须排在上一道工序全部工位之后(前向唯一约束),
|
||||
// 配合后端 ValidateWorkOrderComboStrict 的整区间严格递增校验。
|
||||
function recomputeCandidates(fromIdx) {
|
||||
let prev = fromIdx > 0 ? processRows.value[fromIdx - 1].stationNo : 0
|
||||
let prev = fromIdx > 0 ? maxSelected(processRows.value[fromIdx - 1].stationNos) : -Infinity
|
||||
for (let i = fromIdx; i < processRows.value.length; i++) {
|
||||
const r = processRows.value[i]
|
||||
const lower = i === 0 ? -1 : prev // 第1道无下限;后续=上一道已选工位号
|
||||
const lower = prev // 后续=上一道已选最大工位号(首道允许负数虚拟工位)
|
||||
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 // 无候选:留空,由红字提示
|
||||
// 仅保留仍合法的已选,去掉越界项
|
||||
r.stationNos = (r.stationNos || []).filter((n) => cands.some((o) => o.stationNo === n))
|
||||
if (r.stationNos.length === 0 && cands.length) {
|
||||
r.stationNos = [cands[0].stationNo] // 无候选以外的默认:补最小合法候选
|
||||
}
|
||||
prev = r.stationNo
|
||||
prev = r.stationNos.length ? maxSelected(r.stationNos) : lower
|
||||
}
|
||||
collectComboError()
|
||||
}
|
||||
@@ -530,10 +528,9 @@ function recomputeCandidates(fromIdx) {
|
||||
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}道工序`
|
||||
if ((!r.stationNos || r.stationNos.length === 0) && r.options.length === 0) {
|
||||
const prevNo = i > 0 ? maxSelected(processRows.value[i - 1].stationNos) : 0
|
||||
comboError.value = `工位${prevNo} 之后没有能做工序「${r.flowName}」的工位,请改选第${i + 1}道工序`
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -545,11 +542,11 @@ function onProcessStationChange(i) {
|
||||
recomputeCandidates(i + 1)
|
||||
}
|
||||
|
||||
// 组合结果(按工位号升序即执行路线):仅含已选工序
|
||||
// 组合结果(展开为 工序-工位 扁平条目,按工位号升序即执行路线):仅含已选工序
|
||||
const flowCombination = computed(() =>
|
||||
processRows.value
|
||||
.filter((r) => r.stationNo > 0)
|
||||
.map((r) => ({ flowId: r.flowId, stationNo: r.stationNo }))
|
||||
.flatMap((r) => (r.stationNos || []).map((n) => ({ flowId: r.flowId, stationNo: n })))
|
||||
.filter((c) => c.stationNo !== 0)
|
||||
.sort((a, b) => a.stationNo - b.stationNo)
|
||||
)
|
||||
const routeText = computed(() => flowCombination.value.map((c) => c.stationNo).join('→'))
|
||||
@@ -563,22 +560,22 @@ function buildEditProcessRows(row) {
|
||||
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
|
||||
const ns = combo.filter((x) => x.flowId === r.flowId && x.stationNo !== 0).map((x) => x.stationNo)
|
||||
r.stationNos = ns
|
||||
}
|
||||
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)
|
||||
if (c.flowId > 0 && c.stationNo !== 0) {
|
||||
if (!byFlow.has(c.flowId)) byFlow.set(c.flowId, [])
|
||||
byFlow.get(c.flowId).push(c.stationNo)
|
||||
}
|
||||
}
|
||||
const ordered = [...byFlow.entries()].sort((a, b) => a[1] - b[1])
|
||||
processRows.value = ordered.map(([fid, no], i) => {
|
||||
const ordered = [...byFlow.entries()].sort((a, b) => Math.min(...a[1]) - Math.min(...b[1]))
|
||||
processRows.value = ordered.map(([fid, nos], 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: '' }
|
||||
return { seq: i + 1, flowId: fid, flowName: f ? f.name : ('工序' + fid), stationNos: nos.slice().sort((a, b) => a - b), options: boundStations(fid), error: '' }
|
||||
})
|
||||
comboError.value = ''
|
||||
} else {
|
||||
@@ -630,9 +627,15 @@ async function loadComboData() {
|
||||
}
|
||||
|
||||
// ---------- 工单单台用料汇总(只读) ----------
|
||||
const usage = reactive({ show: false, orderNo: '', rows: [], loading: false })
|
||||
const usage = reactive({ show: false, orderNo: '', rows: [], loading: false, emptyTip: '' })
|
||||
async function openUsage(row) {
|
||||
Object.assign(usage, { show: true, orderNo: row.workOrderNo, rows: [], loading: true })
|
||||
// 空态细分(2026-11-02):接口对"组合为空"与"组合工艺均未配物料"都返回空数组,
|
||||
// 前端按工单快照组合区分提示,避免"先建单后配工艺物料"时误导为配置丢失
|
||||
const combo = Array.isArray(row.flowCombination) ? row.flowCombination : []
|
||||
const tip = combo.length
|
||||
? '该工单工艺组合中的工序尚未配置物料清单:请到「工艺」页为对应工序配置物料(物料实时按当前清单汇总,配置后重新打开即显示)。'
|
||||
: '该工单建单时未选择工序工位组合(快照为空):编辑工单选择产品工艺/工序工位并保存后,才能按组合汇总用料;仅事后配置工艺物料不会自动关联到已建工单。'
|
||||
Object.assign(usage, { show: true, orderNo: row.workOrderNo, rows: [], loading: true, emptyTip: tip })
|
||||
try {
|
||||
usage.rows = (await request.get('/order-usage', { params: { orderNo: row.workOrderNo } })) || []
|
||||
} finally {
|
||||
@@ -735,15 +738,16 @@ function stepReqText(row) {
|
||||
return parts.length ? parts.join(';') : '—'
|
||||
}
|
||||
|
||||
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: null, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', planEnd: '', status: 'CREATED', productProcessId: 0 })
|
||||
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: null, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, planStart: '', planEnd: '', status: 'CREATED', productProcessId: 0 })
|
||||
|
||||
// ---------- 产品工艺(2026-10-09):建单选产品自动带出默认产品工艺,自动填工艺组合(快捷选择+偏差提示) ----------
|
||||
const productProcesses = ref([])
|
||||
const ppWarnings = ref([])
|
||||
const router = useRouter()
|
||||
// 工单不嵌路线卡(客户裁定):想看定义层就跳「产品工艺」页查看/打印路线卡
|
||||
// 工单不嵌路线卡(客户裁定):想看定义层就跳「工艺」页(默认产品工艺 tab)查看/打印路线卡
|
||||
// 2026-11-02 修复:原跳 /product-process 无此路由(命中 catch-all 被静默重定向,表现为"点击没反应")
|
||||
function goProductProcess() {
|
||||
router.push('/product-process')
|
||||
router.push('/process-flow')
|
||||
}
|
||||
|
||||
async function loadProductProcesses() {
|
||||
@@ -789,11 +793,9 @@ async function applyProductProcess(id) {
|
||||
}
|
||||
|
||||
async function load() {
|
||||
const [dueFrom, dueTo] = query.dueRange || []
|
||||
const params = {
|
||||
orderNo: query.orderNo, productCode: query.productCode, productName: query.productName,
|
||||
contractNo: query.contractNo, ownershipType: query.ownershipType, status: query.status,
|
||||
dueFrom: dueFrom || '', dueTo: dueTo || ''
|
||||
contractNo: query.contractNo, ownershipType: query.ownershipType, status: query.status
|
||||
}
|
||||
const data = await request.get('/work-orders', { params })
|
||||
list.value = data || []
|
||||
@@ -820,7 +822,7 @@ function onProductTypeChange(id) {
|
||||
loadProductProcesses()
|
||||
}
|
||||
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 })
|
||||
Object.assign(dialog, { show: true, id: 0, workOrderNo: genOrderNo(), productTypeId: null, productCode: '', productName: '', contractNo: '', ownershipType: '', productSerial: '', quantity: 1, planStart: '', planEnd: '', status: 'CREATED', productProcessId: 0 })
|
||||
productProcesses.value = []
|
||||
ppWarnings.value = []
|
||||
processRows.value = []
|
||||
@@ -828,7 +830,7 @@ function openCreate() {
|
||||
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 })
|
||||
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, 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 })
|
||||
// 编辑:带出该产品可选的产品工艺(不自动重填组合,保留已保存组合)
|
||||
productProcesses.value = []
|
||||
ppWarnings.value = []
|
||||
@@ -843,20 +845,19 @@ async function openEdit(row) {
|
||||
buildEditProcessRows(row)
|
||||
}
|
||||
async function save() {
|
||||
if (!dialog.dueDate) return ElMessage.warning('请选择要求完成日期(必填)')
|
||||
// 归属(一级编号)二选一口径:类型必选;合同号/科技项目号必填编号,其他可空
|
||||
if (!dialog.ownershipType) return ElMessage.warning('请选择归属类型(合同号/科技项目号/其他)')
|
||||
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 (dialog.productProcessId > 0 && processRows.value.some((r) => !r.stationNos || r.stationNos.length === 0)) {
|
||||
const miss = processRows.value.filter((r) => !r.stationNos || r.stationNos.length === 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 }
|
||||
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, planStart: dialog.planStart, planEnd: dialog.planEnd, 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)
|
||||
@@ -944,11 +945,11 @@ async function doForceComplete() {
|
||||
}
|
||||
|
||||
// ---- 自动排产(引导式,M9 定稿:预览逐日可调、总数据必须对上)----
|
||||
const sched = reactive({ show: false, orderNo: '', mode: 'AVG', dailyQty: 1, segments: [{ range: null }], planStart: '', dueDate: '', quantity: 0, finishedNum: 0, preview: null, previewing: false, applying: false })
|
||||
const sched = reactive({ show: false, orderNo: '', mode: 'AVG', dailyQty: 1, segments: [{ range: null }], planStart: '', quantity: 0, finishedNum: 0, preview: null, previewing: false, applying: false })
|
||||
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,
|
||||
planStart: row.planStart || '', quantity: row.quantity || 0, finishedNum: row.finishedNum || 0,
|
||||
preview: null, previewing: false, applying: false
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user