feat: 移除工艺物料与混产模板实体、新增产线清线与 PLC 监控实时推送、看板双屏增强
- 移除实体:MES 删除 FlowMaterial(工艺物料)与 MixProductionTemplate(混产模板)全套(schema/ent 生成码/handler/logic),清理关联路由与种子 - 新增功能:产线清线(line_clearance handler + logic)、PLC 监控 WebSocket 实时推送(ws/plc_monitor_hub + handler) - 看板增强:新增管理屏与 KPI 组件(BoardManage/BoardKpi),调整演示屏 Mock 与各看板面板 - MES 完善:PLC 匹配/扭矩扫描/签收、工艺卡 PDF 与工单、AGV 链路、叫料/备料/在制品/短料预测等逻辑与前端调整 - 工位终端:删除离线面板 OfflinePanel,调整主界面/物料面板与 api/store/handler/路由 - WMS:AGV 托盘、物料与 MES 客户端调整及前端帮助/基础数据/叫料/托盘页 - 文档:更新产线API/客户问题/案例/部署手册/问题记录
This commit is contained in:
@@ -131,8 +131,8 @@ export const returnList = () => request.get('/api/return-list')
|
||||
export const returnCancel = (data) => request.post('/api/return-cancel', data)
|
||||
export const returnReference = () => request.get('/api/return-reference')
|
||||
|
||||
// ---------- 在制品 / 0-13 上下线建档完工 / 物料清单领料 / 追溯(代理 MES 内部 API) ----------
|
||||
// 在制品列表:{stationNo}(>0=停在该工位)/ {scope}(pending=待流转 / end-pending=末端待取件)→ {list}
|
||||
// ---------- 在制品 / 上下线建档 / 物料清单领料 / 追溯(代理 MES 内部 API) ----------
|
||||
// 在制品列表:{stationNo}(>0=停在该工位)/ {scope}(pending=待流转)/ {status}(SEMI_STORED=半成品)→ {list}
|
||||
export const getWip = (params) => request.get('/api/wip', { params })
|
||||
|
||||
// 物料清单(上线建档「领料确认」应领料):{productCode, bomName}
|
||||
@@ -144,15 +144,12 @@ export const queryOrder = (params) => request.get('/api/order/query', { params }
|
||||
// 扫 SN 秒认工单(上线建档只需扫 SN,自动带出工单/产品/归属只读信息):{sn}
|
||||
export const queryOrderBySn = (params) => request.get('/api/order/by-sn', { params })
|
||||
|
||||
// 工件追溯(下线完工扫SN展示状态/工艺时间线/拧紧):{sn}
|
||||
// 工件追溯(扫SN展示状态/工艺时间线/拧紧):{sn}
|
||||
export const getTrace = (params) => request.get('/api/trace', { params })
|
||||
|
||||
// 上线建档:{sn, orderNo, workOrderId, processSeq, operator}
|
||||
export const onlineRegister = (data) => request.post('/api/workpiece/online', data)
|
||||
|
||||
// 下线完工入库:{sn, batchItems, serialItems, operator}
|
||||
export const offlineFinish = (data) => request.post('/api/workpiece/done', data)
|
||||
|
||||
// ---------- PLC↔MES 对账(#8 T2/T3 终端事件驱动检查,不轮询) ----------
|
||||
// 单工位检查:{stationNo, trigger:'terminal', orderNo, sn, operator}
|
||||
// → {hasMismatch, stationNo, plcBit, detail, options, graceWindow}
|
||||
|
||||
@@ -27,7 +27,7 @@ export const helpWorkstation = S('作业', '本屏回答一句话:这台工件
|
||||
'工位一登录,本工位绑定的工艺和步骤就定了,跟有没有扫工件无关;没选工件时步骤区是灰的,先扫 SN 或上料。这就是「当前任务」里先显示流程步骤的原因——步骤属于工位,工件只是还没点名。',
|
||||
'步骤填完、检测确认勾好、拧紧数据齐了、物料绑齐了,「报工完成」才会亮。按钮下面会直接写清楚还差哪一项。',
|
||||
'拧紧枪的数据由设备打进对应步骤的输入框,回车录一条;本工位设了「禁止手填」时输入框不让人工输。',
|
||||
'报工成功后工件从当前工位清掉,系统按工单路线自动推进它的物理位置,下一道工序由下一位工人接着做;扫码即到位凭证,不需要另外下发移料指令。'
|
||||
'报工成功后工件从当前工位清掉,系统按工单路线自动推进它的物理位置,下一道工艺由下一位工人接着做;扫码即到位凭证,不需要另外下发移料指令。'
|
||||
], [
|
||||
'网络断了就直接失败并提示,不会排队、也不会联网后自动补传——看到失败就当场重做一次,不要以为系统稍后会自己发。',
|
||||
'拧紧出现 NG 会拦住后续报工,要先处置,不能跳过。',
|
||||
@@ -39,7 +39,7 @@ export const helpWorkstation = S('作业', '本屏回答一句话:这台工件
|
||||
'PLC 传感器上报(有没有托盘、到位信号)会触发位置校验。',
|
||||
'工位终端上的每一次操作(扫 SN、绑料、录扭矩、报工、退料)都会重新核一次台账。',
|
||||
'手动任务收口、人工确认放行也会触发。',
|
||||
'但真正让工件往下一道工序走的是「报工完成」;传感器只提供校验,不代替报工。'
|
||||
'但真正让工件往下一道工艺走的是「报工完成」;传感器只提供校验,不代替报工。'
|
||||
] },
|
||||
remoteScanSection,
|
||||
virtualStationSection,
|
||||
@@ -56,7 +56,7 @@ export const helpPdf = S('工艺文件', '看这一步的图纸和作业指导
|
||||
])
|
||||
|
||||
export const helpOnline = S('上线建档', '给一台新工件建档案,把它登记到产线上的某个点位。', [
|
||||
'选工单 → 选当前位置 → 把实物放到该位置 → 生成或扫入产品序号(SN) → 确认建档。当前位置必须是这张工单首道工序的候选工位或产线点位。',
|
||||
'选工单 → 选当前位置 → 把实物放到该位置 → 生成或扫入产品序号(SN) → 确认建档。当前位置必须是这张工单首道工艺的候选工位或产线点位。',
|
||||
'选好当前位置后系统会核对这个位置的传感器:先把实物放到该位置,传感器没检测到实物会被拦下,空着不让提交建档;读不到传感器时要人工确认实物已放好。',
|
||||
'「序列号=是」的物料必须扫已经在 WMS 入库登记过的来料 SN,不能让系统发号;「序列号=否」才由系统生成。',
|
||||
'建档成功后会生成追溯的第一个节点,并按台账登记占用所选点位。'
|
||||
@@ -77,7 +77,7 @@ export const helpOnline = S('上线建档', '给一台新工件建档案,把
|
||||
'选的位置已有实物、传感器核对通过:建档完成后按工单路线执行流程,不需要再点「开始」。',
|
||||
'选的位置传感器没检测到实物:会被拦下来,先把实物放到该位置再提交建档,空点位建不了档;不是先挂在台账上等以后自动推进。',
|
||||
'PLC 读不到传感器状态(没接 PLC、模拟、读取失败、虚拟工位):会弹确认让你人工确认实物已放好,确认后才继续;不确认就放弃这次提交。虚拟工位不连 PLC,走人工确认是正常的,不是故障。',
|
||||
'传感器不会主动触发流转:真正推进到下一道工序的是「报工完成」/扫码报工,系统不因传感器状态变化自动推进下流。',
|
||||
'传感器不会主动触发流转:真正推进到下一道工艺的是「报工完成」/扫码报工,系统不因传感器状态变化自动推进下流。',
|
||||
'台账占用和 PLC 传感器是两套独立数据:点位占用由 MES 台账标记,不是 PLC 位;PLC 上报不会自动改写点位占用,占用由建档、报工流转、人工释放这几处维护。'
|
||||
]
|
||||
},
|
||||
@@ -95,32 +95,22 @@ export const helpOnline = S('上线建档', '给一台新工件建档案,把
|
||||
scrollPagingSection
|
||||
])
|
||||
|
||||
export const helpOffline = S('下线完工', '工件做完了,从这里确认完工并回流 WMS 成品库存。', [
|
||||
'扫 SN 看它的完工状态和工序时间线 → 选下料位置(G11 上排 / G12 下排,按工位奇偶预选)→ 确认完工入库。',
|
||||
'已经完工的工件不用再操作,时间线上能看到。'
|
||||
], [
|
||||
'确认之后本终端不能撤销,也没有撤回入口。误入库要到 WMS 库存侧处置。',
|
||||
'物料没绑齐、拧紧有 NG、下料位置被占用,这三种情况会被硬拒,先看提示补齐。'
|
||||
], [
|
||||
{ t: '功能定位', text: '把在制品转成成品库存的收口动作;生产之后还会被拿去试验区做试验,那是 MES「成品试验」页的事,不在这里。' },
|
||||
{ t: '末端下料位为什么要点人工释放', text: 'G11 / G12 是末端下料检测位:有工位有无托盘信号,但没有工位终端、没有接驳台,也不下发装配工序码。工件被物理取走后没有「已取走」完成信号,点位台账不会自动清,需要管理员在 MES 产线管理里确认后人工释放。' },
|
||||
remoteScanSection
|
||||
])
|
||||
|
||||
export const helpMaterial = S('叫料', '本工位缺料时从这里发起,一个物料 + 一个数量 + 一个接驳台 = 一张叫料单 = 一个托盘 = 一次配送。', [
|
||||
'叫料池四个数:需求是排产算出来的理论量,调整是人工加减和审批补料,已发是库房累计发出来的,占用是还在路上没确认的量。可用=需求+调整−已发−占用。',
|
||||
'待备料的叫料单可以「取消」,取消会把占用释放掉。',
|
||||
'本工位一点余量都没有时才会出现「去借料」;借的是同工序兄弟工位的份额,工人手动分配、系统不自动扣,总量不增加,属于零和转移。',
|
||||
'本工位一点余量都没有时才会出现「去借料」;借的是同工艺兄弟工位的份额,工人手动分配、系统不自动扣,总量不增加,属于零和转移。',
|
||||
'补料(额度调增、需主管审批)和数量不符上报不在这里发起:补料由班组长 / 计划员在 MES 代提,或由 WMS 库管代提交申请;数量不符在「巡检 / 异常」页上报。',
|
||||
'已经绑上的标签点 × 可以撤销重绑。退料要选从左还是右接驳台退回。'
|
||||
'已经绑上的标签点 × 可以撤销重绑。退料要选从左还是右接驳台退回。',
|
||||
'「托盘回收」和「退料」是两个不同的按钮:回收是空托盘,退料是盘上还有余料,看清楚再点。'
|
||||
], [
|
||||
'提交前要确认目标接驳台是空的;传感器失联时需要人工确认并留痕。',
|
||||
'叫料发出去之后不能直接改数量,只能取消、驳回,或者走退库。',
|
||||
'工位上还有工件(传感器检到托盘)时退料会被硬拒,先把工件完工或移走。退料不是提交完就结束:要等 WMS「确认收货」,库存和叫料池才会回补。',
|
||||
'下班时自己看托盘:确认没有物料就可以直接下班;有物料走退料流程,提交后就能离开,不增加主管审批环节。'
|
||||
'下班时自己看托盘:确认没有物料就可以直接下班;有物料走退料流程,提交后就能离开,不增加主管审批环节。',
|
||||
'系统只看得到接驳台上有没有托盘,看不出盘上到底有没有货,AGV 也不知道自己拉的是空盘还是带料盘——所以「空托盘回收」和「退料」要由你自己点对应的按钮来区分,不能指望系统替你判断。'
|
||||
], [
|
||||
{ t: '功能定位', text: '工位与库房之间的领料 / 退料衔接点;上游是 MES 日排产算出的需求,下游是 WMS 叫料队列 → 备料 → 配送单 → AGV 到位 → 本工位签收。' },
|
||||
{ t: '签收与放行的关系', text: '送料到工位后,在本端点「签收」就会联动卸货放行,AGV 空车离开,不需要再点一次放行;取货类任务(托盘回库、退料)到位后自动装车送回库房,工位侧也不用确认。传感器故障时才由人工强制放行兜底。' },
|
||||
{ t: '签收与放行的关系', text: '送料到工位后,在本端点「签收」就会联动卸货放行,AGV 空车离开,不需要再点一次放行。取货时两种任务不一样:空托盘回收是全自动的,车到位后自动装车、工位不用点确认;退料到位后必须有人点「确认装车回库」才会继续,因为盘上可能有料、系统分不清,这一步不能省。传感器故障时才由人工强制放行兜底。' },
|
||||
remoteScanSection,
|
||||
virtualStationSection,
|
||||
scrollPagingSection
|
||||
|
||||
@@ -401,7 +401,6 @@ export async function loadBind() {
|
||||
|
||||
// loadWip 拉取停在本工位的未完工在制品(5.2 默认展示)。
|
||||
// stationNo 传本工位号(正整数字符串/数字)。
|
||||
// loadWipScope 按业务语义拉取:pending=待流转(已建档未分配工位)/ end-pending=末端待取件(已报工至工艺末端)。
|
||||
export async function loadWip(atStation) {
|
||||
const code = atStation === undefined ? state.stationNo : atStation
|
||||
try {
|
||||
@@ -412,15 +411,6 @@ export async function loadWip(atStation) {
|
||||
}
|
||||
}
|
||||
|
||||
export async function loadWipScope(scope) {
|
||||
try {
|
||||
const data = await getWip({ scope })
|
||||
state.wip = (data && data.list) ? data.list : (Array.isArray(data) ? data : [])
|
||||
} catch {
|
||||
state.wip = []
|
||||
}
|
||||
}
|
||||
|
||||
export function refreshAll() {
|
||||
return Promise.all([loadTask(), loadTight(), loadPoints(), loadWip(), loadStationState()])
|
||||
}
|
||||
|
||||
@@ -73,13 +73,8 @@
|
||||
</template>
|
||||
<OnlinePanel />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane v-if="hasTab('offline')" name="offline">
|
||||
<template #label>
|
||||
<span class="tab-label" :title="TAB_DUTY.offline">下线完工</span>
|
||||
<span v-if="badgeCount.offline" class="tab-badge">{{ badgeCount.offline }}</span>
|
||||
</template>
|
||||
<OfflinePanel />
|
||||
</el-tab-pane>
|
||||
<!-- 下线完工页签已删除(2026-11-18 定稿):报完最后一道工艺即自动完工并清台账,无需人工操作;
|
||||
异常件唯一出路 = 作业页「暂存退库」→ 在制品库选「强行完工」 -->
|
||||
<el-tab-pane v-if="hasTab('work')" name="work">
|
||||
<template #label>
|
||||
<span class="tab-label" :title="TAB_DUTY.work">作业</span>
|
||||
@@ -200,13 +195,11 @@ import MaterialPanel from './panels/MaterialPanel.vue'
|
||||
import PdfPanel from './panels/PdfPanel.vue'
|
||||
import InspectPanel from './panels/InspectPanel.vue'
|
||||
import OnlinePanel from './panels/OnlinePanel.vue'
|
||||
import OfflinePanel from './panels/OfflinePanel.vue'
|
||||
import WorkloadDialog from './panels/WorkloadDialog.vue'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
import {
|
||||
helpInspect,
|
||||
helpMaterial,
|
||||
helpOffline,
|
||||
helpOnline,
|
||||
helpPdf,
|
||||
helpWorkstation
|
||||
@@ -249,7 +242,6 @@ const stationName = computed(() => state.task?.stationName || '')
|
||||
// 6 个页签的职责说明(中文,鼠标悬停显示)
|
||||
const TAB_DUTY = {
|
||||
online: '上线建档:登记工件进线,生成追溯首节点',
|
||||
offline: '下线完工:核对完工状态,确认入库回流仓库',
|
||||
work: '作业:按工艺步骤装配、拧紧、报工',
|
||||
material: '物料 / 叫料:绑定装配物料、缺料叫料与退料',
|
||||
pdf: '工艺文件:查看工艺步骤图纸与整流程工艺文件',
|
||||
@@ -264,7 +256,7 @@ const todoItems = computed(() => [
|
||||
count: missingSteps.value.length + missingTorqueSteps.value.length,
|
||||
detail: `未录入步骤 ${missingSteps.value.length} 项 + 未拧紧步骤 ${missingTorqueSteps.value.length} 项;到「作业」页扫码后逐步报工、拧紧即清零` },
|
||||
{ key: 'wip', label: '在制品待办', tab: 'online', count: wip.value.length,
|
||||
detail: `本工位在制品 ${wip.value.length} 件(已上线未流转完);在「上线建档」可查看进线情况,完工走「下线完工」` },
|
||||
detail: `本工位在制品 ${wip.value.length} 件(已上线未流转完);在「上线建档」可查看进线情况,报完最后一道工艺自动完工` },
|
||||
{ key: 'inspect', label: '待检验/待确认', tab: 'inspect',
|
||||
count: missingChecks.value.length + (hasNg.value ? 1 : 0),
|
||||
detail: `未勾选检测确认 ${missingChecks.value.length} 项${hasNg.value ? ' + 1 项不合格告警' : ''};到「巡检 / 异常」页完成签到点检、勾选检测确认、复检并上报异常` }
|
||||
@@ -308,7 +300,6 @@ watch(visibleTabs, () => {
|
||||
// 帮助内容随当前页签切换(全局唯一一个 PageHelp 悬浮按钮)
|
||||
const HELP_MAP = {
|
||||
online: helpOnline,
|
||||
offline: helpOffline,
|
||||
work: helpWorkstation,
|
||||
material: helpMaterial,
|
||||
pdf: helpPdf,
|
||||
@@ -581,9 +572,8 @@ async function submitDuty() {
|
||||
onMounted(async () => {
|
||||
tickClock()
|
||||
await loadConfig()
|
||||
// 默认落点:按工位页签配置,优先上线建档/下线完工,否则作业页
|
||||
// 默认落点:按工位页签配置,优先上线建档,否则作业页
|
||||
if (hasTab('online')) tab.value = 'online'
|
||||
else if (hasTab('offline')) tab.value = 'offline'
|
||||
else tab.value = 'work'
|
||||
refreshAll()
|
||||
workRef.value?.focusScan?.()
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
<el-alert v-if="todayRemainText" type="warning" :closable="false" show-icon style="margin-bottom:8px" :title="todayRemainText" />
|
||||
<el-alert v-if="crossDayRemainText" type="info" :closable="false" show-icon style="margin-bottom:8px" :title="crossDayRemainText" />
|
||||
<el-alert v-if="hasBorrow" type="warning" :closable="false" show-icon style="margin-bottom:10px"
|
||||
title="部分物料将【跨工位借料】发出:本工位不足的部分会从同工序其他工位的剩余额度借出(由您手动分配,借出工位可用量相应扣减)。请确认无误后再提交。" />
|
||||
title="部分物料将【跨工位借料】发出:本工位不足的部分会从同工艺其他工位的剩余额度借出(由您手动分配,借出工位可用量相应扣减)。请确认无误后再提交。" />
|
||||
|
||||
<div class="call-row" style="flex-wrap:wrap">
|
||||
<span class="lab">叫料日:</span>
|
||||
@@ -155,7 +155,7 @@
|
||||
</div>
|
||||
</template>
|
||||
<div v-else style="font-size:12px;color:#f56c6c;margin-top:2px">
|
||||
同工序其他工位无可用余量,无法借料。
|
||||
同工艺其他工位无可用余量,无法借料。
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -404,7 +404,7 @@ async function doCall() {
|
||||
if (hasBorrow.value) {
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
'您将进行【跨工位借料】:超出本工位可用量的部分会从同工序其他工位的剩余额度借出,借出工位的可用量会相应扣减(无需改排产)。确认提交?',
|
||||
'您将进行【跨工位借料】:超出本工位可用量的部分会从同工艺其他工位的剩余额度借出,借出工位的可用量会相应扣减(无需改排产)。确认提交?',
|
||||
'跨工位借料确认',
|
||||
{ type: 'warning', confirmButtonText: '确认借料并提交' }
|
||||
)
|
||||
|
||||
@@ -1,374 +0,0 @@
|
||||
<template>
|
||||
<div class="offline-panel">
|
||||
<!-- ① 扫 SN 查完工状态 -->
|
||||
<section class="card">
|
||||
<div class="card-title">下线完工</div>
|
||||
<div class="form-row">
|
||||
<span class="lab">工件序列号</span>
|
||||
<el-input
|
||||
v-model.trim="snInput"
|
||||
size="large"
|
||||
class="grow"
|
||||
placeholder="扫描或输入工件序列号"
|
||||
clearable
|
||||
@keyup.enter="onQuery"
|
||||
/>
|
||||
<el-button type="primary" size="large" :loading="loading" @click="onQuery">查询完工状态</el-button>
|
||||
</div>
|
||||
|
||||
<el-empty v-if="!trace" description="请扫描工件序列号 查看完工状态与终检结果" :image-size="80" />
|
||||
|
||||
<template v-else>
|
||||
<div class="stat-grid">
|
||||
<div class="stat">
|
||||
<span class="k">工件状态</span>
|
||||
<el-tag size="large" effect="dark" :type="wpStatusType(workpiece.status)">{{ wpStatusText(workpiece.status) }}</el-tag>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<span class="k">工单号</span>
|
||||
<b>{{ workpiece.orderNo || '-' }}</b>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<span class="k">已完成工艺</span>
|
||||
<b>{{ doneProcessCount }} 道</b>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<span class="k">拧紧</span>
|
||||
<b :class="torqueNg ? 'ng' : 'ok'">{{ torqueOk }}/{{ torqueTotal }} 合格</b>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<span class="k">步骤不合格</span>
|
||||
<b :class="stepNgCount ? 'ng' : 'ok'">{{ stepNgCount }} 项</b>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-alert
|
||||
v-if="workpiece.status === 'DONE'"
|
||||
type="success" :closable="false" show-icon
|
||||
title="该工件已完工入库,无需重复操作。" style="margin:10px 0"
|
||||
/>
|
||||
<el-alert
|
||||
v-else-if="torqueNg || stepNgCount"
|
||||
type="warning" :closable="false" show-icon
|
||||
title="存在不合格项,请确认已完成返修/复检后再入库。" style="margin:10px 0"
|
||||
/>
|
||||
|
||||
<div class="form-row" style="margin-top:10px">
|
||||
<span class="lab">下料位置</span>
|
||||
<el-select v-model="pointNo" filterable size="large" class="grow" placeholder="选择末端下料检测位(只列空闲位)">
|
||||
<el-option-group v-for="g in endPointGroups" :key="g.label" :label="g.label">
|
||||
<el-option v-for="p in g.options" :key="p.pointNo" :label="p.label" :value="p.pointNo" />
|
||||
</el-option-group>
|
||||
</el-select>
|
||||
<el-button size="large" @click="refreshPoints">刷新点位</el-button>
|
||||
</div>
|
||||
<div class="point-tip">下料位置 = 完工后工件实际落入的末端下料检测位,完工时自动登记占用;仅空闲位可选。</div>
|
||||
|
||||
<div class="sub-title">工艺时间线</div>
|
||||
<el-table :data="processTimeline" border size="large" max-height="260">
|
||||
<el-table-column label="工艺" min-width="120">
|
||||
<template #default="{ row }">{{ row.processName || ('工艺' + (row.flowId || row.processCode || '')) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="结果" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" :type="row.result === 'OK' ? 'success' : 'danger'" effect="dark">
|
||||
{{ row.result === 'OK' ? '合格' : '不合格' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="operator" label="操作人" min-width="110" />
|
||||
<el-table-column label="时间" min-width="170">
|
||||
<template #default="{ row }">{{ fmt(row.createdAt) }}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</template>
|
||||
</section>
|
||||
|
||||
<!-- ② 末端待取件工件(已报工至工艺路线末端,scope=end-pending 查询) -->
|
||||
<section class="card">
|
||||
<div class="card-title">
|
||||
末端待取件工件
|
||||
<el-tag size="large" effect="plain">{{ wip.length }}</el-tag>
|
||||
<el-button link type="primary" size="large" @click="loadWipScope('end-pending')">刷新</el-button>
|
||||
</div>
|
||||
<el-empty v-if="!wip.length" description="暂无末端待取件工件" :image-size="70" />
|
||||
<div v-else class="scroll-more" @scroll="wipPager.onScroll">
|
||||
<el-table :data="wipPager.rows" border size="large" max-height="420" @row-click="pickWip">
|
||||
<el-table-column prop="sn" label="工件序列号" min-width="160" />
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="140" />
|
||||
<el-table-column prop="productName" label="产品" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column label="进度" width="110" align="center">
|
||||
<template #default="{ row }">{{ row.doneSteps }}/{{ row.totalSteps }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" :type="wipStatusType(row.status)" effect="dark">{{ wipStatusText(row.status) }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="scroll-more-hint">{{ wipPager.hint }}</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- ③ 确认入库 -->
|
||||
<footer class="action-bar">
|
||||
<el-button type="success" size="large" class="big-btn" :loading="submitting" :disabled="!canFinish" @click="onFinish">
|
||||
确认完工入库(回流 WMS)
|
||||
</el-button>
|
||||
<div class="block-tip" v-if="blockTip">{{ blockTip }}</div>
|
||||
</footer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { getTrace, offlineFinish } from '../../api'
|
||||
import { loadPoints, loadWipScope, operatorName, state, wip } from '../../store/station'
|
||||
import { useScrollPaging } from '../../utils/scrollPaging'
|
||||
|
||||
// 改动17:末端待取件列表改滚动分页(往下滚加载更多,不用页码)
|
||||
const wipPager = useScrollPaging(wip, 20)
|
||||
|
||||
const snInput = ref('')
|
||||
const trace = ref(null)
|
||||
const loading = ref(false)
|
||||
const submitting = ref(false)
|
||||
// 下料位置(C/H 3.2):末端下料检测位 G11(上排)/ G12(下排),只列空闲位
|
||||
const pointNo = ref('')
|
||||
|
||||
const workpiece = computed(() => trace.value?.workpiece || {})
|
||||
const processTimeline = computed(() => trace.value?.processTimeline || [])
|
||||
const stepData = computed(() => trace.value?.stepData || [])
|
||||
const torqueRecords = computed(() => trace.value?.torqueRecords || [])
|
||||
|
||||
// 下料位置候选项:END-U=G11(上排)/ END-D=G12(下排),只列空闲位(label=中文名(编号))
|
||||
const endPointGroups = computed(() => {
|
||||
const up = []
|
||||
const down = []
|
||||
for (const p of state.points || []) {
|
||||
if (p.pointType !== 'END' || p.occupied) continue
|
||||
const item = {
|
||||
pointNo: p.pointNo,
|
||||
label: `${p.pointNo === 'END-U' ? '下料检测位 G11' : '下料检测位 G12'}(${p.pointNo === 'END-U' ? '上排' : '下排'})`
|
||||
}
|
||||
if (p.pointNo === 'END-U') up.push(item)
|
||||
else down.push(item)
|
||||
}
|
||||
return [
|
||||
{ label: '上排(G11)', options: up },
|
||||
{ label: '下排(G12)', options: down }
|
||||
].filter((g) => g.options.length)
|
||||
})
|
||||
// 默认落点:按工件所在工位上下排自动选(上排=奇数工位 1/3/5/7/9/11,下排=偶数 2/4/6/8/10/12);
|
||||
// 首选排被占用时回退另一排;都无空闲位返回空(阻断提交)。
|
||||
function autoPickEndPoint() {
|
||||
const wp = trace.value?.workpiece
|
||||
if (!wp || !wp.sn) {
|
||||
pointNo.value = ''
|
||||
return
|
||||
}
|
||||
const st = Number(wp.atStationNo || wp.currentStationNo || 0)
|
||||
const want = st > 0 && st % 2 === 0 ? 'END-D' : 'END-U'
|
||||
const free = endPointGroups.value
|
||||
.flatMap((g) => g.options)
|
||||
.sort((a, b) => (a.pointNo === want ? -1 : b.pointNo === want ? 1 : 0))
|
||||
pointNo.value = free.length ? free[0].pointNo : ''
|
||||
}
|
||||
watch(workpiece, autoPickEndPoint)
|
||||
// 点位台账异步到达 / 刷新后:当前选择失效(被判占用)时重算
|
||||
watch(endPointGroups, () => {
|
||||
const valid = endPointGroups.value.some((g) => g.options.some((o) => o.pointNo === pointNo.value))
|
||||
if (!valid) autoPickEndPoint()
|
||||
})
|
||||
async function refreshPoints() {
|
||||
try {
|
||||
await loadPoints()
|
||||
} catch (e) { /* 统一错误提示 */ }
|
||||
}
|
||||
|
||||
const doneProcessCount = computed(() => processTimeline.value.length)
|
||||
const torqueTotal = computed(() => torqueRecords.value.length)
|
||||
const torqueOk = computed(() => torqueRecords.value.filter((t) => t.result === 'OK').length)
|
||||
const torqueNg = computed(() => torqueRecords.value.some((t) => t.result === 'NG'))
|
||||
const stepNgCount = computed(() => stepData.value.filter((s) => s.isOK === false).length)
|
||||
|
||||
const canFinish = computed(() => !!snInput.value && !!trace.value && !!pointNo.value && workpiece.value.status !== 'DONE')
|
||||
const blockTip = computed(() => {
|
||||
if (!snInput.value) return '请先扫描工件序列号'
|
||||
if (!trace.value) return '请先查询该工件的完工状态'
|
||||
if (!pointNo.value) return '请选择下料位置(两个末端下料检测位都被占用时请联系班长协调)'
|
||||
if (workpiece.value.status === 'DONE') return '该工件已完工入库'
|
||||
return ''
|
||||
})
|
||||
|
||||
function fmt(v) {
|
||||
if (!v) return '-'
|
||||
if (typeof v === 'number') {
|
||||
const d = new Date(v)
|
||||
const p = (n) => String(n).padStart(2, '0')
|
||||
return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`
|
||||
}
|
||||
return String(v).replace('T', ' ').slice(0, 16)
|
||||
}
|
||||
function wpStatusText(s) {
|
||||
// DONE=完工(与 MES 工件六态口径统一,2026-10-19)
|
||||
return { ONLINE: '已上线', PROCESSING: '在制', DONE: '完工' }[s] || '—'
|
||||
}
|
||||
function wpStatusType(s) {
|
||||
return { ONLINE: 'info', PROCESSING: 'primary', DONE: 'success' }[s] || 'info'
|
||||
}
|
||||
function wipStatusText(s) {
|
||||
return { ONLINE: '已上线', PROCESSING: '在制' }[s] || '—'
|
||||
}
|
||||
function wipStatusType(s) {
|
||||
return { ONLINE: 'info', PROCESSING: 'primary' }[s] || 'info'
|
||||
}
|
||||
|
||||
async function onQuery() {
|
||||
const v = snInput.value.trim()
|
||||
if (!v) {
|
||||
ElMessage.warning('请先扫描或输入工件序列号')
|
||||
return
|
||||
}
|
||||
loading.value = true
|
||||
trace.value = null
|
||||
try {
|
||||
trace.value = await getTrace({ sn: v })
|
||||
} catch (e) { /* 统一错误提示(含无追溯数据) */ }
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
function pickWip(row) {
|
||||
if (!row || !row.sn) return
|
||||
snInput.value = row.sn
|
||||
onQuery()
|
||||
}
|
||||
|
||||
async function onFinish() {
|
||||
if (!canFinish.value) {
|
||||
ElMessage.warning(blockTip.value || '当前不满足完工入库条件')
|
||||
return
|
||||
}
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认工件「${snInput.value}」完工入库并回流 WMS 成品库存?下料位置:${pointNo.value}`,
|
||||
'完工入库确认',
|
||||
{ confirmButtonText: '确认入库', cancelButtonText: '取消', type: 'warning' }
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
submitting.value = true
|
||||
try {
|
||||
const data = await offlineFinish({
|
||||
sn: snInput.value,
|
||||
batchItems: [],
|
||||
serialItems: [],
|
||||
pointNo: pointNo.value,
|
||||
operator: operatorName()
|
||||
})
|
||||
ElMessage.success('完工入库成功,已回流 WMS')
|
||||
snInput.value = ''
|
||||
trace.value = null
|
||||
pointNo.value = ''
|
||||
loadWipScope('end-pending')
|
||||
loadPoints()
|
||||
} catch (e) { /* 统一错误提示 */ }
|
||||
submitting.value = false
|
||||
}
|
||||
|
||||
loadWipScope('end-pending')
|
||||
refreshPoints()
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.offline-panel {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(440px, 1.5fr) minmax(360px, 1fr);
|
||||
gap: 12px;
|
||||
align-content: start;
|
||||
}
|
||||
.card {
|
||||
background: #fff;
|
||||
border-radius: 10px;
|
||||
padding: 14px 16px;
|
||||
box-shadow: 0 1px 6px rgba(0, 21, 41, 0.08);
|
||||
}
|
||||
.card-title {
|
||||
font-size: 18px;
|
||||
font-weight: 600;
|
||||
margin-bottom: 12px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
.form-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.form-row .lab {
|
||||
color: #909399;
|
||||
min-width: 72px;
|
||||
font-size: 16px;
|
||||
}
|
||||
.grow {
|
||||
flex: 1;
|
||||
}
|
||||
.stat-grid {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 18px;
|
||||
padding: 6px 0 10px;
|
||||
}
|
||||
.stat {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
.stat .k {
|
||||
color: #909399;
|
||||
font-size: 14px;
|
||||
}
|
||||
.stat b {
|
||||
font-size: 18px;
|
||||
}
|
||||
.stat b.ok { color: #67c23a; }
|
||||
.stat b.ng { color: #f56c6c; }
|
||||
.sub-title {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
margin: 12px 0 8px;
|
||||
}
|
||||
.action-bar {
|
||||
grid-column: 1 / -1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
background: #fff;
|
||||
border-radius: 10px;
|
||||
padding: 12px 16px;
|
||||
box-shadow: 0 1px 6px rgba(0, 21, 41, 0.08);
|
||||
}
|
||||
.big-btn {
|
||||
min-width: 260px;
|
||||
height: 52px;
|
||||
font-size: 18px;
|
||||
}
|
||||
.block-tip {
|
||||
color: #e6a23c;
|
||||
font-size: 15px;
|
||||
}
|
||||
.point-tip {
|
||||
margin: -4px 0 10px 82px;
|
||||
font-size: 13px;
|
||||
color: #909399;
|
||||
}
|
||||
@media (max-width: 1100px) {
|
||||
.offline-panel {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user