按模块说明

一、MES — 叫料单扩展(schema + 逻辑)​

material_request 新增字段:packageNo(叫料包号,一次提交=一包)、callDate(叫料日,默认当天)、planBreakdown(jsonb,工单×排产日明细 []CallPlanBreakdown);targetDock 语义降级为"期望接驳台(可空,配送时 WMS 确定实际台)"。
新增 internal/logic/call_plan.go:实时计算「叫料需求明细(工单×排产日×物料)」,派生两类提示(当日剩余未叫 / 跨日量明细),不落库、不拦提交;接驳台空台校验 EnsureStationDocksEmpty、托盘回库 DispatchPalletReturnManual、人工清台 ClearDockLedger、配送单派车 DispatchDeliveryAgv、工位物料明细 StationMaterialDetail。
新增 internal/handler/production/call_pkg.go:8 个 MES 内部端点(X-API-TOKEN 网关),供 WMS 调用——叫料需求明细、按包查单、接驳台状态、托盘回库、人工清台、配送单派车、叫料池原始行、工位物料明细、WMS 代叫料。
internal/handler/production/call.go、internal/logic/call.go、agv.go、qty_report.go、routes_production.go、wmsclient/client.go、db.go 同步接入上述逻辑。
二、WMS — 配送单(新功能,叫料与送料彻底拆开)​

新增 schema/delivery_order.go + delivery_order_item.go 及 ent 生成代码:delivery_order(PENDING→DISPATCHED→DONE / CANCELLED,一单=一次托盘配送)、delivery_order_item(配送物料明细快照:工单/工艺/排产日)。
新增 internal/handler/delivery.go + 路由 + DeliveryOrders.vue 页面(仓储作业 → 配送单)。
mesclient/client.go 扩展:MES 叫料单结构补 packageNo/callDate/workOrderNo/planBreakdown,新增 PoolRow/DockPalletState/DeliveryAgvItem/getJSON 等。
CallQueue.vue:按叫料包展示,新增「代叫料」「建配送单」按钮与对话框;出库单回写所属配送单号(outbound_order 加字段);AGV 派送改由配送单驱动。
三、工位终端 — 叫料体验升级

MaterialPanel.vue:新增「本工位物料明细」卡(工艺物料全集×工位账四数,量为 0 也显示);叫料改为「叫料包」模式(默认当天、可勾选分批、可选其他排产日、期望接驳台可空),新增叫料日选择器、两条提示横幅(当日剩余未叫 / 跨日量明细)、托盘回库按钮。
InspectPanel.vue/Main.vue/OnlinePanel.vue/OfflinePanel.vue/WorkPanel.vue/SyncQueueDialog.vue/api/index.js/internal/handler/line.go/routes.go 同步接入接驳台状态、托盘回库、下班双台空台校验等。
web/static/index.html 构建刷新。
四、文档

案例.md:重写第 5/6/8/9 节与新「配送单」流程,补「模拟模式跳过接驳台校验」说明,库管员菜单加「配送单」;并修正"本单箱体"等措辞歧义。
客户问题.md:同步本轮拍板口径。
五、构建产物 / 同步

