feat: 退料闭环定稿(损耗台账/备料清单/退料AGV自动派车/剩余量参考)+ 工位托盘守卫
- MES 新增损耗台账 loss_ledger,差异确认损耗接口 ConfirmReceiveLoss(按工单归集) - 备料清单 preparation:MES 按 日计划×工单×工位×物料 实时计算,WMS 只读展示 PreparationList - 退料闭环:N5 工位托盘守卫(未完成禁止退料)、退料 AGV 自动派车(JBT21 空位判定 + 托盘回收链路)、退料参考剩余量接口(应剩余=实备-已耗-已退-已损) - 新增 AGV 车辆状态表 agv_vehicle_state 及查询 - 整合接驳台/叫料池/库存锁既有闭环,清理 sql 目录注释生成脚本与 catalog,更新文档
This commit is contained in:
@@ -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(','))
|
||||
|
||||
Reference in New Issue
Block a user