feat: AGV点位锁与缓存迁移 + 工位终端去离线队列 + WMS出入库增强
【MES】 - AGV点位/线路点位/AGV任务/工单 ent schema 重构(全量重生成 ent 代码) - 新增派车锁 agv_point_lock.go:目标点位占用即拒车,JBT21 库房接驳台卸货后保持锁定待库管手动解锁 - 新增进程内 TTL 缓存 cache.go,由 Redis 看板缓存迁移至内存(singleflight 防击穿,去除外部依赖) - AGV 三段链安全机制、车辆状态/接驳台左右互换、补料损耗闭环完善 - 来料检/工序卡/工单/质检/日排产/AGV 前端与帮助文档更新 - 新增 migrations/、sql/ 目录 【WMS】 - 出库、Excel 导出、物料、路由处理增强 - 配置与 DB 初始化调整;基础数据/成品入库/入库前端调整 【工位终端】 - 移除离线同步队列(syncer 包、sync.go、SyncQueueDialog.vue),改为实时直连上报 MES(断网即失败报错),以本人身份操作 - 本地 SQLite 仅保留操作日志 + 内置账号 + 登录态;保留空闲自动登出 【文档】 - 删除 AGV海康litev1.5.md;案例.md 更新
This commit is contained in:
@@ -31,10 +31,7 @@ export const bindRemove = (data) => request.post('/api/bind/remove', data)
|
||||
// 我的工作量(代理 MES,按当前登录人查询)
|
||||
export const getWorkload = (params) => request.get('/api/workload', { params })
|
||||
|
||||
// 拧紧结果列表(本地 SQLite):params 传 {sn} 只取当前工件的拧紧记录
|
||||
export const getTighteningList = (params) => request.get('/api/tightening/list', { params })
|
||||
|
||||
// 录入一条拧紧数据:工件走到拧紧工艺步骤、拧紧枪把扭矩值打入输入框回车时触发
|
||||
// 录入一条拧紧数据:工件走到拧紧工艺步骤、拧紧枪把扭矩值打入输入框回车时触发(实时直连 MES,断网即失败)
|
||||
// {sn, workOrderNo, stepId, stepName, screwNo, torque, angle, result, operator}
|
||||
export const submitTorque = (data) => request.post('/api/tightening/record', data)
|
||||
|
||||
@@ -47,18 +44,9 @@ export const reportTempStore = (data) => request.post('/api/report/temp-store',
|
||||
// 工件报废/人工取走登记(与暂存退库语义互斥:报废=永久退出,退库=可重上线)
|
||||
export const reportScrap = (data) => request.post('/api/report/scrap', data)
|
||||
|
||||
// 手动触发一轮同步
|
||||
export const syncFlush = () => request.post('/api/sync/flush')
|
||||
|
||||
// 退出登录(通知 MES 记录"工位终端退出"操作日志,尽力而为)
|
||||
export const stationLogout = (data) => request.post('/api/station/logout', data)
|
||||
|
||||
// 待同步统计
|
||||
export const getSyncStats = () => request.get('/api/sync/stats')
|
||||
|
||||
// 人工重传处理:修正 payload(如重选点位)后按当前登录人身份再次提交
|
||||
export const retryQueue = (data) => request.post('/api/sync/retry-queue', data)
|
||||
|
||||
// 工艺文件免鉴权直链(iframe / window.open 用):query 传名,支持日期子目录文件名
|
||||
export const pdfOpenUrl = (name) => '/pdfview?name=' + encodeURIComponent(name)
|
||||
|
||||
@@ -71,7 +59,7 @@ export const fileNameFromUrl = (u) => {
|
||||
}
|
||||
|
||||
// ---------- 产线点位 / 叫料(代理 MES) ----------
|
||||
// 产线点位台账(上料位/工位/缓存位/接驳台/末端 当前工件),唯一事实源
|
||||
// 产线点位台账(主线停靠位/缓存位/工位/末端 当前工件),唯一事实源
|
||||
export const getLinePoints = () => request.get('/api/line/points')
|
||||
|
||||
// 点位人工记账:{pointNo, sn, orderNo, action: 'IN'|'OUT'}(扫码即到位凭证:IN=上料到位、OUT=下料释放)
|
||||
|
||||
@@ -5,15 +5,13 @@
|
||||
export const helpWorkstation = {
|
||||
title: '工位终端 使用说明',
|
||||
overview:
|
||||
'工位终端运行在 DOCK01~21 各工艺工位的触屏设备上,是产线最一线的执行入口。\n\n标准流程:①确认本工位号 → ②扫描工件 SN → ③照工艺图纸用拧紧枪打螺丝 → ④看拧紧结果是否全部 OK → ⑤点「报工完成」→ 工件流转到下一工位。\n\n数据链路:下发任务(MES) → 扫码(MES工位任务) → 拧紧结果(丹尼科尔拧紧枪采集,本地SQLite缓存) → 工艺完成上报(MES) → 拧紧/追溯数据回到 MES 管理后台。',
|
||||
'工位终端运行在 DOCK01~21 各工艺工位的触屏设备上,是产线最一线的执行入口。\n\n标准流程:①确认本工位号 → ②扫描工件 SN → ③照工艺图纸用拧紧枪打螺丝 → ④看拧紧结果是否全部 OK → ⑤点「报工完成」→ 工件流转到下一工位。\n\n数据链路:下发任务(MES) → 扫码(MES工位任务) → 拧紧结果(丹尼科尔拧紧枪采集,实时上报MES) → 工艺完成上报(MES) → 拧紧/追溯数据回到 MES 管理后台。所有操作实时上报 MES,断网时操作直接失败并提示重试,不做离线缓存。',
|
||||
sections: [
|
||||
{
|
||||
title: '顶部与工位',
|
||||
overview: '顶部显示当前工位号、登录人、离线同步状态。',
|
||||
overview: '顶部显示当前工位号、登录人。',
|
||||
fields: [
|
||||
{ name: '工位号', source: '下拉选择/固定。数据来自本机配置或固定的 DOCK01~21。', purpose: '当前所在工位,决定读取哪道工艺的任务', fill: '固定工位由配置锁定不可改;否则选与实际工位一致编号' },
|
||||
{ name: '待同步 N 条', source: '系统统计。数据来自本地 SQLite 中尚未上传的记录数。', purpose: '标记有拧紧/工艺数据没上报 MES(离线缓存)', fill: '点开「重传处理」可立即补传(立即同步一轮)' },
|
||||
{ name: '待处理 N 条', source: '系统统计。被 MES 明确拒绝(如所选点位已被其他工件占用)的记录。', purpose: '提醒有数据需人工处理后才能上报', fill: '点开「重传处理」查看失败原因 → 重选空闲点位 → 再次提交;拒绝是保护,人工重选是出路' },
|
||||
{ name: '登录人', source: '登录账号。来自工位终端登录时输入。', purpose: '当前操作员,上报记录会带此名字溯源', fill: '开机登入本人账号,勿共用' }
|
||||
]
|
||||
},
|
||||
@@ -63,10 +61,9 @@ export const helpWorkstation = {
|
||||
{
|
||||
title: '底部三大按钮',
|
||||
fields: [
|
||||
{ name: '报工完成', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '本工位这道工艺做完,通知 MES 流转到下一工位', fill: '点「报工完成」二次确认;联网失败自动离线缓存' },
|
||||
{ name: '报工完成', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '本工位这道工艺做完,通知 MES 流转到下一工位', fill: '点「报工完成」二次确认;断网时操作失败,检查网络后重试' },
|
||||
{ name: '暂存退库', source: '按钮操作 + 确认框。数据上报到 MES(记录已完成工艺)。', purpose: '工件本工艺不做完,退回库房暂存', fill: '点击并二次确认;系统记录已完成工艺,重上线从下一工位继续' },
|
||||
{ name: '报废/取走', source: '按钮操作 + 原因必填弹窗。数据上报到 MES(工件状态置「已报废」)。', purpose: '工件被人工从产线取走(报废/丢失/磕碰损伤/人工处理)时的现场登记入口:永久退出产线且不可恢复、不计入在制,工单由计划员强制完工收尾', fill: '扫 SN → 点「报废/取走」→ 按提示填原因(必填)→ 确认登记。注意与「暂存退库」互斥:暂存=合法暂停可重上线,报废=永久退出;MES 不可达时提示稍后重试,不做离线排队(防重复误报)' },
|
||||
{ name: '待同步(顶部按钮)', source: '按钮操作。打开「重传处理」。', purpose: '查看/处理未上报数据:立即同步一轮、或对 MES 拒绝的记录重选点位后再次提交', fill: '看到「待同步」或「待处理」非 0 时点开处理' }
|
||||
{ name: '报废/取走', source: '按钮操作 + 原因必填弹窗。数据上报到 MES(工件状态置「已报废」)。', purpose: '工件被人工从产线取走(报废/丢失/磕碰损伤/人工处理)时的现场登记入口:永久退出产线且不可恢复、不计入在制,工单由计划员强制完工收尾', fill: '扫 SN → 点「报废/取走」→ 按提示填原因(必填)→ 确认登记。注意与「暂存退库」互斥:暂存=合法暂停可重上线,报废=永久退出;MES 不可达时提示稍后重试,不做离线排队(防重复误报)' }
|
||||
]
|
||||
}
|
||||
]
|
||||
@@ -108,7 +105,7 @@ export const helpOnline = {
|
||||
title: '工件当前位置',
|
||||
overview: '建档时登记工件此刻实际所在的产线点位,建档成功后该点位自动标记为被本工件占用(产线点位台账为唯一事实源)。',
|
||||
fields: [
|
||||
{ name: '工件当前位置', source: 'MES 产线点位台账(只列空闲点位)。', purpose: '记录工件物理位置,供产线点位图/看板/位置核对使用', fill: '分组下拉(上料位/缓存位/停靠位/工位),默认本工位可用位,无则 C1/上料位;点位被他人占用后自动失效需重选' }
|
||||
{ name: '工件当前位置', source: 'MES 产线点位台账(只列空闲点位)。', purpose: '记录工件物理位置,供产线点位图/看板/位置核对使用', fill: '分组下拉(停靠位/缓存位/工位),默认 C1(空闲),C1 不可用则本工位可用位;点位被他人占用后自动失效需重选' }
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -125,7 +122,7 @@ export const helpOnline = {
|
||||
fields: [
|
||||
{ name: '工件 SN', source: '序列号=是:扫码枪扫来料SN(需已在 WMS 入库登记);序列号=否:系统自动生成。', purpose: '唯一识别本台成品,拧紧/工艺/追溯都挂在此 SN 下', fill: '序列号=是=扫描来料SN(必填,MES 校验其在 WMS 库存);序列号=否=无需手填,提交后系统自动发号' },
|
||||
{ name: '待流转在制品', source: 'MES 实时查询。已建档、尚未分配到工位的工件。', purpose: '看清已建档待流转的工件,防止重复建档', fill: '只读展示,点「刷新」更新' },
|
||||
{ name: '确认建档上线', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '正式建档上线,工件进入产线待第 1 工位加工', fill: '满足工单/SN/领料核对后点击并二次确认;MES 不可达时自动离线缓存重传' }
|
||||
{ name: '确认建档上线', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '正式建档上线,工件进入产线待第 1 工位加工', fill: '满足工单/SN/领料核对后点击并二次确认;断网时操作失败,检查网络后重试' }
|
||||
]
|
||||
}
|
||||
]
|
||||
@@ -153,7 +150,7 @@ export const helpOffline = {
|
||||
overview: '列出已到产线末端待取件完工的工件,可点击带入 SN,核对后确认入库回流 WMS。',
|
||||
fields: [
|
||||
{ name: '末端待取件工件', source: 'MES 实时查询。已报工至工艺路线末端的在制工件。', purpose: '看清已到出料口待入库的工件,防止漏件', fill: '点某一行即带入该 SN 并自动查询完工状态' },
|
||||
{ name: '确认完工入库(回流 WMS)', source: '按钮操作 + 确认框。MES 置工件 DONE 并推送 WMS 成品库存。', purpose: '正式完工入库,成品进入 WMS 库存可发货', fill: '核对无不合格后点击并二次确认;MES 不可达时自动离线缓存重传' }
|
||||
{ name: '确认完工入库(回流 WMS)', source: '按钮操作 + 确认框。MES 置工件 DONE 并推送 WMS 成品库存。', purpose: '正式完工入库,成品进入 WMS 库存可发货', fill: '核对无不合格后点击并二次确认;断网时操作失败,检查网络后重试。注意:确认后工件在本终端不可撤销——误入库需到 WMS 库存侧处置(在库处置/复检),本页没有撤回入口' }
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@@ -7,9 +7,7 @@ import {
|
||||
getConfig,
|
||||
getLinePoints,
|
||||
getStationState,
|
||||
getSyncStats,
|
||||
getTaskCurrent,
|
||||
getTighteningList,
|
||||
getWip,
|
||||
occupyLinePoint,
|
||||
pauseStation,
|
||||
@@ -29,7 +27,6 @@ export const state = reactive({
|
||||
tightRows: [],
|
||||
wip: [],
|
||||
bindPanel: null,
|
||||
stats: { pendingTorque: 0, pendingQueue: 0 },
|
||||
stepValues: {},
|
||||
stepChecks: {},
|
||||
bindInputs: {},
|
||||
@@ -112,7 +109,7 @@ export const myPointSn = computed(() => (myPoint.value?.occupied ? myPoint.value
|
||||
export const myDocks = computed(() =>
|
||||
state.points.filter((p) => p.pointType === 'DOCK' && Number(p.stationNo) === Number(state.stationNo))
|
||||
)
|
||||
// 传送带主线点位(上料位/工位/缓存位/末端),按 seq 排序
|
||||
// 传送带主线点位(主线停靠位/缓存位/工位/末端),按 seq 排序
|
||||
export const beltPoints = computed(() =>
|
||||
[...state.points].filter((p) => p.pointType !== 'DOCK').sort((a, b) => (a.seq || 0) - (b.seq || 0))
|
||||
)
|
||||
@@ -137,9 +134,6 @@ export const manualNg = computed(() =>
|
||||
)
|
||||
export const autoNg = computed(() => state.tightRows.some((r) => r.result === 'NG'))
|
||||
export const hasNg = computed(() => manualNg.value || autoNg.value)
|
||||
export const pendingTotal = computed(() => (state.stats.pendingTorque || 0) + (state.stats.pendingQueue || 0))
|
||||
// 待处理(死信):MES 业务拒绝、自动重传不可能成功,须人工重传处理
|
||||
export const deadTotal = computed(() => Number(state.stats.deadTotal || 0))
|
||||
|
||||
// 未勾选"检测确认"的步骤(needCheck=true 必须人工确认后才允许报工)
|
||||
export const missingChecks = computed(() =>
|
||||
@@ -234,18 +228,10 @@ export async function loadPoints() {
|
||||
}
|
||||
}
|
||||
|
||||
// loadTight 只加载「当前工件」的拧紧记录(按 SN 过滤):拧紧数据绑定工件,切换工件即切换明细。
|
||||
// loadTight 拧紧记录刷新(2026-11-05 拍板:断网即失败,扭矩实时直连 MES、本地不持久化)。
|
||||
// 拧紧行改为「当前工件的会话内存态」:切换工件即清空,录入成功由 submitTorqueStep 追加。
|
||||
export async function loadTight() {
|
||||
if (!state.currentSn) {
|
||||
state.tightRows = []
|
||||
return
|
||||
}
|
||||
try {
|
||||
const data = await getTighteningList({ sn: state.currentSn, limit: 100 })
|
||||
state.tightRows = Array.isArray(data) ? data : (data?.list || [])
|
||||
} catch {
|
||||
state.tightRows = []
|
||||
}
|
||||
state.tightRows = state.tightRows.filter((r) => r.sn === state.currentSn)
|
||||
}
|
||||
|
||||
// submitTorqueStep 录入一条拧紧数据:工件走到拧紧工艺步骤、拧紧枪把扭矩值打入输入框回车时调用。
|
||||
@@ -270,7 +256,18 @@ export async function submitTorqueStep(step, torque, angle) {
|
||||
result,
|
||||
operator: operatorName()
|
||||
})
|
||||
await loadTight()
|
||||
// 本地不再持久化扭矩(断网即失败):会话内存追加一行供拧紧完成态/NG 拦截展示
|
||||
state.tightRows = [{
|
||||
sn: state.currentSn,
|
||||
stepId: String(step.id),
|
||||
stepName: step.name || '',
|
||||
screwNo,
|
||||
torque: t,
|
||||
angle: Number(angle) || 0,
|
||||
result,
|
||||
operator: operatorName(),
|
||||
createdAt: Date.now()
|
||||
}, ...state.tightRows]
|
||||
return result
|
||||
}
|
||||
|
||||
@@ -291,11 +288,7 @@ export async function loadBind() {
|
||||
}
|
||||
}
|
||||
|
||||
export async function loadStats() {
|
||||
try {
|
||||
state.stats = await getSyncStats()
|
||||
} catch { /* 静默 */ }
|
||||
}
|
||||
// 2026-11-05 拍板:断网即失败,无离线队列/同步统计(原 loadStats 已移除)。
|
||||
|
||||
// loadWip 拉取停在本工位的未完工在制品(5.2 默认展示)。
|
||||
// stationNo 传本工位号(正整数字符串/数字)。
|
||||
@@ -320,7 +313,7 @@ export async function loadWipScope(scope) {
|
||||
}
|
||||
|
||||
export function refreshAll() {
|
||||
return Promise.all([loadTask(), loadTight(), loadStats(), loadPoints(), loadWip(), loadStationState()])
|
||||
return Promise.all([loadTask(), loadTight(), loadPoints(), loadWip(), loadStationState()])
|
||||
}
|
||||
|
||||
// loadStationState 拉取本工位当天的停单状态(MES /api/internal/station/state),刷新横幅与按钮。
|
||||
|
||||
@@ -7,6 +7,8 @@ import { ElMessage } from 'element-plus'
|
||||
* - 响应头 X-Renewed-Token 自动保存(滑动续签)
|
||||
* - 401 清除登录态并跳转登录页
|
||||
* - 业务 code!==0 弹错并 reject;data 缺省时返回原响应体
|
||||
* - 断网/失败操作直接报错返回:不排队、不自动重试(2026-11-06 拍板)——
|
||||
* 工人看到失败会重做,静默重试会造成重复提交(重复叫料/重复报工等)
|
||||
*/
|
||||
const TOKEN_KEY = 'ws_token'
|
||||
const USER_KEY = 'ws_user'
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
import { onMounted, ref } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { getConfig, getSyncStats, login } from '../api'
|
||||
import { getConfig, login } from '../api'
|
||||
import { setAuth } from '../utils/request'
|
||||
|
||||
const router = useRouter()
|
||||
@@ -83,28 +83,6 @@ async function submit() {
|
||||
setAuth(data.accessToken, data.user)
|
||||
ElMessage.success('登录成功')
|
||||
router.push('/main')
|
||||
// 仅提示本人上次发送失败、仍留在本机的数据条数(不自动打开任何页面);
|
||||
// 他人登录时后端按操作人隔离,不会返回、也不会代发这些数据。
|
||||
try {
|
||||
const stats = await getSyncStats()
|
||||
const n = Number(stats?.pendingTotal || 0)
|
||||
const d = Number(stats?.deadTotal || 0)
|
||||
if (d > 0) {
|
||||
ElMessage({
|
||||
type: 'warning',
|
||||
message: `您有 ${d} 条数据被 MES 拒绝、需人工处理(如点位已被占用):请点顶部「待同步」查看失败原因、重选点位后再次提交`,
|
||||
duration: 8000,
|
||||
showClose: true
|
||||
})
|
||||
} else if (n > 0) {
|
||||
ElMessage({
|
||||
type: 'info',
|
||||
message: `您上次有 ${n} 条报工数据发送失败,仍保留在本机;留意顶部「待同步」即可,系统会自动重发`,
|
||||
duration: 8000,
|
||||
showClose: true
|
||||
})
|
||||
}
|
||||
} catch { /* 统计不可达时静默,不阻断登录 */ }
|
||||
} catch (e) {
|
||||
// 错误提示已由 request 封装统一弹出
|
||||
} finally {
|
||||
|
||||
@@ -18,9 +18,6 @@
|
||||
|
||||
<div class="spacer"></div>
|
||||
|
||||
<el-button size="large" :type="pendingTotal || deadTotal ? 'warning' : 'default'" @click="sqRef?.open()">
|
||||
待同步 {{ pendingTotal }}<template v-if="deadTotal"> · 待处理 {{ deadTotal }}</template>
|
||||
</el-button>
|
||||
<el-button size="large" @click="wlRef?.open()">我的工作量</el-button>
|
||||
<el-button size="large" :title="speechMuted ? '语音播报已关闭,点击开启' : '语音播报中,点击静音'" @click="toggleSpeechMuted">
|
||||
{{ speechMuted ? '🔇' : '🔊' }}
|
||||
@@ -65,7 +62,6 @@
|
||||
</el-tabs>
|
||||
|
||||
<WorkloadDialog ref="wlRef" />
|
||||
<SyncQueueDialog ref="sqRef" />
|
||||
|
||||
<!-- 下班退料弹窗(G3/G4 2026-11-04):接驳台左/右显式必选;实际<理论时损耗原因必填;2026-11-04 定稿:运输方式+参考值 -->
|
||||
<el-dialog v-model="duty.visible" title="剩余物料退料(下班前)" width="980px" :close-on-click-modal="false">
|
||||
@@ -146,7 +142,6 @@ 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 SyncQueueDialog from './panels/SyncQueueDialog.vue'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
import {
|
||||
helpInspect,
|
||||
@@ -164,16 +159,13 @@ import {
|
||||
hasTab,
|
||||
loadConfig,
|
||||
loadPoints,
|
||||
loadStats,
|
||||
loadStationState,
|
||||
loadTight,
|
||||
loadTask,
|
||||
loadWip,
|
||||
deadTotal,
|
||||
orderNo,
|
||||
paused,
|
||||
pauseReason,
|
||||
pendingTotal,
|
||||
refreshAll,
|
||||
sn,
|
||||
state,
|
||||
@@ -209,7 +201,6 @@ const helpData = computed(() => HELP_MAP[tab.value] || helpWorkstation)
|
||||
|
||||
let timerTask = null
|
||||
let timerTight = null
|
||||
let timerStats = null
|
||||
let timerClock = null
|
||||
let alertES = null // 本机报警 SSE(EventSource,断线自动重连)
|
||||
|
||||
@@ -320,26 +311,12 @@ async function logout() {
|
||||
} catch { return }
|
||||
}
|
||||
} catch { /* MES 不可达不拦截退出 */ }
|
||||
// 退出前先本地退出(服务端登出失败也照样退),再按响应提醒本人未发送成功的条数
|
||||
let data = null
|
||||
// 退出前先本地退出(服务端登出失败也照样退)
|
||||
try {
|
||||
data = await stationLogout({ username: user?.username || '', stationNo: stationNo.value || 0 })
|
||||
await stationLogout({ username: user?.username || '', stationNo: stationNo.value || 0 })
|
||||
} catch { /* MES 不可达也继续本地退出 */ }
|
||||
clearAuth()
|
||||
router.push('/login')
|
||||
const n = Number(data?.pendingTotal || 0)
|
||||
const d = Number(data?.deadTotal || 0)
|
||||
if (n > 0 || d > 0) {
|
||||
const parts = []
|
||||
if (n > 0) parts.push(`${n} 条待自动重传`)
|
||||
if (d > 0) parts.push(`${d} 条待人工处理(被 MES 拒绝,需重选点位后再次提交)`)
|
||||
ElMessage({
|
||||
type: 'warning',
|
||||
message: `您有数据未上报成功,仍保留在本机(只有您本人登录可见/可发送):${parts.join(';')}。下次登录后请点「待同步」处理。`,
|
||||
duration: 8000,
|
||||
showClose: true
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/* ===================== 下班/结束作业(2026-11-03 拍板闭环;2026-11-04 G3/G4 升级) ===================== */
|
||||
@@ -492,7 +469,6 @@ onMounted(async () => {
|
||||
|
||||
timerTask = setInterval(loadTask, 5000) // 任务 5 秒
|
||||
timerTight = setInterval(loadTight, 2000) // 拧紧结果 2 秒
|
||||
timerStats = setInterval(loadStats, 10000) // 同步统计 10 秒
|
||||
connectAlertStream() // 本机报警事件流(SSE,断线自动重连)
|
||||
timerClock = setInterval(() => {
|
||||
tickClock()
|
||||
@@ -505,7 +481,6 @@ onMounted(async () => {
|
||||
onBeforeUnmount(() => {
|
||||
clearInterval(timerTask)
|
||||
clearInterval(timerTight)
|
||||
clearInterval(timerStats)
|
||||
clearInterval(timerClock)
|
||||
if (alertES) { alertES.close(); alertES = null }
|
||||
})
|
||||
|
||||
@@ -261,7 +261,7 @@ async function onFinish() {
|
||||
pointNo: pointNo.value,
|
||||
operator: operatorName()
|
||||
})
|
||||
ElMessage.success(data?.queued ? 'MES 暂不可达,已离线缓存,稍后自动重传' : '完工入库成功,已回流 WMS')
|
||||
ElMessage.success('完工入库成功,已回流 WMS')
|
||||
snInput.value = ''
|
||||
trace.value = null
|
||||
pointNo.value = ''
|
||||
|
||||
@@ -153,16 +153,35 @@ const snTip = computed(() => {
|
||||
// 待流转在制品:MES 已按 scope=pending 过滤(ONLINE 未分配工位),此处直接透出
|
||||
const onlineWip = computed(() => wip.value || [])
|
||||
|
||||
// 工件当前位置:按产线点位台账分组(C/H 3.1),只列空闲点位。
|
||||
// 分组 = 上料位(FEED) / 缓存位(CACHE) / 停靠位(DOCK=AGV接驳台) / 工位(STATION);
|
||||
// label = 中文名(编号),value = 编号。
|
||||
const POINT_TYPE_GROUP = { FEED: '上料位', CACHE: '缓存位', DOCK: '停靠位', STATION: '工位' }
|
||||
// 业务口径(2026-11-06 条20 拍板):工件位置下拉的「工位」分组按当前选中工单的工艺组合候选工位过滤;
|
||||
// 未选工单时不显示工位分组(提示走 blockTip「请先选择工单号」)。
|
||||
// 工艺组合数据源=工单列表接口自带 flowCombination[{flowId,stationNo}],前端本地过滤(改动最小)。
|
||||
const routeStations = computed(() => {
|
||||
if (!form.orderNo) return null
|
||||
const opt = orderOptions.value.find((o) => o.value === form.orderNo)
|
||||
const combo = (opt && opt.raw && opt.raw.flowCombination) || []
|
||||
const set = new Set()
|
||||
for (const it of combo) {
|
||||
const n = Number(it && it.stationNo)
|
||||
if (!Number.isNaN(n)) set.add(n)
|
||||
}
|
||||
return set
|
||||
})
|
||||
|
||||
// 工件当前位置:按产线点位台账分组(主线位置编址版 2026-11-05),只列空闲点位。
|
||||
// 分组 = 停靠位(STOP=C1/C4/C7/C10/C13/C15,不缓存) / 缓存位(CACHE=C2/C3/C5/C6/C8/C9/C11/C12/C14) / 工位(STATION);
|
||||
// 文档无独立上料点位(上料=放主线任意位置或任意工位),FEED"上料位"已废弃删除;接驳台(DOCK=AGV 点位)不作落点、不进下拉。
|
||||
const POINT_TYPE_GROUP = { STOP: '停靠位', CACHE: '缓存位', STATION: '工位' }
|
||||
const startPointGroups = computed(() => {
|
||||
const groups = {}
|
||||
for (const p of state.points || []) {
|
||||
if (!p || p.occupied) continue
|
||||
const g = POINT_TYPE_GROUP[p.pointType]
|
||||
if (!g) continue
|
||||
if (p.pointType === 'STATION') {
|
||||
if (!routeStations.value) continue // 未选工单:不显示工位分组
|
||||
if (!routeStations.value.has(Number(p.stationNo))) continue // 不在本工单工艺组合内
|
||||
}
|
||||
if (!groups[g]) groups[g] = []
|
||||
groups[g].push({ pointNo: p.pointNo, label: `${p.label || p.pointNo}(${p.pointNo})` })
|
||||
}
|
||||
@@ -172,14 +191,14 @@ const startPointGroups = computed(() => {
|
||||
return Object.keys(groups).map((label) => ({ label, options: groups[label] }))
|
||||
})
|
||||
|
||||
// 默认位置(按现有口径):本工位点位(空闲)→ 缓存位 C1 → 上料位;都不行返回空(阻断提交)
|
||||
// 默认位置(2026-11-05 拍板):默认选中停靠位 C1(空闲;文档"上料位默认C1");
|
||||
// C1 不可用(被占/不存在)时回退本工位点位;都不行返回空(阻断提交,不传 0——提交必须为已选项)
|
||||
function defaultStartPointNo() {
|
||||
const pts = state.points || []
|
||||
const free = (p) => p && !p.occupied
|
||||
if (free(pts.find((p) => p.pointNo === 'C1'))) return 'C1'
|
||||
const mine = pts.find((p) => p.pointType === 'STATION' && String(p.pointNo) === String(state.stationNo))
|
||||
if (free(mine)) return mine.pointNo
|
||||
if (free(pts.find((p) => p.pointNo === 'C1'))) return 'C1'
|
||||
if (free(pts.find((p) => p.pointType === 'FEED'))) return pts.find((p) => p.pointType === 'FEED').pointNo
|
||||
return ''
|
||||
}
|
||||
// 点位台账刷新后:未选/已失效(被他人占用)时回填默认值
|
||||
@@ -232,6 +251,11 @@ async function loadOrders() {
|
||||
try {
|
||||
const list = await queryOrder({})
|
||||
orders.value = Array.isArray(list) ? list : (list && list.list ? list.list : [])
|
||||
// 业务口径(2026-11-06 条19 拍板):活跃工单只有一个时默认选中,工人少点一步
|
||||
if (!form.orderNo && orderOptions.value.length === 1) {
|
||||
form.orderNo = orderOptions.value[0].value
|
||||
onOrderChange(form.orderNo)
|
||||
}
|
||||
} catch (e) { /* 统一错误提示 */ }
|
||||
loadingOrder.value = false
|
||||
}
|
||||
@@ -274,6 +298,8 @@ function genSn() {
|
||||
form.sn = `${prefix}-${stamp}-${rand}`
|
||||
}
|
||||
|
||||
// 业务口径(2026-11-06 拍板):断网时上线建档直接失败报错,不排队、不自动重试——
|
||||
// 工人看到失败会重做;静默重试会造成重复建档。
|
||||
async function onSubmit() {
|
||||
if (!canSubmit.value) {
|
||||
ElMessage.warning(blockTip.value || '当前不满足建档条件')
|
||||
@@ -299,13 +325,9 @@ async function onSubmit() {
|
||||
pointNo: form.pointNo || undefined,
|
||||
operator: operatorName()
|
||||
})
|
||||
if (data && data.queued) {
|
||||
ElMessage.success('MES 暂不可达,已离线缓存,稍后自动重传')
|
||||
} else {
|
||||
ElMessage.success('建档上线成功')
|
||||
// #8 T3(建档提交):MES 已附 PLC↔MES 对账结果,命中则弹「两项」提示(不拦)
|
||||
if (data && data.hasMismatch) showMismatch(data)
|
||||
}
|
||||
ElMessage.success('建档上线成功')
|
||||
// #8 T3(建档提交):MES 已附 PLC↔MES 对账结果,命中则弹「两项」提示(不拦)
|
||||
if (data && data.hasMismatch) showMismatch(data)
|
||||
form.sn = ''
|
||||
// 建档后该点位已被占用:回填下一个默认空闲位
|
||||
form.pointNo = defaultStartPointNo()
|
||||
|
||||
@@ -1,236 +0,0 @@
|
||||
<template>
|
||||
<el-dialog v-model="visible" title="数据重传处理" width="900px" top="6vh" destroy-on-close>
|
||||
<!-- 待自动重传:网络失败类,下轮同步(15 秒)自动发送,无需人工处理 -->
|
||||
<div class="sec-title">待自动重传({{ queue.length }})</div>
|
||||
<el-alert type="info" :closable="false" class="tip">
|
||||
MES 暂不可达导致的数据,网络恢复后按当前登录人身份自动发送(每 15 秒一轮),无需处理。
|
||||
</el-alert>
|
||||
<el-table :data="queue" border size="small" max-height="200">
|
||||
<el-table-column label="类型" width="100" align="center">
|
||||
<template #default="{ row }">{{ kindLabel(row.kind) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工件序列号" width="170" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ brief(row).sn }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工单" min-width="140" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ brief(row).orderNo }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="点位" width="150" align="center">
|
||||
<template #default="{ row }">{{ brief(row).pointNo || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已重试" width="80" align="center">
|
||||
<template #default="{ row }">{{ row.retryCount || 0 }} 次</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="录入时间" width="160">
|
||||
<template #default="{ row }">{{ fmt(row.createdAt) }}</template>
|
||||
</el-table-column>
|
||||
<template #empty><el-empty description="无待自动重传数据" :image-size="40" /></template>
|
||||
</el-table>
|
||||
|
||||
<el-divider />
|
||||
|
||||
<!-- 待处理:MES 业务拒绝(如点位已被占用),自动重传不可能成功,须人工处理后再次提交 -->
|
||||
<div class="sec-title danger">待处理({{ dead.length }})</div>
|
||||
<el-alert type="warning" :closable="false" class="tip">
|
||||
以下记录被 MES 明确拒绝(如所选点位已被其他工件占用),原样重传不可能成功。
|
||||
请按失败原因处理后重新选择空闲点位,再次提交;拒绝是保护,人工重选是出路。
|
||||
</el-alert>
|
||||
<el-table :data="dead" border size="small" max-height="340">
|
||||
<el-table-column label="类型" width="100" align="center">
|
||||
<template #default="{ row }">{{ kindLabel(row.kind) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工件序列号" width="150" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ brief(row).sn }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工单" min-width="130" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ brief(row).orderNo }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="原选点位" width="130" align="center">
|
||||
<template #default="{ row }">{{ brief(row).pointNo || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="失败原因" min-width="180" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<span class="reason">{{ row.lastError || 'MES 业务拒绝' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="280" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<div class="retry-cell" v-if="needPoint(row)">
|
||||
<el-select v-model="picked[row.id]" size="small" style="width:170px"
|
||||
placeholder="重选空闲点位" filterable>
|
||||
<el-option-group v-for="g in pointGroups(row)" :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 type="primary" size="small" :loading="submitting === row.id"
|
||||
:disabled="!picked[row.id]" @click="submitRetry(row)">再次提交</el-button>
|
||||
</div>
|
||||
<el-button v-else type="primary" size="small" :loading="submitting === row.id"
|
||||
@click="submitRetry(row)">重新提交</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template #empty><el-empty description="无待处理记录" :image-size="40" /></template>
|
||||
</el-table>
|
||||
|
||||
<template #footer>
|
||||
<el-button @click="flushNow">立即同步一轮</el-button>
|
||||
<el-button type="primary" @click="visible = false">关闭</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { getLinePoints, getSyncStats, retryQueue, syncFlush } from '../../api'
|
||||
|
||||
const visible = ref(false)
|
||||
const queue = ref([])
|
||||
const dead = ref([])
|
||||
const points = ref([])
|
||||
const picked = ref({})
|
||||
const submitting = ref(0)
|
||||
|
||||
const KIND_LABEL = {
|
||||
process_done: '报工',
|
||||
temp_store: '暂存退库',
|
||||
online_register: '上线建档',
|
||||
offline_finish: '下线完工'
|
||||
}
|
||||
function kindLabel(k) { return KIND_LABEL[k] || '—' }
|
||||
|
||||
// 解析 payload(JSON 字符串),取出展示字段
|
||||
function brief(row) {
|
||||
try {
|
||||
const p = JSON.parse(row.payload || '{}')
|
||||
return {
|
||||
sn: p.sn || '—',
|
||||
orderNo: p.orderNo || p.workOrderNo || '—',
|
||||
pointNo: p.pointNo || ''
|
||||
}
|
||||
} catch {
|
||||
return { sn: '—', orderNo: '—', pointNo: '' }
|
||||
}
|
||||
}
|
||||
|
||||
// 涉及点位选择的类型(MES CheckPointFree 拒绝的高发场景)
|
||||
function needPoint(row) {
|
||||
return row.kind === 'online_register' || row.kind === 'offline_finish'
|
||||
}
|
||||
|
||||
// 重选点位候选项(只列空闲位):
|
||||
// 上线建档 = 上料位/缓存位/停靠位/工位;下线完工 = 末端下料检测位 END-U(上排)/END-D(下排)
|
||||
function pointGroups(row) {
|
||||
const free = points.value.filter((p) => !p.occupied)
|
||||
if (row.kind === 'offline_finish') {
|
||||
return [{
|
||||
label: '末端下料检测位',
|
||||
options: free.filter((p) => p.pointType === 'END')
|
||||
.sort((a, b) => (a.pointNo || '').localeCompare(b.pointNo || ''))
|
||||
.map((p) => ({
|
||||
pointNo: p.pointNo,
|
||||
label: `${p.pointNo === 'END-U' ? '下料检测位 G11(上排)' : '下料检测位 G12(下排)'}(${p.pointNo})`
|
||||
}))
|
||||
}]
|
||||
}
|
||||
const groups = [
|
||||
{ label: '上料位', type: 'FEED' },
|
||||
{ label: '缓存位', type: 'CACHE' },
|
||||
{ label: '停靠位(AGV接驳台)', type: 'DOCK' },
|
||||
{ label: '工位', type: 'STATION' }
|
||||
]
|
||||
return groups.map((g) => ({
|
||||
label: g.label,
|
||||
options: free.filter((p) => p.pointType === g.type)
|
||||
.sort((a, b) => (a.pointNo || '').localeCompare(b.pointNo || '', 'zh-Hans-CN', { numeric: true }))
|
||||
.map((p) => ({ pointNo: p.pointNo, label: `${p.label || p.pointNo}(${p.pointNo})` }))
|
||||
})).filter((g) => g.options.length)
|
||||
}
|
||||
|
||||
function fmt(ts) {
|
||||
if (!ts) return '—'
|
||||
const d = new Date(Number(ts) * 1000)
|
||||
const p = (n) => String(n).padStart(2, '0')
|
||||
return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`
|
||||
}
|
||||
|
||||
async function load() {
|
||||
try {
|
||||
const s = await getSyncStats()
|
||||
queue.value = Array.isArray(s?.queue) ? s.queue : []
|
||||
dead.value = Array.isArray(s?.queueDead) ? s.queueDead : []
|
||||
} catch { /* 统一错误提示 */ }
|
||||
}
|
||||
|
||||
async function open() {
|
||||
visible.value = true
|
||||
picked.value = {}
|
||||
await Promise.all([
|
||||
load(),
|
||||
getLinePoints().then((d) => {
|
||||
const list = Array.isArray(d) ? d : (Array.isArray(d?.list) ? d.list : [])
|
||||
points.value = list
|
||||
}).catch(() => { points.value = [] })
|
||||
])
|
||||
}
|
||||
|
||||
// 再次提交:修正 payload(重选点位)→ 重置为待重传 → 按当前登录人身份立即发一轮
|
||||
async function submitRetry(row) {
|
||||
let payload
|
||||
try {
|
||||
payload = JSON.parse(row.payload || '{}')
|
||||
} catch {
|
||||
ElMessage.error('上报内容解析失败,无法重传')
|
||||
return
|
||||
}
|
||||
const newPoint = picked.value[row.id]
|
||||
if (needPoint(row)) {
|
||||
if (!newPoint) {
|
||||
ElMessage.warning('请先选择空闲点位')
|
||||
return
|
||||
}
|
||||
payload.pointNo = newPoint
|
||||
}
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认重新提交该${kindLabel(row.kind)}记录?\n\n工件:${payload.sn || '—'}\n` +
|
||||
(needPoint(row) ? `点位:${newPoint}\n` : '') +
|
||||
`提交后将按当前登录人身份立即发送;若再次被拒绝会原样留在本列表并显示新原因。`,
|
||||
'再次提交',
|
||||
{ type: 'warning', confirmButtonText: '确认提交', cancelButtonText: '取消' }
|
||||
)
|
||||
} catch { return }
|
||||
submitting.value = row.id
|
||||
try {
|
||||
const res = await retryQueue({ id: row.id, payload })
|
||||
if (res?.status === 'synced') {
|
||||
ElMessage.success('重传成功,已上报 MES')
|
||||
} else if (res?.status === 'rejected') {
|
||||
ElMessage.error(`仍被 MES 拒绝:${res.message || '请查看失败原因'}`)
|
||||
} else {
|
||||
ElMessage.warning(res?.message || 'MES 暂不可达,已留在队列等待下轮自动重传')
|
||||
}
|
||||
await load()
|
||||
} catch { /* 统一错误提示 */ }
|
||||
finally { submitting.value = 0 }
|
||||
}
|
||||
|
||||
// 供外部(Main.vue)在待同步按钮点击时一并冲刷
|
||||
async function flushNow() {
|
||||
try {
|
||||
const data = await syncFlush()
|
||||
ElMessage.success(`本轮同步成功 ${data?.count ?? 0} 条`)
|
||||
} catch { /* 统一错误提示 */ }
|
||||
await load()
|
||||
}
|
||||
|
||||
defineExpose({ open, flushNow })
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.sec-title { font-weight: 600; margin-bottom: 8px; color: #303133; }
|
||||
.sec-title.danger { color: #e6a23c; }
|
||||
.tip { margin-bottom: 10px; }
|
||||
.reason { color: #f56c6c; }
|
||||
.retry-cell { display: flex; align-items: center; gap: 8px; }
|
||||
</style>
|
||||
@@ -253,7 +253,6 @@ import {
|
||||
hasNg,
|
||||
loadBind,
|
||||
loadPoints,
|
||||
loadStats,
|
||||
loadTask,
|
||||
loadWip,
|
||||
manualSteps,
|
||||
@@ -664,10 +663,9 @@ async function onProcessDone() {
|
||||
startedAt: startedAt.value || '',
|
||||
endedAt: new Date().toISOString()
|
||||
})
|
||||
ElMessage.success(data?.queued ? 'MES 暂不可达,已离线缓存,稍后自动重传' : '报工成功')
|
||||
ElMessage.success('报工成功')
|
||||
setCurrentSn('')
|
||||
loadTask()
|
||||
loadStats()
|
||||
loadPoints()
|
||||
} catch (e) { /* 统一错误提示 */ }
|
||||
}
|
||||
@@ -694,10 +692,9 @@ async function onTempStore() {
|
||||
flowId: flowId.value,
|
||||
operator: operatorName()
|
||||
})
|
||||
ElMessage.success(data?.queued ? 'MES 暂不可达,已离线缓存' : '暂存退库已上报')
|
||||
ElMessage.success('暂存退库已上报')
|
||||
setCurrentSn('')
|
||||
loadTask()
|
||||
loadStats()
|
||||
loadPoints()
|
||||
} catch (e) { /* 统一错误提示 */ }
|
||||
}
|
||||
@@ -730,7 +727,6 @@ async function onScrap() {
|
||||
ElMessage.success('已登记报废/取走')
|
||||
setCurrentSn('')
|
||||
loadTask()
|
||||
loadStats()
|
||||
loadPoints()
|
||||
} catch (e) { /* 统一错误提示 */ }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user