多个 MES 前端页面(.vue)随本次改动统一重新构建刷新;ent 生成代码(MES material_request、WMS delivery_order/outbound_order 相关)随 schema 更新重新生成。
This commit is contained in:
SunYF
2026-11-05 19:18:18 +08:00
parent 46fcb59079
commit 1d1dc1bdd8
102 changed files with 12953 additions and 379 deletions
+2 -2
View File
@@ -92,10 +92,10 @@ const statusOptions = [
{ v: 'ARRIVED', l: '到位待令' },
{ v: '5', l: '已取消' }, { v: '9', l: '已完成' }
]
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || s
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || '—'
const statusTag = (s) =>
s === '9' ? 'success' : s === 'ARRIVED' ? 'danger' : s === 'FAILED' || s === '5' ? 'info' : s === '2' ? 'warning' : s === '1' ? 'primary' : ''
const kindText = (k) => ({ GO_LOAD: '空车去程', TRANSPORT: '重载运输', EMPTY_RETURN: '空车回充', FREE: '自由调度' }[k] || k)
const kindText = (k) => ({ GO_LOAD: '空车去程', TRANSPORT: '重载运输', EMPTY_RETURN: '空车回充', FREE: '自由调度' }[k] || '—')
/* ===================== 到位待令确认(2026-11-03 三层安全机制) ===================== */
// 到位即停:GO_LOAD 段→「确认装车并送货」;TRANSPORT 段→「卸货完成并放行」(放行后空车自动回充);
@@ -6,7 +6,7 @@
<el-form inline>
<el-form-item label="产品工号"><el-input v-model="orderNo" placeholder="可空=全部" clearable style="width:200px" @keyup.enter="load" /></el-form-item>
<el-form-item label="工件SN"><el-input v-model="sn" placeholder="可空=全部" clearable style="width:200px" @keyup.enter="load" /></el-form-item>
<el-form-item label="工件序列号"><el-input v-model="sn" placeholder="可空=全部" clearable style="width:200px" @keyup.enter="load" /></el-form-item>
<el-form-item><el-button type="primary" :loading="loading" @click="load">查询</el-button></el-form-item>
<el-form-item><el-button @click="resetFilters">重置</el-button></el-form-item>
</el-form>
@@ -15,7 +15,7 @@
<el-card style="margin-top:12px">
<template #header><div class="hd"><span class="t">待审核任务</span><span class="sub">共 {{ total }} 条</span></div></template>
<el-table :data="list" border size="small" v-loading="loading" empty-text="暂无待审核任务">
<el-table-column prop="sn" label="工件SN" min-width="180" show-overflow-tooltip />
<el-table-column prop="sn" label="工件序列号" min-width="180" show-overflow-tooltip />
<el-table-column prop="orderNo" label="产品工号" min-width="170" show-overflow-tooltip />
<el-table-column prop="stationNo" label="工位" width="80" align="center" />
<el-table-column prop="stepName" label="工序" min-width="160" show-overflow-tooltip />
@@ -371,12 +371,12 @@ const statusOptions = [
{ v: 'PENDING', l: '未启用' }, { v: 'CONFIRMED', l: '已启用' },
{ v: 'PROCESSING', l: '执行中' }, { v: 'DONE', l: '已完成' }, { v: 'CANCELLED', l: '已取消' }
]
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || s
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || '—'
const planStatusTag = (s) =>
s === 'DONE' ? 'success' : s === 'PROCESSING' ? 'warning' : s === 'CONFIRMED' ? 'primary' : 'info'
const woStatusMap = { CREATED: '已创建', IN_PROGRESS: '执行中', PAUSED: '已暂停', DONE: '已完成', CANCELLED: '已取消' }
const woStatusText = (s) => woStatusMap[s] || s
const woStatusText = (s) => woStatusMap[s] || '—'
async function loadStations() {
const sts = (await request.get('/stations')) || []
@@ -649,7 +649,7 @@ function fmtDay(unix) {
return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`
}
function statusText(s) {
return { success: '成功', failed: '失败', partial: '部分', cleanup: '清理完成', cleanup_forced: '强制清理' }[s] || s
return { success: '成功', failed: '失败', partial: '部分', cleanup: '清理完成', cleanup_forced: '强制清理' }[s] || '—'
}
function statusType(s) {
return { success: 'success', failed: 'danger', partial: 'warning', cleanup: 'warning', cleanup_forced: 'danger' }[s] || 'info'
+2 -2
View File
@@ -140,14 +140,14 @@ const EVENT_TYPE_NAMES = {
function familyName(evt) {
if (evt && EVENT_TYPE_NAMES[evt]) return EVENT_TYPE_NAMES[evt]
const k = Object.keys(FAMILY_LABEL).find((p) => evt && evt.startsWith(p))
return k ? FAMILY_LABEL[k] : (evt || '-')
return k ? FAMILY_LABEL[k] : '其他事件'
}
function familyTag(evt) {
const k = Object.keys(FAMILY_TAG).find((p) => evt && evt.startsWith(p))
return (k && FAMILY_TAG[k]) || 'info'
}
function entityName(t) {
return (t && ENTITY_LABEL[t]) || t || '-'
return (t && ENTITY_LABEL[t]) || '其他'
}
function fmtTs(v) {
if (!v) return '-'
+6 -6
View File
@@ -160,7 +160,7 @@
<el-table :data="finalPending.list" border stripe size="small" v-loading="finalPending.loading">
<el-table-column prop="orderNo" label="产品工号" min-width="150" show-overflow-tooltip />
<el-table-column prop="productCode" label="产品序号" min-width="120" show-overflow-tooltip />
<el-table-column prop="sn" label="成品SN" min-width="140" show-overflow-tooltip />
<el-table-column prop="sn" label="成品序列号" min-width="140" show-overflow-tooltip />
<el-table-column prop="doneAt" label="完工时间" width="170" />
<el-table-column label="操作" width="90" align="center">
<template #default="{ row }">
@@ -176,9 +176,9 @@
<el-form label-position="top" class="pad-form" @submit.prevent v-if="finalForm.sn">
<el-form-item label="图号(带出,可改)">
<el-input v-model="finalForm.materialCode" placeholder="从待完工检清单选 SN 自动带出" />
<el-input v-model="finalForm.materialCode" placeholder="从待完工检清单选序列号自动带出" />
</el-form-item>
<el-form-item label="成品SN(带出)">
<el-form-item label="成品序列号(带出)">
<el-input v-model="finalForm.sn" disabled />
</el-form-item>
<el-form-item label="相关标准(试验方案号)">
@@ -410,7 +410,7 @@
<template v-if="interProcessBinds.length">
<el-divider content-position="left">装配物料绑定明细</el-divider>
<el-table :data="interProcessBinds" border size="small" max-height="260">
<el-table-column prop="sn" label="工件SN" min-width="120" />
<el-table-column prop="sn" label="工件序列号" min-width="120" />
<el-table-column prop="flowName" label="工艺" min-width="100" />
<el-table-column prop="materialCode" label="物料编码" min-width="100" />
<el-table-column prop="materialName" label="物料名称" min-width="100" />
@@ -471,7 +471,7 @@ const resultText = (r) => (r === 'OK' ? '合格' : r === 'NG' ? '不合格' : r
const statusText = (s) => ({
CREATED: '已创建', RELEASED: '已发布', IN_PROGRESS: '生产中',
DONE: '已完成', PENDING: '待排产', CONFIRMED: '已确认'
})[s] || s || '-'
})[s] || '—'
const tab = ref('CHECKIN')
const submitting = ref(false)
@@ -645,7 +645,7 @@ async function handleFinalPhoto(e) {
} catch { /* 失败已由拦截器提示 */ }
}
async function submitFinal() {
if (!finalForm.sn) return ElMessage.warning('请从待完工检清单选择成品SN')
if (!finalForm.sn) return ElMessage.warning('请从待完工检清单选择成品序列号')
if (!finalForm.materialCode) return ElMessage.warning('图号不能为空')
submitting.value = true
try {
@@ -17,7 +17,7 @@ const lastRefresh = ref('')
// 工件六态映射(2026-10-19:原列直显英文枚举,与全项目口径统一)
const pieceStatusMap = { NEW: '待上线', ONLINE: '已上线', PROCESSING: '在制', SEMI_STORED: '半成品入库', DONE: '完工', SCRAPPED: '报废' }
const pieceStatusText = (s) => pieceStatusMap[s] || s || '-'
const pieceStatusText = (s) => pieceStatusMap[s] || '—'
/* ===================== ① ② ④ PLC 点位(工位 / 主线缓存) ===================== */
const stations = ref([])
@@ -68,7 +68,7 @@ async function releaseEndPoints() {
ElMessage.warning('请先勾选要释放的点位记录')
return
}
const lines = rows.map((r) => `${r.pointNo}(${r.label})· ${r.sn || '无SN'}`).join('\n')
const lines = rows.map((r) => `${r.pointNo}(${r.label})· ${r.sn || '无序列号'}`).join('\n')
try {
await ElMessageBox.confirm(
`确认以下工件已从末端取走并释放点位?\n\n${lines}\n\n释放后点位台账置为「空闲」,并写入操作日志(point_release_manual)。`,
@@ -392,7 +392,7 @@ onMounted(() => { refreshAll(); loadDocks() })
当前待纠正 {{ mismatches.length }} 条。最后核对时间:{{ lastRefresh || '—' }}
</el-alert>
<el-table :data="mismatches" border size="small">
<el-table-column prop="sn" label="工件SN" width="200" show-overflow-tooltip />
<el-table-column prop="sn" label="工件序列号" width="200" show-overflow-tooltip />
<el-table-column prop="orderNo" label="所属工单" min-width="150" show-overflow-tooltip />
<el-table-column prop="status" label="工件状态" width="110" align="center">
<template #default="{ row }">{{ pieceStatusText(row.status) }}</template>
@@ -433,7 +433,7 @@ onMounted(() => { refreshAll(); loadDocks() })
{{ row.pointNo === 'END-U' ? '下料检测位 G11(上排)' : '下料检测位 G12(下排)' }}({{ row.pointNo }})
</template>
</el-table-column>
<el-table-column prop="sn" label="工件SN" min-width="180" show-overflow-tooltip>
<el-table-column prop="sn" label="工件序列号" min-width="180" show-overflow-tooltip>
<template #default="{ row }">{{ row.sn || '—' }}</template>
</el-table-column>
<el-table-column label="来源(所属工单)" min-width="160" show-overflow-tooltip>
@@ -128,7 +128,7 @@ const STATUS_TAG = {
PENDING: 'warning', SHIPPED: 'primary', DONE: 'success', CANCELLED: 'info',
REJECTED: 'danger', RETURNING: 'warning', RETURNED: 'info'
}
const statusText = (s) => STATUS_TEXT[s] || s || '—'
const statusText = (s) => STATUS_TEXT[s] || '—'
const statusTag = (s) => STATUS_TAG[s] || 'info'
// F(2026-11-04 定稿):确认损耗按钮已移除——损耗确认唯一入口 = WMS 退库单页确认收货(实收<应退就地填原因落账)。
+1 -1
View File
@@ -125,7 +125,7 @@ const plcStatusText = (s) => ({
// SENT=已下发未收到 PLC 完成信号=路线被挡(人工挡路/前序未走完),系统保持等待、拒绝下发下一条;
// 等待过久可「人工完成」收口或「撤回」重派(现场确认工件实际到位后使用)。
SENT: '已下发·等待完成信号', DONE: '已完成', CANCELLED: '已撤回', TIMEOUT: '已超时', REPLY_NG: '回复异常'
}[s] || s)
}[s] || '—')
const statusTagType = (s) => (s === 'DONE' ? 'success' : s === 'CANCELLED' ? 'info' : 'warning')
// 工单下拉远程搜索(keyword+limit=50,防数据炸弹)
+10 -10
View File
@@ -9,11 +9,11 @@
<el-form-item label="产品型号">
<el-input v-model="listQuery.productCode" clearable placeholder="产品型号" style="width:180px" @keyup.enter="loadList" />
</el-form-item>
<el-form-item label="成品SN/关键字">
<el-input v-model="listQuery.keyword" clearable placeholder="成品SN 或关键字" style="width:200px" @keyup.enter="loadList" />
<el-form-item label="成品序列号/关键字">
<el-input v-model="listQuery.keyword" clearable placeholder="成品序列号 或关键字" style="width:200px" @keyup.enter="loadList" />
</el-form-item>
<el-form-item label="SN追溯卡">
<el-input v-model="snQuery" clearable placeholder="输入成品SN查追溯卡" style="width:200px" @keyup.enter="querySnCard" />
<el-form-item label="序列号追溯卡">
<el-input v-model="snQuery" clearable placeholder="输入成品序列号查追溯卡" style="width:200px" @keyup.enter="querySnCard" />
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="listLoading" @click="loadList">查询</el-button>
@@ -30,7 +30,7 @@
<el-table-column prop="workOrderNo" label="产品工号" min-width="190" show-overflow-tooltip />
<el-table-column prop="productCode" label="产品型号" width="140" show-overflow-tooltip />
<el-table-column prop="productName" label="产品名称" min-width="160" show-overflow-tooltip />
<el-table-column prop="productSerial" label="成品SN" min-width="160" show-overflow-tooltip />
<el-table-column prop="productSerial" label="成品序列号" min-width="160" show-overflow-tooltip />
<el-table-column label="状态" width="100" align="center">
<template #default="{ row }">{{ row.status || '-' }}</template>
</el-table-column>
@@ -50,7 +50,7 @@
<el-drawer v-model="detailVisible" size="78%" :destroy-on-close="false">
<template #header>
<div class="hd">
<span class="t">{{ detailMode === 'sn' ? '成品追溯卡(SN 维度)' : '生产流程卡(工单维度)' }}</span>
<span class="t">{{ detailMode === 'sn' ? '成品追溯卡(序列号维度)' : '生产流程卡(工单维度)' }}</span>
<span class="sub">{{ detailMode === 'sn' ? (snCard && snCard.sn) || '' : detailNo }}</span>
<el-button type="success" size="small" style="margin-left:auto" :disabled="!canExport" @click="openExportFromDrawer">导出</el-button>
</div>
@@ -109,7 +109,7 @@
<el-table-column prop="materialType" label="类型" width="100" align="center" />
<el-table-column prop="spec" label="规格" min-width="120" show-overflow-tooltip />
<el-table-column prop="unit" label="单位" width="70" align="center" />
<el-table-column label="物料SN" min-width="220">
<el-table-column label="物料序列号" min-width="220">
<template #default="{ row }">{{ (row.snList || []).join(' ') || '-' }}</template>
</el-table-column>
<el-table-column prop="qty" label="数量" width="80" align="center" />
@@ -191,7 +191,7 @@
<el-table-column prop="materialType" label="类型" width="100" align="center" />
<el-table-column prop="spec" label="规格" min-width="120" show-overflow-tooltip />
<el-table-column prop="unit" label="单位" width="70" align="center" />
<el-table-column label="物料SN" min-width="220">
<el-table-column label="物料序列号" min-width="220">
<template #default="{ row }">{{ (row.snList || []).join(' ') || '-' }}</template>
</el-table-column>
<el-table-column prop="qty" label="数量" width="80" align="center" />
@@ -625,8 +625,8 @@ function buildWorkOrderCsv(c) {
function buildSnCsv(c) {
const lines = []
const push = (arr) => lines.push(arr.map(csvCell).join(','))
push(['成品追溯卡(SN 维度)', c.sn || ''])
push(['SN', c.sn || '', '产品工号', c.workOrderNo || '', '产品型号', c.productCode || '', '状态', c.status || ''])
push(['成品追溯卡(序列号维度)', c.sn || ''])
push(['序列号', c.sn || '', '产品工号', c.workOrderNo || '', '产品型号', c.productCode || '', '状态', c.status || ''])
push(['完工时间', c.doneAt || '', '生成时间', c.generatedAt || ''])
lines.push('')
push(['一、工序实绩'])
@@ -105,7 +105,7 @@
<el-radio :label="1">是</el-radio>
<el-radio :label="2">否</el-radio>
</el-radio-group>
<span style="margin-left:8px;color:#909399;font-size:12px">是=逐件录SN,否=按数量(不录SN)</span>
<span style="margin-left:8px;color:#909399;font-size:12px">是=逐件录序列号,否=按数量(不录序列号)</span>
</el-form-item>
<el-form-item label="启用"><el-switch v-model="dialog.isActive" /></el-form-item>
</el-form>
@@ -222,7 +222,7 @@ async function save() {
if (!trim(dialog.unit)) return ElMessage.warning('单位为必填项')
if (!dialog.id && !trim(dialog.code)) return ElMessage.warning('图号为必填项(创建后不可改)')
if (![1, 2, 3].includes(dialog.manageMode)) return ElMessage.warning('请选择类型')
if (dialog.snMode !== 1 && dialog.snMode !== 2) return ElMessage.warning('请选择序列号(是=逐件录SN / 否=按数量(不录SN))')
if (dialog.snMode !== 1 && dialog.snMode !== 2) return ElMessage.warning('请选择序列号(是=逐件录序列号 / 否=按数量(不录序列号))')
const body = {
name: trim(dialog.name), spec: trim(dialog.spec), unit: trim(dialog.unit), description: dialog.description,
manageMode: dialog.manageMode, snMode: dialog.snMode, isActive: dialog.isActive
@@ -106,7 +106,7 @@ const total = ref(0)
const loading = ref(false)
const stats = reactive({ pending: 0, replenished: 0, returned: 0, closed: 0 })
const statusText = (s) => ({ PENDING: '待处理', PROCESSING: '处理中', REPLENISHED: '已补发', RETURNED: '已退库', ADJUSTED: '已关闭', CLOSED: '已关闭', RESOLVED: '已关闭' }[s] || s)
const statusText = (s) => ({ PENDING: '待处理', PROCESSING: '处理中', REPLENISHED: '已补发', RETURNED: '已退库', ADJUSTED: '已关闭', CLOSED: '已关闭', RESOLVED: '已关闭' }[s] || '—')
const statusTag = (s) => (s === 'PENDING' || s === 'PROCESSING' ? 'warning' : s === 'REPLENISHED' ? 'success' : s === 'RETURNED' ? 'primary' : 'info')
const handleText = (t) => ({ REPLENISH: '补发', RETURN: '退库', ADJUST: '调整关闭' }[t] || '-')
const isPending = (s) => s === 'PENDING' || s === 'PROCESSING'
@@ -15,7 +15,7 @@
<el-table :data="pending.list" border stripe size="small" v-loading="pending.loading">
<el-table-column prop="orderNo" label="产品工号" min-width="150" show-overflow-tooltip />
<el-table-column prop="productCode" label="产品序号" min-width="120" show-overflow-tooltip />
<el-table-column prop="sn" label="成品SN" min-width="140" show-overflow-tooltip />
<el-table-column prop="sn" label="成品序列号" min-width="140" show-overflow-tooltip />
<el-table-column prop="doneAt" label="完工时间" width="170" />
</el-table>
<el-pagination style="margin-top:10px;justify-content:flex-end" background small
+7 -7
View File
@@ -1,8 +1,8 @@
<template>
<el-card>
<el-form inline>
<el-form-item label="工件SN">
<el-input v-model="sn" style="width:220px" placeholder="输入SN查询追溯" @keyup.enter="search" />
<el-form-item label="工件序列号">
<el-input v-model="sn" style="width:220px" placeholder="输入序列号查询追溯" @keyup.enter="search" />
</el-form-item>
<el-form-item label="产品工号">
<el-input v-model="orderNo" style="width:200px" placeholder="按产品工号列出工件(模糊)" @keyup.enter="searchByOrder" />
@@ -40,7 +40,7 @@
<el-card v-if="orderRows.length" shadow="never" style="margin-bottom:12px">
<template #header>工单「{{ orderNo }}」下的工件共 {{ orderRows.length }} 件(点「追溯」查看单个工件)</template>
<el-table :data="orderRows" border size="small" max-height="240">
<el-table-column prop="sn" label="工件SN" min-width="180" show-overflow-tooltip />
<el-table-column prop="sn" label="工件序列号" min-width="180" show-overflow-tooltip />
<el-table-column label="状态" width="100" align="center">
<template #default="{ row }">{{ statusText(row.status) }}</template>
</el-table-column>
@@ -57,7 +57,7 @@
<template v-if="data">
<el-descriptions :column="4" border style="margin-bottom:12px" title="工件信息">
<el-descriptions-item label="工件SN">{{ data.workpiece?.sn }}</el-descriptions-item>
<el-descriptions-item label="工件序列号">{{ data.workpiece?.sn }}</el-descriptions-item>
<el-descriptions-item label="所属工单">{{ data.workpiece?.orderNo }}</el-descriptions-item>
<el-descriptions-item v-if="data.workpiece?.productCode || data.order?.productCode" label="产品型号">
{{ data.workpiece?.productCode || data.order?.productCode }}{{ (data.workpiece?.productName || data.order?.productName) ? '(' + (data.workpiece?.productName || data.order?.productName) + ')' : '' }}
@@ -74,7 +74,7 @@
</template>
</el-alert>
<el-alert type="info" :closable="false" style="margin-bottom:12px"
title="追溯链路:产品型号(物)→ 工单(批次任务)→ 工件(实例SN)。本页展示单个工件的完整生命周期。" />
title="追溯链路:产品型号(物)→ 工单(批次任务)→ 工件(实例序列号)。本页展示单个工件的完整生命周期。" />
<el-tabs>
<el-tab-pane label="工位时间线">
@@ -109,7 +109,7 @@
</el-tab-pane>
<el-tab-pane label="成品关联">
<p>批次号:{{ (data.associationTrace?.batchItems||[]).join(', ') || '无' }}</p>
<p>序列号=是 SN:{{ (data.associationTrace?.serialItems||[]).join(', ') || '无' }}</p>
<p>序列号=是 序列号:{{ (data.associationTrace?.serialItems||[]).join(', ') || '无' }}</p>
</el-tab-pane>
<el-tab-pane label="暂存退库/重上线">
<el-alert type="info" :closable="false" style="margin-bottom:10px"
@@ -321,7 +321,7 @@ const flatBom = computed(() =>
// 原映射照抄工单状态,NEW/PROCESSING/SEMI_STORED 无中文显示英文,ONLINE 误作"生产中")
const WORKPIECE_STATUS_MAP = { NEW: '待上线', ONLINE: '已上线', PROCESSING: '在制', SEMI_STORED: '半成品入库', DONE: '完工', SCRAPPED: '报废' }
function statusText(st) {
return WORKPIECE_STATUS_MAP[st] || st || '-'
return WORKPIECE_STATUS_MAP[st] || '—'
}
// B6 拧紧闭环:质检/班组长确认放行——清标记 + 写 event_log + 置 torque_ng 预警 resolved。
const disposing = ref(false)
@@ -15,7 +15,7 @@
</template>
<el-alert type="info" :closable="false" style="margin-bottom:12px"
title="虚拟工位无终端硬件:操作人在本页(手机/电脑均可)选择虚拟工位 → 扫/输工件SN → 查看当前步骤与配料 → 录入 → 点完成报工。与工位终端走同一套接口与校验。" />
title="虚拟工位无终端硬件:操作人在本页(手机/电脑均可)选择虚拟工位 → 扫/输工件序列号 → 查看当前步骤与配料 → 录入 → 点完成报工。与工位终端走同一套接口与校验。" />
<el-empty v-if="!task" description="请先选择工位" />
<template v-else>
@@ -25,8 +25,8 @@
<el-option v-for="o in orderNos" :key="o" :value="o" :label="o" />
</el-select>
</el-form-item>
<el-form-item label="工件SN">
<el-input v-model="sn" placeholder="扫/输工件SN后回车" style="width:240px"
<el-form-item label="工件序列号">
<el-input v-model="sn" placeholder="扫/输工件序列号后回车" style="width:240px"
@keyup.enter="onSnEntered" />
</el-form-item>
<el-form-item>
@@ -70,7 +70,7 @@
<!-- 配料(装机绑定) -->
<el-col :xs="24" :md="11">
<el-card shadow="never" header="配料(装机绑定,随报工提交)">
<el-empty v-if="!bindPanel" description="输入工件SN后载入应绑配料" />
<el-empty v-if="!bindPanel" description="输入工件序列号后载入应绑配料" />
<template v-else-if="!bindPanel.enabled">
<el-result icon="info" title="本工艺未配置装配物料" sub-title="无需绑定配料,可直接完成报工" />
</template>
+2 -2
View File
@@ -39,7 +39,7 @@
</el-row>
<el-table :data="filtered" border stripe size="small" v-loading="loading" :row-class-name="rowClass">
<el-table-column prop="sn" label="工件SN" min-width="150" show-overflow-tooltip />
<el-table-column prop="sn" label="工件序列号" min-width="150" show-overflow-tooltip />
<el-table-column prop="orderNo" label="产品工号" min-width="140" show-overflow-tooltip />
<el-table-column prop="productCode" label="产品序号" min-width="120" show-overflow-tooltip />
<el-table-column prop="productName" label="产品名称" min-width="120" show-overflow-tooltip />
@@ -93,7 +93,7 @@ function countBy(st) { return list.value.filter((x) => x.status === st).length }
function rowClass({ row }) { return row.dwellSec > 86400 ? 'wip-overdue' : '' }
function statusText(s) {
return { ONLINE: '已上线', PROCESSING: '在制' }[s] || s
return { ONLINE: '已上线', PROCESSING: '在制' }[s] || '—'
}
function statusTag(s) {
return { ONLINE: 'info', PROCESSING: 'success' }[s] || 'info'
@@ -196,7 +196,7 @@
<!-- 自动排产(引导式,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)排产,工单「下发并开工」后到「日排产」页面人工启用即生效。" />
title="排产仅排「未开工数量 = 工单总数 − 已完工 − 在产未完工」:生成预览后可逐日调节数量(前松/中紧/后松等任意节奏),各日合计须与应排总数一致;确认后生成未启用排产,工单「下发并开工」后到「日排产」页面人工启用即生效。" />
<el-alert type="info" :closable="false" style="margin-bottom:14px"
:title="`项目开始:${fmtDateOnly(sched.planStart)} 工单数量:${sched.quantity} 已完工:${sched.finishedNum}`" />
<el-form :model="sched" label-width="100px">
@@ -276,7 +276,7 @@
</template>
</el-dialog>
<!-- 强制完工核对单(方案 A:剩余未完工显示不拦 / 排产自动取消 / PENDING 叫料自动取消、SHIPPED 人工处理 / 在制必须 0) -->
<!-- 强制完工核对单(方案 A:剩余未完工显示不拦 / 排产自动取消 / 待备料叫料自动取消、已发货人工处理 / 在制必须 0) -->
<el-dialog v-model="fc.show" title="强制完工核对单" width="640px" :close-on-click-modal="false">
<el-alert type="warning" :closable="false" style="margin-bottom:12px"
title="强制完工用于「工单做不满必须关单」:未生产完即关单,绕过完工门禁,操作留痕(谁/何时/原因/清单快照),不可恢复。" />
@@ -371,7 +371,7 @@
<template #default="{ row }">{{ stepReqText(row) }}</template>
</el-table-column>
</el-table>
<div class="detail-subtitle">工件SN列表({{ detail.total }} 台,按产品序号升序)</div>
<div class="detail-subtitle">工件序列号列表({{ detail.total }} 台,按产品序号升序)</div>
<div class="piece-toolbar">
<el-select v-model="pieceQuery.status" clearable placeholder="状态:全部" style="width:140px" @change="onPieceFilter">
<el-option v-for="(l, v) in pieceStatusMap" :key="v" :label="l" :value="v" />
@@ -418,7 +418,7 @@ const statusOptions = [
{ v: 'PAUSED', l: '已暂停' },
{ v: 'DONE', l: '已完成' }, { v: 'CANCELLED', l: '已取消' }
]
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || s
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || '—'
// 状态固定配色(方案 A):已创建=灰(info) / 执行中=绿(success) / 已暂停=橙(warning) / 已完成=深绿(success) / 已取消=红(danger)
const statusTagType = (s) => (
{ CREATED: 'info', IN_PROGRESS: 'success', PAUSED: 'warning', CANCELLED: 'danger', DONE: 'success' }[s] || 'info'
@@ -432,7 +432,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 pieceStatusText = (s) => pieceStatusMap[s] || '—'
const stationText = (n) => (n !== 0 ? '工位' + n : '-')
const snModeText = (m) => (m === 1 ? '序列号=是' : m === 2 ? '序列号=否' : '-')
@@ -918,7 +918,7 @@ function onRowCmd(row, cmd) {
}
// ---- 强制完工(方案 A:终止+清单确认,2026-10-20 拍板)----
// 四项核对单:剩余未完工(显示不拦)/ 未完成排产(自动取消)/ 在途叫料(PENDING 自动取消、SHIPPED 人工处理)/ 在制工件(必须 0)
// 四项核对单:剩余未完工(显示不拦)/ 未完成排产(自动取消)/ 在途叫料(待备料自动取消、已发货人工处理)/ 在制工件(必须 0)
const fc = reactive({ show: false, id: 0, reason: '', preview: null, loading: false, submitting: false })
async function openForceComplete(row) {
fc.show = true; fc.id = row.id; fc.reason = ''; fc.preview = null; fc.loading = true
@@ -980,7 +980,7 @@ async function genPreview() {
sched.previewing = false
}
}
// 确认排产:Σ逐日数量必须等于应排总数(后端二次校验),生成 PENDING 待人工启用
// 确认排产:Σ逐日数量必须等于应排总数(后端二次校验),生成「未启用」排产待人工启用
async function applySchedule() {
if (!sched.preview) return
const items = sched.preview.rows.filter((r) => r.editable).map((r) => ({ date: r.date, qty: r.qty || 0 }))