feat: 退料闭环定稿(损耗台账/备料清单/退料AGV自动派车/剩余量参考)+ 工位托盘守卫

- MES 新增损耗台账 loss_ledger,差异确认损耗接口 ConfirmReceiveLoss(按工单归集)
- 备料清单 preparation:MES 按 日计划×工单×工位×物料 实时计算,WMS 只读展示 PreparationList
- 退料闭环:N5 工位托盘守卫(未完成禁止退料)、退料 AGV 自动派车(JBT21 空位判定 + 托盘回收链路)、退料参考剩余量接口(应剩余=实备-已耗-已退-已损)
- 新增 AGV 车辆状态表 agv_vehicle_state 及查询
- 整合接驳台/叫料池/库存锁既有闭环,清理 sql 目录注释生成脚本与 catalog,更新文档
This commit is contained in:
SunYF
2026-11-04 19:06:03 +08:00
parent 42bcf395d2
commit 46fcb59079
123 changed files with 10666 additions and 3227 deletions
+77 -5
View File
@@ -32,10 +32,10 @@ async function loadDocks() {
}
// 显示层统一(2026-11-03 左右互换拍板):接驳台按 side(操作员朝向 left/right)显示「工位X左/右」;
// 库房接驳台一律显示「库房接驳台」,不显示 DOCK21/JBT21 编号。
// 库房接驳台一律显示「库房接驳台」,不显示 JBT21 编号(T7 2026-11-03 统一代号)。
const dockCn = (d) => {
if (!d) return '—'
if (String(d.dockCode || '') === 'DOCK21') return '库房接驳台'
if (String(d.dockCode || '') === 'JBT21' || String(d.dockCode || '') === 'DOCK21') return '库房接驳台'
const s = d.side === 'left' ? '左' : d.side === 'right' ? '右' : ''
return `工位${d.stationNo || ''}${s}`
}
@@ -172,7 +172,7 @@ const mrTotal = ref(0)
const mrQuery = reactive({ status: 'SHIPPED' })
const loadingMrs = ref(false)
const selected = ref([])
const sourceDock = ref('DOCK21')
const sourceDock = ref('JBT21')
async function loadMrs() {
loadingMrs.value = true
@@ -324,7 +324,7 @@ async function loadMode() {
} catch { /* 忽略 */ }
}
onMounted(() => { loadDocks(); loadTasks(); loadMode(); loadAgvPoints(); loadVehicles() })
onMounted(() => { loadDocks(); loadTasks(); loadMode(); loadAgvPoints(); loadVehicles(); loadVehicleStates() })
// 车辆状态只读(海康 3.1.7,2026-11-03 拍板:纯只读展示,不干预调度)
const vehicles = ref([])
@@ -343,13 +343,50 @@ async function loadVehicles() {
}
const vehicleStateCn = (s) => ({ '4': '空闲', '2': '执行中', '7': '充电', '1': '任务完成', '5': '异常', '3': '异常', '6': '举升中' }[s] || ('状态' + s))
// 载货状态台账(2026-11-04 防撞补做):取货/卸货确认自动维护,此处提供人工修正入口(留痕操作人/时间)
const vehicleStates = ref([])
const loadingStates = ref(false)
const manualAgvCode = ref('')
async function loadVehicleStates() {
loadingStates.value = true
try {
const d = await request.get('/agv/vehicle-states')
vehicleStates.value = d?.list || []
} catch { vehicleStates.value = [] }
loadingStates.value = false
}
async function setVehicleState(row, hasPallet) {
try {
await ElMessageBox.confirm(
`确认把 AGV「${row.agvCode === 'DEFAULT' ? 'DEFAULT(未识别车辆)' : row.agvCode}」载货状态改为「${hasPallet ? '有托盘' : '空车'}」?该状态直接参与派车防撞校验。`,
'修改载货状态', { type: 'warning', confirmButtonText: '确认修改', cancelButtonText: '返回' }
)
} catch { return }
try {
await request.post('/agv/vehicle-states/set', { agvCode: row.agvCode, hasPallet, remark: '页面人工维护' }, withOperator())
ElMessage.success('载货状态已更新')
loadVehicleStates()
} catch { /* 拦截器已提示 */ }
}
async function addManualState(hasPallet) {
const code = (manualAgvCode.value || '').trim()
if (!code) { ElMessage.warning('请先填写车辆编号'); return }
try {
await request.post('/agv/vehicle-states/set', { agvCode: code, hasPallet, remark: '页面人工新增/修改' }, withOperator())
ElMessage.success('载货状态已更新')
manualAgvCode.value = ''
loadVehicleStates()
} catch { /* 拦截器已提示 */ }
}
const stateSourceCn = (s) => ({ AUTO_LOAD: '取货确认', AUTO_UNLOAD: '卸货确认', MANUAL: '人工维护' }[s] || s)
// 切 tab 重新加载对应数据(2026-10-19:lazy 页签切回不 reload,状态/叫料单会停留在旧数据)
function onTabChange(name) {
if (name === 'docks') loadDocks()
else if (name === 'tasks') loadTasks()
else if (name === 'dispatch') loadMrs()
else if (name === 'points') loadAgvPoints()
else if (name === 'vehicles') loadVehicles()
else if (name === 'vehicles') { loadVehicles(); loadVehicleStates() }
}
</script>
@@ -403,6 +440,41 @@ function onTabChange(name) {
</div>
<el-empty v-if="!vehicles.length && !vehicleUnavailable && !loadingVehicles" description="暂无车辆数据" />
</div>
<!-- 载货状态维护(2026-11-04 防撞校验补做):人工改「有托盘/空车」,留痕操作人/时间 -->
<div class="toolbar" style="margin-top:16px">
<span class="tip">● 载货台账:取货确认→置「有托盘」,卸货确认→置「空车」;派车前防撞校验——AGV 载有托盘时不能前往已有托盘的接驳台(可在此人工修正)</span>
</div>
<div class="toolbar">
<el-input v-model="manualAgvCode" placeholder="车辆编号(RCS robotCode / agvCode)" style="width: 240px" clearable />
<el-button type="warning" @click="addManualState(true)">设为有托盘</el-button>
<el-button @click="addManualState(false)">设为空车</el-button>
</div>
<el-table :data="vehicleStates" v-loading="loadingStates" border stripe>
<el-table-column label="车辆编号" width="200">
<template #default="{ row }">{{ row.agvCode === 'DEFAULT' ? 'DEFAULT(未识别车辆)' : row.agvCode }}</template>
</el-table-column>
<el-table-column label="载货状态" width="120" align="center">
<template #default="{ row }">
<el-tag :type="row.hasPallet ? 'warning' : 'success'">{{ row.hasPallet ? '有托盘' : '空车' }}</el-tag>
</template>
</el-table-column>
<el-table-column label="状态来源" width="110" align="center">
<template #default="{ row }">{{ stateSourceCn(row.source) }}</template>
</el-table-column>
<el-table-column prop="updatedBy" label="更新人" width="120" />
<el-table-column label="更新时间" width="160">
<template #default="{ row }">{{ row.updatedAt ? fmtTime(row.updatedAt) : '-' }}</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="140" show-overflow-tooltip />
<el-table-column label="操作" width="180" align="center">
<template #default="{ row }">
<el-button v-if="!row.hasPallet" size="small" type="warning" @click="setVehicleState(row, true)">设为有托盘</el-button>
<el-button v-else size="small" @click="setVehicleState(row, false)">设为空车</el-button>
</template>
</el-table-column>
<template #empty>暂无载货台账(取货/卸货确认或人工维护后生成)</template>
</el-table>
</el-tab-pane>
<!-- ② AGV 任务列表 -->
@@ -117,9 +117,9 @@ const dlg = reactive({
const TYPE_LABEL = { line: '产线', store: '库房', other: '其他' }
function typeLabel(t) { return TYPE_LABEL[t] || '其他' }
function tagType(t) { return t === 'line' ? 'success' : (t === 'store' ? 'warning' : 'info') }
// 显示层统一(2026-10-17 裁定):库房接驳台一律显示「库房接驳台」,不显示 DOCK21/JBT21 编号
// (DOCK21 仅作后端映射;PLC 侧对应点位于 PLC 监控页同样只显示「库房接驳台」)
function dockCodeLabel(code) { return String(code || '') === 'DOCK21' ? '库房接驳台' : code || '—' }
// 显示层统一(2026-10-17 裁定):库房接驳台一律显示「库房接驳台」,不显示 JBT21 编号
// (JBT21 仅作后端映射,T7 2026-11-03 统一代号;PLC 侧对应点位于 PLC 监控页同样只显示「库房接驳台」)
function dockCodeLabel(code) { return String(code || '') === 'JBT21' ? '库房接驳台' : code || '—' }
// 接驳台编码格式校验(运行期禁用正则:仅大写字母与数字,长度 2~16)。
function isDockCodeAlnum(code) {
@@ -62,6 +62,19 @@
<el-table-column label="退库量" width="90" align="center">
<template #default="{row}">{{ Number(row.returnedQty || 0) > 0 ? fmtQty(row.returnedQty) : '—' }}</template>
</el-table-column>
<!-- R18(2026-11-03 拍板):收货差异(实收<应退记「待核」,核实为损耗再挂工单,不自动进损耗台账) -->
<el-table-column label="实收/差异" width="110" align="center">
<template #default="{row}">
<span v-if="Number(row.receiveDiff || 0) > 0">
{{ fmtQty(row.receiveQty) }} / <span style="color:#e6a23c">差{{ fmtQty(row.receiveDiff) }}</span>
</span>
<span v-else-if="Number(row.receiveQty || 0) > 0">{{ fmtQty(row.receiveQty) }}</span>
<span v-else style="color:#999">—</span>
</template>
</el-table-column>
<el-table-column label="差异备注" min-width="130" show-overflow-tooltip>
<template #default="{row}">{{ row.receiveNote || '—' }}</template>
</el-table-column>
<el-table-column label="跨日" width="80" align="center">
<template #default="{row}">
<el-tag v-if="row.crossDay" type="warning" size="small">非当日</el-tag>
@@ -77,6 +90,16 @@
<el-table-column prop="rejectReason" label="驳回理由" min-width="130" show-overflow-tooltip />
<el-table-column prop="refReportNo" label="数量不符单号" min-width="140" show-overflow-tooltip />
<el-table-column prop="operator" label="操作人" width="90" />
<!-- F(2026-11-04 定稿):损耗确认移 WMS 退库单页(库管确认收货时实收<应退就地填损耗原因落账)——
MES 侧只读展示差异,不再设「确认损耗」按钮;损耗台账页仅展示+主管批注(后审核)。 -->
<el-table-column label="实收/差异" width="110" align="center" fixed="right">
<template #default="{row}">
<span v-if="Number(row.receiveDiff || 0) > 0">
{{ fmtQty(row.receiveQty) }} / <span style="color:#e6a23c">差{{ fmtQty(row.receiveDiff) }}</span>
</span>
<span v-else style="color:#999">—</span>
</template>
</el-table-column>
</el-table>
</el-card>
@@ -85,7 +108,6 @@
<script setup>
import { reactive, ref, onMounted } from 'vue'
import { ElMessage } from 'element-plus'
import request from '../utils/request'
import { confirmExport } from '../utils/confirm'
import PageHelp from '../components/PageHelp.vue'
@@ -109,6 +131,9 @@ const STATUS_TAG = {
const statusText = (s) => STATUS_TEXT[s] || s || '—'
const statusTag = (s) => STATUS_TAG[s] || 'info'
// F(2026-11-04 定稿):确认损耗按钮已移除——损耗确认唯一入口 = WMS 退库单页确认收货(实收<应退就地填原因落账)。
// MES 侧后端 /material-requests/confirm-loss 端点保留(T2 既有接口,台账页仅展示+主管批注)。
// 借料来源:material_request.borrow_from(stationNo→借用量);本工位自取不计,仅展示真正借出的兄弟工位
function hasBorrow(row) {
const b = row.borrowFrom || {}
@@ -137,14 +162,15 @@ 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, borrowText(r),
r.reqQty, r.sentQty, r.returnedQty, r.crossDay ? '非当日' : '',
r.reqQty, r.sentQty, r.returnedQty, r.receiveQty ?? '', r.receiveDiff ?? '', r.receiveNote || '',
r.crossDay ? '非当日' : '',
r.outboundNo, statusText(r.status), r.rejectReason, r.refReportNo, r.operator
]
lines.push(cells.map((c) => '"' + String(c ?? '').replace(/"/g, '""') + '"').join(','))
@@ -144,6 +144,19 @@
@current-change="load" />
</el-tab-pane>
<!-- 工单损耗(R8 2026-11-03 拍板):绩效读工单损耗——按工单号聚合损耗台账;主管批注只写批注不改损耗量 -->
<el-tab-pane label="工单损耗" name="lossByOrder">
<el-alert type="info" :closable="false" style="margin-bottom:12px"
title="数据来源=工单退料产生的损耗记录(损耗台账),按产品工号聚合;台账主管批注不改变损耗量。时间/产品工号筛选与本页其他页签同口径。" />
<el-table :data="views.lossByOrder.list" border size="small">
<el-table-column prop="orderNo" label="产品工号" min-width="180" />
<el-table-column prop="lossQty" label="损耗量" width="160" align="right" />
</el-table>
<div style="margin-top:10px;color:#909399;font-size:13px">
筛选范围内工单损耗合计:<b>{{ lossTotalText }}</b>
</div>
</el-tab-pane>
<!-- 上机记录:上机=开工签到,下机=签到后最后活动(报工/巡检),零新表推导 -->
<el-tab-pane label="上机记录" name="session">
<el-alert type="info" :closable="false" style="margin-bottom:12px"
@@ -186,8 +199,11 @@ const views = reactive({
byOperator: { total: 0, page: 1, list: [] },
byStation: { total: 0, page: 1, list: [] },
detail: { total: 0, page: 1, list: [] },
session: { total: 0, list: [] }
session: { total: 0, list: [] },
lossByOrder: { total: 0, list: [] } // R8:工单损耗(按工单号聚合损耗台账)
})
const lossTotal = ref(0)
const lossTotalText = computed(() => (Number(lossTotal.value) || 0) > 0 ? String(lossTotal.value) : '0(无损耗记录)')
const summary = computed(() => {
let doneCount = 0, okCount = 0, ngCount = 0
@@ -263,6 +279,11 @@ async function load() {
const ses = data.sessions || {}
views.session.total = ses.total || 0
views.session.list = ses.list || []
// R8 工单损耗:按工单号聚合
const loss = data.lossByOrder || {}
views.lossByOrder.total = loss.total || 0
views.lossByOrder.list = loss.list || []
lossTotal.value = Number(data.lossTotal) || 0
}
// 导出:后端一个 xlsx 四个 sheet(按人/按工位/明细/上机记录),执行统一导出时间硬规则
+4 -2
View File
@@ -39,7 +39,7 @@
<el-form-item label="产品工号"><el-input v-model="query.orderNo" clearable style="width:160px" placeholder="不区分大小写" /></el-form-item>
<el-form-item label="状态">
<el-select v-model="query.status" clearable placeholder="全部" style="width:120px">
<el-option label="已下发" value="SENT" />
<el-option label="已下发·等待完成" value="SENT" />
<el-option label="已完成" value="DONE" />
<el-option label="已撤回" value="CANCELLED" />
</el-select>
@@ -122,7 +122,9 @@ const withdrawRow = ref(null)
const withdrawReason = ref('')
const plcStatusText = (s) => ({
SENT: '已下发', DONE: '已完成', CANCELLED: '已撤回', TIMEOUT: '已超时', REPLY_NG: '回复异常'
// SENT=已下发未收到 PLC 完成信号=路线被挡(人工挡路/前序未走完),系统保持等待、拒绝下发下一条;
// 等待过久可「人工完成」收口或「撤回」重派(现场确认工件实际到位后使用)。
SENT: '已下发·等待完成信号', DONE: '已完成', CANCELLED: '已撤回', TIMEOUT: '已超时', REPLY_NG: '回复异常'
}[s] || s)
const statusTagType = (s) => (s === 'DONE' ? 'success' : s === 'CANCELLED' ? 'info' : 'warning')
@@ -38,6 +38,16 @@
<el-table-column label="理论应剩" width="100" align="center">
<template #default="{ row }"><el-tag type="warning">{{ row.theoryQty }}</el-tag></template>
</el-table-column>
<!-- G(2026-11-04 定稿):剩余余量=应剩余量−已退余量−已损耗;仅展示不阻断提交 -->
<el-table-column label="剩余参考值" width="110" align="center">
<template #default="{ row }">
<span v-if="rowRefOf(it.orderNo, row.materialCode)"
:style="{ color: rowRefOf(it.orderNo, row.materialCode).refLeft < 0 ? '#f56c6c' : '#67c23a', fontWeight: 600 }">
{{ rowRefOf(it.orderNo, row.materialCode).refLeft }}
</span>
<span v-else style="color:#999">-</span>
</template>
</el-table-column>
<el-table-column label="实际剩余(可改)" width="160" align="center">
<template #default="{ row }">
<el-input-number v-model="row._actual" :min="0" :max="row.theoryQty * 3" size="small" />
@@ -56,20 +66,27 @@
<el-card v-if="items.length" class="mt">
<el-form inline>
<el-form-item label="退料接驳台(必选)">
<el-select v-model="returnDock" placeholder="选择从哪个接驳台退料" style="width: 240px">
<el-select v-model="returnDock" placeholder="选择托盘放到哪个接驳台(左/右)" style="width: 240px">
<el-option v-for="d in docks" :key="d.code" :label="d.label" :value="d.code" />
</el-select>
</el-form-item>
<el-form-item label="运输方式">
<!-- 2026-11-04 定稿:AGV=传感器检测到接驳台有托盘且库房接驳台有空位自动派车,库管不点派车 -->
<el-radio-group v-model="transportMode">
<el-radio value="agv">AGV 拉运(传感器自动派车)</el-radio>
<el-radio value="manual">人工搬运(不派 AGV)</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<el-button type="success" :loading="submitting" @click="submit">生成退库单(按工单归集)</el-button>
<span class="ml tip">将按勾选项生成多张退库单,每张绑定对应工单号与接驳台;实际退回少于理论应退须填损耗原因(主管后审核批注)。</span>
<span class="ml tip">将按勾选项生成多张退库单,每张绑定对应工单号与接驳台;实际退回少于理论应退须填损耗原因(落损耗台账,主管后审核批注)。</span>
</el-card>
</div>
</template>
<script setup>
import { ref } from 'vue'
import { ElMessage } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import request from '../utils/request'
const stationNo = ref(6)
@@ -78,6 +95,13 @@ const submitting = ref(false)
const items = ref([])
const docks = ref([])
const returnDock = ref('')
// 2026-11-04 定稿:运输方式(AGV=传感器自动派车;人工=无 AGV)
const transportMode = ref('agv')
// 余量参考值(剩余余量=应剩余量−已退余量−已损耗;仅展示不阻断提交)
const refRows = ref([])
function rowRefOf(orderNo, materialCode) {
return refRows.value.find(r => r.orderNo === orderNo && r.materialCode === materialCode) || null
}
async function load() {
if (!stationNo.value) {
@@ -89,7 +113,12 @@ async function load() {
const resp = await request.get('/transfer/orders?stationNo=' + stationNo.value)
const list = (resp && resp.items) || []
docks.value = (resp && resp.docks) || []
returnDock.value = docks.value[0]?.code || ''
returnDock.value = '' // 不隐式默认选第一项,由操作工显式选择左/右(与 G3 同口径)
// 余量参考值(G 定稿:应剩余量−已退余量−已损耗)
try {
const r = await request.get('/return-reference?stationNo=' + stationNo.value)
refRows.value = r?.rows || []
} catch { refRows.value = [] }
// 初始化每行勾选与实际剩余默认值
for (const it of list) {
for (const m of (it.items || [])) {
@@ -108,7 +137,7 @@ async function load() {
async function submit() {
if (!returnDock.value) {
ElMessage.warning('请选择退料接驳台(左/右)——AGV 将从该接驳台拉货')
ElMessage.warning('请选择退料接驳台(左/右)——退料托盘放到该接驳台,AGV 方式将自动拉运')
return
}
const payload = []
@@ -125,6 +154,7 @@ async function submit() {
theoryQty: m.theoryQty,
dock: returnDock.value,
lossReason: m._lossReason || '',
transportMode: transportMode.value === 'manual' ? 'manual' : 'agv',
})
}
}
@@ -140,6 +170,27 @@ async function submit() {
ElMessage.success('已按工单生成 ' + payload.length + ' 张退库单,请到 WMS 退库单页按工单确认收货')
items.value = []
} catch (e) {
// 拍板2(2026-11-04):PLC 离线(业务码 2409)→ 弹风险提示,人工确认后强行生成
if (e?.code === 2409) {
try {
await ElMessageBox.confirm(
'PLC 离线,无法确认工件已完工。\n\n风险提示:若物料仍在工人手中或正在装机,强行退料可能导致账实不符。\n\n是否确认强行退料?',
'PLC 离线:强行退料确认',
{ type: 'warning', confirmButtonText: '强行退料', cancelButtonText: '取消' }
)
} catch { return }
try {
await request.post('/transfer/returns', {
stationNo: stationNo.value,
items: payload.map((p) => ({ ...p, forceConfirm: true }))
})
ElMessage.success('已强行生成 ' + payload.length + ' 张退库单,请到 WMS 退库单页按工单确认收货')
items.value = []
} catch (e2) {
ElMessage.error('生成失败:' + (e2?.message || e2))
}
return
}
ElMessage.error('生成失败:' + (e?.message || e))
} finally {
submitting.value = false
@@ -292,10 +292,14 @@
<el-descriptions :column="1" border size="small" style="margin-bottom:12px">
<el-descriptions-item label="在制工件(必须为 0 才能关单)">
<template v-if="fc.preview.inProduction > 0">
<b style="color:#f56c6c">{{ fc.preview.inProduction }} 件在制 —— 请先下线完工或报废,不允许随单终止</b>
<b style="color:#f56c6c">{{ fc.preview.inProduction }} 件在制 —— 实物去向必须先落定:正常完工报工,或先在「工件追溯」页走「报废 / 人工取走登记」(原因必填)</b>
</template>
<template v-else><b style="color:#67c23a">0 件(可关单)</b></template>
</el-descriptions-item>
<el-descriptions-item label="已报废/取走登记(R11:先报废登记后强完)">
<span v-if="(fc.preview.scrapCount || 0) > 0">{{ fc.preview.scrapCount }} 件已登记报废/取走</span>
<span v-else style="color:#909399">无(若工件丢失/损坏无法完工,须先登记报废再强制完工)</span>
</el-descriptions-item>
<el-descriptions-item label="未完成排产(确认后自动取消)">
<span v-if="fc.preview.plansToCancel && fc.preview.plansToCancel.length">{{ fc.preview.plansToCancel.join(';') }}</span>
<span v-else style="color:#909399">无</span>
@@ -47,6 +47,12 @@ request.interceptors.response.use(
e.code = 3021
return Promise.reject(e)
}
// 拍板2(2026-11-04):PLC 离线退料需人工强行确认(code=2409)→ 交调用方弹风险确认框,不在此弹 toast
if (body.code === 2409) {
const e = new Error(body.message || 'PLC 离线,需人工强行确认退料')
e.code = 2409
return Promise.reject(e)
}
const msg = friendlyMsg(body.message || '操作失败')
ElMessage.error(msg)
return Promise.reject(new Error(msg))