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
+2 -19
View File
@@ -110,7 +110,7 @@ export const helpInventory = {
{ name: '库位明细-入库时间', source: '仅「库位明细」生效的日期筛选(默认近3个月起)。', purpose: '按入库时间收窄', fill: '可与区域/质量组合' },
{ name: '区域汇总-六列', source: '系统实时聚合,一区域一行。', purpose: '质量(合格/未检/不合格)与类型(结构件/电气件/其他)都已降为列,避免同区拆多行;最近入库时间取该区最近一笔入库', fill: '只读:序列号=否(按批次记账)=批次数量、序列号=是(按 SN 记账)=SN 单件、其他=辅料工装试验设备;具体货架/层/位置四级货位见「库位明细」下钻' },
{ name: '数量等式(七大域审计)', source: '系统实时计算,本页只读。', purpose: '保证库存数量自洽', fill: '库存量(总数) = 合格 + 未检 + 不合格(质量分布守恒)' },
{ name: '库存变动计算公式(九类业务,页面显示数量与此一致)', source: '后端事务内原子计算,全链路实时维护,本页只读。', purpose: '把每次库存数量怎么变讲清楚,避免账实不符', fill: '统一记法:库存行 quantity=在库数量;可用数量(avail)=在库量 − 未检量 − 不合格量 − 锁定量(仅质量状态=合格 的行计入可用;lockedQty 为内部锁定机制,页面不显示「锁定量」字样)。\n· ① 入库:库存行 quantity += 入库数量(序列号=否 按 batchNo 累加同一批次行;序列号=是 按 snCode 每行 +1 新建);\n· ② 出库(通用/备料/补料):库存行 quantity −= 出库数量,强约束 出库数量 ≤ avail(库位可用量);SN 出库要求 SN 在当前所填库位、行 status∈{在库,锁定};\n· ③ 检查/来料检验:不改 quantity,只翻转 qualityStatus(未检→合格/不合格);不合格隔离处置(退货/换修/报废/部分入库)改 qualityStatus 与 status,不影响其它行;\n· ④ 可用数量:avail = 在库量 − 未检量 − 不合格量 − 锁定量 =(合格 行数量合计)− lockedQty(列表「可用量」列与备料/出库校验同口径;lockedQty 内部保留不向用户展示);\n· ⑤ 报废:库存行 quantity −= 报废数量,并置生命周期=报废,退出可用(avail 同步下降);\n· ⑥ 领料出库(工单备料台账):库存行 quantity −= 出库数量,台账 out_qty += 出库数量;净领用 = 已出库 − 已退回,缺口 = 需求总量 − 净领用(净领用=需求即领料完结);\n· ⑦ 工单备料台账:需求总量(同步自 MES 备料单) = 净领用 + 剩余缺口;在途/线边 = 净领用 − 已消耗;\n· ⑧ 成品入库(手工/完工回流):库存行 quantity += 1(序列号=是 单件,snCode 唯一),物料类别=成品;\n· ⑨ 退库确认:库存行 quantity += 退库数量(剩余物料置未检、问题物料置不合格),并回写台账「退回量」使缺口恢复可再叫料。' },
{ name: '库存变动计算公式(八类业务,页面显示数量与此一致)', source: '后端事务内原子计算,全链路实时维护,本页只读。', purpose: '把每次库存数量怎么变讲清楚,避免账实不符', fill: '统一记法:库存行 quantity=在库数量;可用数量(avail)=在库量 − 未检量 − 不合格量 − 锁定量(仅质量状态=合格 的行计入可用;lockedQty 为内部锁定机制,页面不显示「锁定量」字样)。\n· ① 入库:库存行 quantity += 入库数量(序列号=否 按 batchNo 累加同一批次行;序列号=是 按 snCode 每行 +1 新建);\n· ② 出库(通用/备料/补料):库存行 quantity −= 出库数量,强约束 出库数量 ≤ avail(库位可用量);SN 出库要求 SN 在当前所填库位、行 status∈{在库,锁定};\n· ③ 检查/来料检验:不改 quantity,只翻转 qualityStatus(未检→合格/不合格);不合格隔离处置(退货/换修/报废/部分入库)改 qualityStatus 与 status,不影响其它行;\n· ④ 可用数量:avail = 在库量 − 未检量 − 不合格量 − 锁定量 =(合格 行数量合计)− lockedQty(列表「可用量」列与备料/出库校验同口径;lockedQty 内部保留不向用户展示);\n· ⑤ 报废:库存行 quantity −= 报废数量,并置生命周期=报废,退出可用(avail 同步下降);\n· ⑥ 领料出库(备料/补料):库存行 quantity −= 出库数量(序列号=是 单件移出,序列号=否 批次行累减);\n· ⑦ 成品入库(手工/完工回流):库存行 quantity += 1(序列号=是 单件,snCode 唯一),物料类别=成品;\n· ⑧ 退库确认:库存行 quantity += 退库数量(剩余物料置未检、问题物料置不合格)。' },
{ name: '物料汇总-质量分布', source: '系统按当前在库行统计。', purpose: '一个物料合格/未检/不合格各多少', fill: '合格/未检/不合格三列,自动统计' },
{ name: '物料汇总-分布区域', source: '系统统计该物料当前占用了哪些区域。', purpose: '一个物料可跨多个区域存放(批次可拆分),物料行不写死单一区域', fill: '如 Z02、Z05;点行下钻可看每个批次/SN 具体在哪个区' },
{ name: '批次/SN 明细(下钻)', source: '点击任一行弹出抽屉。', purpose: '看该物料的每个批次/SN 所在区域、质量状态与来源入库单', fill: '抽屉内分页展示;点入库单号可跳转入库页' },
@@ -243,28 +243,11 @@ export const helpFinishedInbound = {
]
}
export const helpLedger = {
title: '工单物料台账',
overview:
'实时展示每个工单下每个物料:需求总量、已出库、已退回、净领用、已消耗、在途/线边、剩余缺口。\n数据链路:MES 工单 + 物料清单 → 生成备料单时同步「工单级需求总量」到本台账(total_qty)→ 出库累加 out_qty → 退库累加 returned_qty → 报工反冲累加 consumed_qty。\n\n数量等式(必须成立,页顶「闭环核对」实时校验):\n· 净领用 = 已出库 − 已退回\n· 需求量 = 净领用 + 剩余缺口(强约束:净领用 ≤ 需求量,等于时「领料完结」)\n· 在途/线边 = 净领用 − 已消耗(已发出未消耗,含在途+工位余量两段,细分在 MES 侧)\n\n说明:本页只读查询,数据来自 MES 备料单同步(WMS 工单备料台账)。若列表为空,表示当前没有已同步的台账数据(请先在 MES 建工单、排产并生成备料单触发同步),不会展示任何模拟数据。',
fields: [
{ name: '产品工号', source: '筛选条件。数据来自 MES 工单。', purpose: '只看某个工单的领料台账', fill: '输入产品工号(可空=查全部工单)' },
{ name: '图号', source: '筛选条件。', purpose: '按图号精确过滤', fill: '输入图号(可空)' },
{ name: '物料名称', source: '筛选条件。', purpose: '按物料名称模糊过滤', fill: '输入物料名称(可空)' },
{ name: '备料状态', source: '筛选条件。齐套/预警/未齐套/未到货(服务端按实时可用库存+未来5天需求派生)。', purpose: '按备料充足度过滤', fill: '齐套=可用≥需求;预警=可用<未来5天需求;未齐套=0<可用<需求;未到货=可用为0且未出过库' },
{ name: '需求总量', source: 'MES 同步(工单数量 × 单台用量 × (1+损耗率),向上取整)。', purpose: '该工单该物料共需多少', fill: '系统自动,只读' },
{ name: '已出库 / 已退回 / 已消耗', source: '出库 / 退库收货 / 报工反冲各自写入(一个字段一个写者)。', purpose: '分段追踪物料去向', fill: '自动,只读' },
{ name: '净领用', source: '系统计算 = 已出库 − 已退回。', purpose: '用于超量拦截与「领料完结」判定', fill: '自动;等于需求总量即领料完结' },
{ name: '在途/线边', source: '系统计算 = 净领用 − 已消耗。', purpose: '已发出但产线尚未消耗的量(含在途+工位余量)', fill: '自动,只读' },
{ name: '缺口', source: '系统计算 = 需求总量 − 净领用(下限 0)。', purpose: '还差多少未领', fill: '自动;为 0 即领料完结' },
{ name: '闭环核对栏', source: '页顶实时汇总本页所有行。', purpose: '校验数量等式是否成立,账实不符时红色告警', fill: '自动;净领用>需求 或 已消耗>净领用 即判定账实不符' }
]
}
export const helpReturnOrder = {
title: '退库确认',
overview:
'工位退库的接收确认环节:工位终端上操作工把「没用完 / 有问题的物料」做退库发起,系统预建一张「待确认收货」的退库单;仓库保管员在本页审核并实物点收,点「确认收货」后系统按规则把物料加回库存,退库单置为「已收货」,整条退库链路闭环。\n\n数据链路:工位终端退库 → MES 落事件日志并调用 WMS 内部接口 → WMS 预建退库单(PENDING) → 本页确认收货(选退库类型、退回库位、序列号=是(按 SN 记账)逐个扫码 / 序列号=否(按批次记账)按数量)→ 库存加回 → 回写工单备料台账「退回量」,缺口恢复可再叫料。\n\n三个关键规则(客户诉求 问题14):\n1) 退库类型——「剩余物料」= 正常用剩,加回后置「未检」,由检验员判定合格/不合格;「问题物料」= 有质量疑虑,加回后直接置「不合格」隔离,绝不混入可用/合格库存。\n2) 退回库位——默认带入该物料最近一次的原库位(区域/货架/层/位置),可手动修改;目标货位即使已被其他物料占用也允许混放,系统只记数量、不校验位置冲突。\n3) 数量录入方式按物料「序列号=是(按 SN 记账)」(物料档案 sn_mode)自动区分——序列号=是(按 SN 记账)必须逐个扫码录入 SN,扫码数须与退库数完全一致(一物一码守恒,SN 复用原出库行回到在库);序列号=否(按批次记账)按退库数量整体加回,可指定批次号,留空则沿用/自动生成。\n\n说明:退库单状态只有两种——待确认收货 / 已收货。同一工单 + 同一物料 + 同一工位只会预建一条待收货退库单(防止重复提交)。本页不含「删除」,退库一经确认即形成库存流水,不可撤销。',
'工位退库的接收确认环节:工位终端上操作工把「没用完 / 有问题的物料」做退库发起,系统预建一张「待确认收货」的退库单;仓库保管员在本页审核并实物点收,点「确认收货」后系统按规则把物料加回库存,退库单置为「已收货」,整条退库链路闭环。\n\n数据链路:工位终端退库 → MES 落事件日志并调用 WMS 内部接口 → WMS 预建退库单(PENDING) → 本页确认收货(选退库类型、退回库位、序列号=是(按 SN 记账)逐个扫码 / 序列号=否(按批次记账)按数量)→ 库存加回。\n\n三个关键规则(客户诉求 问题14):\n1) 退库类型——「剩余物料」= 正常用剩,加回后置「未检」,由检验员判定合格/不合格;「问题物料」= 有质量疑虑,加回后直接置「不合格」隔离,绝不混入可用/合格库存。\n2) 退回库位——默认带入该物料最近一次的原库位(区域/货架/层/位置),可手动修改;目标货位即使已被其他物料占用也允许混放,系统只记数量、不校验位置冲突。\n3) 数量录入方式按物料「序列号=是(按 SN 记账)」(物料档案 sn_mode)自动区分——序列号=是(按 SN 记账)必须逐个扫码录入 SN,扫码数须与退库数完全一致(一物一码守恒,SN 复用原出库行回到在库);序列号=否(按批次记账)按退库数量整体加回,可指定批次号,留空则沿用/自动生成。\n\n说明:退库单状态只有两种——待确认收货 / 已收货。同一工单 + 同一物料 + 同一工位只会预建一条待收货退库单(防止重复提交)。本页不含「删除」,退库一经确认即形成库存流水,不可撤销。',
fields: [
{ name: '状态', source: '筛选条件,系统维护。', purpose: '只看待确认收货或已收货的退库单', fill: '选「待确认收货」优先处理' },
{ name: '退库单号', source: '系统自动生成(TH + 时间戳)。', purpose: '唯一标识一张退库单,便于对账追溯', fill: '自动生成,无需填写' },
@@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElNotification } from 'element-plus'
import {
HomeFilled, Download, Upload, Search, CircleCheck, List, Bell,
Box, Monitor, EditPen, Fold, Expand, Location, Goods, Key, Operation, Van, Clock, RefreshLeft, Folder, WarningFilled, Tools, Setting
Box, Monitor, EditPen, Fold, Expand, Location, Goods, Key, Operation, Van, Clock, RefreshLeft, Folder, WarningFilled, Tools, Setting, Tickets
} from '@element-plus/icons-vue'
import { getUser, getToken, logout, setSession } from '../utils/auth'
import request from '../utils/request'
@@ -125,6 +125,8 @@ const menuGroups = [
{ path: '/call-queue', title: '叫料队列', icon: Bell, code: 'call:view' },
{ path: '/return-order', title: '退库确认', icon: RefreshLeft, code: 'return:view' },
{ path: '/pallet-workbench', title: '托盘工作台', icon: Box, code: 'return:view' },
// P1(2026-11-04 用户拍板):备料清单——只读展示"今天及以后×工单×工位×物料×数量"(数据源 MES 日排产实时算)
{ path: '/preparation', title: '备料清单', icon: Tickets, code: 'preparation:view' },
{ path: '/production-return', title: '生产退不良', icon: WarningFilled, code: 'prodreturn:manage' }
]
},
@@ -57,6 +57,13 @@
:loading="completingNo === row.requestNo"
@click="doComplete(row)"
>完成备料</el-button>
<el-button
v-if="can('call:manage') && row.status === 'SHIPPED'"
type="warning"
size="small"
:loading="dispatchingNo === row.requestNo"
@click="dispatchAgv(row)"
>送货</el-button>
<el-button
v-if="can('call:manage') && row.status === 'SHIPPED'"
type="success"
@@ -156,6 +163,23 @@ async function doComplete(row) {
// 确认装车并送货(2026-11-03 三层机制·装卸强制确认):AGV 空车已到位待令(ARRIVED),
// 库管把托盘装上 AGV 后点此按钮 → MES 生成重载运输段发往工位接驳台。
// 送货(2026-11-03 定论:废除备料完成自动派车):库管人工触发,AGV 才出发去库房装货点。
const dispatchingNo = ref('')
async function dispatchAgv(row) {
if (!row?.requestNo) return
try {
await ElMessageBox.confirm(
`确认派 AGV 前往库房装货点取「${row.requestNo}」的托盘?\n\nAGV 到位后进入「到位待令」,需再点「确认装车并送货」发往工位。`,
'送货(人工派车)', { type: 'warning', confirmButtonText: '派车出发' })
} catch { return }
dispatchingNo.value = row.requestNo
try {
await request.post('/call/dispatch', { requestNo: row.requestNo })
ElMessage.success('已派车,AGV 前往装货点')
} catch { /* 拦截器已提示 */ }
dispatchingNo.value = ''
}
const loadingLoad = ref('')
async function confirmLoad(row) {
if (!row?.requestNo) return
@@ -50,7 +50,6 @@ const entries = [
{ path: '/inspection', title: '质量检验', icon: CircleCheck },
{ path: '/stocktake', title: '库存盘点', icon: List },
{ path: '/semi', title: '半成品管理', icon: Box },
{ path: '/ledger', title: '工单备料台账', icon: Tickets },
{ path: '/zone', title: '区域维护', icon: Location },
{ path: '/material', title: '物料档案', icon: Goods },
{ path: '/display', title: '免登录大屏', icon: Monitor }
@@ -3,7 +3,9 @@
<el-card>
<h3>托盘工作台</h3>
<el-alert type="info" :closable="false" show-icon
title="库管托盘回收闭环:工位接驳台「有托盘」的行 = 待处理(库管可先确认现场状况,再派 AGV 回收空托盘,或到「退库单」页代工位退料)。派车为业务自动触发(空车前往工位接驳台免弹窗);AGV 到位后进「到位待令」,在 MES AGV 配送页点「确认装车并送货」才拉走——防止库管不知现场状况被误拖。" />
title="库管托盘回收闭环:工位接驳台「有托盘」的行 = 待处理(库管可先确认现场状况,再派 AGV 回收空托盘;托盘带余料时可直接在本页「代发起退料」——拍板 R14:库管在托盘工作台看余料并代退料)。派车为业务自动触发(空车前往工位接驳台免弹窗);AGV 到位后进「到位待令」,在 MES AGV 配送页点「确认装车并送货」才拉走——防止库管不知现场状况被误拖。库房接驳台(JBT21)无空位时不允许派车(2026-11-04 拍板:拉回来的托盘没地方放)。" />
<el-alert v-if="!jbt21.free" type="error" :closable="false" show-icon class="mt"
:title="'库房接驳台(JBT21)暂无空位:' + jbt21.reason + '——「派 AGV 回收」按钮已禁用,请先卸走库房接驳台上的托盘。'" />
<el-button class="mt" :loading="loading" @click="load">刷新接驳台台账</el-button>
</el-card>
<el-card class="mt">
@@ -25,20 +27,77 @@
<el-table-column label="状态" width="90" align="center">
<template #default="{ row }">{{ row.status === 'DISABLED' ? '已停用' : '启用' }}</template>
</el-table-column>
<el-table-column label="操作" width="170" align="center" fixed="right">
<el-table-column label="操作" width="260" align="center" fixed="right">
<template #default="{ row }">
<el-button v-if="row.hasPallet && row.dockType === 'line'" size="small" type="warning" :loading="dispatching === row.dockCode"
@click="dispatchRecovery(row)">派 AGV 回收</el-button>
<template v-if="row.hasPallet && row.dockType === 'line'">
<!-- 2026-11-04 定稿 Q5:JBT21 无空位 → 按钮禁用并提示,后端同样拒绝 -->
<el-tooltip :disabled="jbt21.free" :content="'库房接驳台无空位:' + jbt21.reason" placement="top">
<span style="display:inline-block">
<el-button size="small" type="warning" :disabled="!jbt21.free" :loading="dispatching === row.dockCode"
@click="dispatchRecovery(row)">派 AGV 回收</el-button>
</span>
</el-tooltip>
<!-- R14(2026-11-03 拍板):托盘带余料时代发起退料(入口收敛到本页,免跳退库单页) -->
<el-button size="small" type="primary" plain @click="openManual(row)">代发起退料</el-button>
</template>
<span v-else style="color:#999">-</span>
</template>
</el-table-column>
</el-table>
</el-card>
<!-- R14:托盘工作台代发起退料(与「退库单」页代工位退料同一接口 /return-order/manual) -->
<el-dialog v-model="manual.visible" title="代发起退料(托盘工作台)" width="620px" :close-on-click-modal="false">
<el-alert type="info" :closable="false" show-icon class="mb12"
title="替工位发起退料(托盘带余料回收)。退料接驳台必选(托盘放置位置);运输方式选 AGV 时,传感器检测到接驳台有托盘且库房接驳台有空位即自动派车拉运。提交后到「退库单」页确认收货。" />
<!-- E4(2026-11-04 拍板):自动带出该接驳台托盘余料明细(最近 AGV 送达的物料清单),库管核对后可一键带入 -->
<el-alert v-if="manual.residuals.length" type="warning" :closable="false" class="mb12"
:title="'该接驳台托盘余料(自动带出,共 ' + manual.residuals.length + ' 项)'"
:description="manual.residuals.map(r => r.materialCode + ' ' + (r.materialName || '') + ' × ' + r.qty + (r.unit || '')).join(';') + '。点击「带入首项」可自动填表,也可手工修改。'" />
<el-alert v-else-if="manual.residualLoaded" type="info" :closable="false" class="mb12"
title="未查到该接驳台的 AGV 送达物料记录,请手工填写退料内容。" />
<el-form label-width="110px">
<el-form-item label="工位号"><el-input-number v-model="manual.stationNo" :min="1" :max="99" @change="onStationChange" /></el-form-item>
<el-form-item label="产品工号"><el-input v-model="manual.orderNo" placeholder="可空(余料关联叫料单的工单自动带出)" /></el-form-item>
<el-form-item label="图号(必填)"><el-input v-model="manual.materialCode" /></el-form-item>
<el-form-item label="物料名称"><el-input v-model="manual.materialName" /></el-form-item>
<!-- G(2026-11-04 定稿):余量参考值=应剩余量−已退余量−已损耗;仅展示不阻断提交 -->
<el-form-item v-if="manualRef" label="余量参考值">
<el-alert type="warning" :closable="false" style="width:100%"
:title="`工单 ${manualRef.orderNo || '-'}:备料 ${manualRef.preparedQty},已消耗 ${manualRef.consumedQty},已退 ${manualRef.returnedQty},已损耗 ${manualRef.lossQty},剩余参考值 ${manualRef.refLeft}${manualRef.unit || ''}`"
:description="manualRef.refLeft < 0 ? '参考值为负=已退加损耗已超应剩余量,请现场核实后再退。' : '参考值仅供核对,实际退量以现场为准,不阻断提交。'" />
</el-form-item>
<el-form-item label="数量 / 单位">
<el-input-number v-model="manual.qty" :min="1" />
<el-input v-model="manual.unit" style="width:80px;margin-left:8px" />
</el-form-item>
<el-form-item label="退料接驳台">
<el-select v-model="manual.returnDock" placeholder="先填工位号带出左/右,必选" style="width:100%">
<el-option v-for="d in stationDocks" :key="d.code" :label="d.label" :value="d.code" />
</el-select>
</el-form-item>
<el-form-item label="运输方式">
<el-radio-group v-model="manual.transportMode">
<el-radio value="agv">AGV 拉运(传感器自动派车)</el-radio>
<el-radio value="manual">人工搬运(不派 AGV)</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="退库原因(必填)"><el-input v-model="manual.reason" /></el-form-item>
<el-form-item label="损耗原因(必填)">
<el-input v-model="manual.lossReason" type="textarea" :rows="2" placeholder="必填:说明退料损耗情况(随退库单留存可查)" />
</el-form-item>
</el-form>
<template #footer>
<el-button v-if="manual.residuals.length" @click="applyFirstResidual">带入首项</el-button>
<el-button @click="manual.visible = false">取消</el-button>
<el-button type="primary" :loading="manual.submitting" @click="submitManual">提交退料</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { ref } from 'vue'
import { computed, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import request from '../utils/request'
import PageHelp from '../components/PageHelp.vue'
@@ -48,6 +107,17 @@ defineOptions({ name: 'PalletWorkbench' })
const rows = ref([])
const loading = ref(false)
const dispatching = ref('')
// 2026-11-04 定稿 Q5:库房接驳台 JBT21 空位(无空位 → 派 AGV 回收按钮禁用并提示)
const jbt21 = reactive({ free: true, reason: '' })
async function loadJbt21() {
try {
const d = await request.get('/pallet/jbt21-free')
jbt21.free = d?.free !== false
jbt21.reason = d?.reason || ''
} catch {
jbt21.free = true // MES 不可达时不误拦人工派车(后端 pallet-dispatch 仍有 guard)
}
}
async function load() {
loading.value = true
@@ -58,6 +128,15 @@ async function load() {
}
async function dispatchRecovery(row) {
// 提交前二次确认空位(防止页面停留期间 JBT21 被占用)
try {
const d = await request.get('/pallet/jbt21-free')
if (d?.free === false) {
ElMessage.error('库房接驳台(JBT21)暂无空位:' + (d.reason || '') + ',暂不能派车')
jbt21.free = false; jbt21.reason = d?.reason || ''
return
}
} catch { /* MES 不可达交由后端 pallet-dispatch guard 拦截 */ }
try {
await ElMessageBox.confirm(
`确认派 AGV 前往 ${row.name} 回收托盘?\n\n流程:AGV 空车前往(免确认)→ 到位后停住(到位待令)→ 请在 MES「AGV 配送」页点「确认装车并送货」→ 送回库房接驳台 → 确认卸货。`,
@@ -72,9 +151,120 @@ async function dispatchRecovery(row) {
dispatching.value = ''
}
/* ===================== R14:本页代发起退料(拍板 2026-11-03;2026-11-04 加损耗原因/运输方式/参考值) ===================== */
// G5 口径:代退料表单无理论量字段 → 损耗原因一律必填。
// 2026-11-04 定稿:运输方式必选(AGV=传感器自动派车;人工=无 AGV);余量参考值仅展示不阻断(G2)。
const manual = reactive({ visible: false, submitting: false, stationNo: 1, orderNo: '', materialCode: '', materialName: '', unit: '个', qty: 1, returnDock: '', reason: '', lossReason: '', transportMode: 'agv', residuals: [], residualLoaded: false, residualDock: '' })
const stationDocks = ref([])
const refRows = ref([])
const manualRef = computed(() => refRows.value.find(r => r.materialCode === manual.materialCode) || null)
async function loadReference() {
if (!manual.stationNo) { refRows.value = []; return }
try {
const d = await request.get('/return-order/reference', { params: { stationNo: manual.stationNo } })
refRows.value = Array.isArray(d) ? d : d?.rows || []
} catch { refRows.value = [] }
}
function openManual(row) {
manual.visible = true
manual.stationNo = Number(row.stationNo) || 1
manual.orderNo = ''; manual.materialCode = ''; manual.materialName = ''
manual.unit = '个'; manual.qty = 1; manual.returnDock = ''; manual.reason = ''; manual.lossReason = ''
manual.transportMode = 'agv'
manual.residuals = []; manual.residualLoaded = false
loadStationDocks()
loadReference()
// E4(2026-11-04 拍板):自动带出该接驳台托盘余料明细(只读转发 MES)
loadResidual(row.dockCode)
}
function onStationChange() { loadStationDocks(); loadReference() }
async function loadResidual(dockCode) {
if (!dockCode) return
manual.residualDock = dockCode
try {
const d = await request.get('/pallet/residual', { params: { dock: dockCode } })
manual.residuals = Array.isArray(d) ? d : (d?.list || [])
} catch {
manual.residuals = []
} finally {
manual.residualLoaded = true
}
}
// 一键带入首项余料到表单(可再手工改)
function applyFirstResidual() {
const r = manual.residuals[0]
if (!r) return
manual.materialCode = r.materialCode || ''
manual.materialName = r.materialName || ''
manual.unit = r.unit || '个'
manual.qty = Math.max(1, Math.round(Number(r.qty) || 1))
if (r.requestNo) {
// 余料关联叫料单号,产品工号留空(叫料单不绑工单)
manual.orderNo = manual.orderNo || ''
}
}
async function loadStationDocks() {
if (!manual.stationNo) return
try {
const d = await request.get('/pallet/station-docks', { params: { stationNo: manual.stationNo } })
stationDocks.value = d?.docks || []
manual.returnDock = '' // 不隐式默认选第一项,由库管显式选择左/右(与 G3 同口径)
} catch { stationDocks.value = [] }
}
// 拍板2(2026-11-04):PLC 离线退料拦截降级为提示+警戒,人工强行确认走此风险提示(code=2409)
const RETURN_FORCE_RISK = 'PLC 离线,无法确认工件已完工。\n\n风险提示:若物料仍在工人手中或正在装机,强行退料可能导致账实不符。\n\n是否确认强行退料?'
async function doSubmitManual(forceConfirm) {
await request.post('/return-order/manual', { ...manual, visible: undefined, submitting: undefined, forceConfirm })
}
async function submitManual() {
if (!manual.materialCode || manual.qty <= 0 || !manual.returnDock || !manual.reason) {
ElMessage.warning('图号、数量、退料接驳台、原因均必填')
return
}
if (!String(manual.lossReason || '').trim()) {
ElMessage.warning('损耗原因必填(代退料无理论量,一律必填)')
return
}
if (manual.transportMode !== 'agv' && manual.transportMode !== 'manual') {
ElMessage.warning('运输方式必选(AGV / 人工)')
return
}
manual.submitting = true
try {
await doSubmitManual(false)
ElMessage.success('代退料已提交,待确认收货')
manual.visible = false
load()
} catch (e) {
// 拍板2(2026-11-04):PLC 离线(业务码 2409)→ 弹风险提示,人工确认后强行提交
if (e?.code === 2409) {
try {
await ElMessageBox.confirm(RETURN_FORCE_RISK, 'PLC 离线:强行退料确认',
{ type: 'warning', confirmButtonText: '强行退料', cancelButtonText: '取消' })
} catch { return }
try {
await doSubmitManual(true)
ElMessage.success('已强行提交,待确认收货')
manual.visible = false
load()
} catch {}
return
}
} finally { manual.submitting = false }
}
load()
loadJbt21()
</script>
<style scoped>
.mt { margin-top: 12px; }
.mb12 { margin-bottom: 12px; }
</style>
@@ -0,0 +1,176 @@
<template>
<div class="page">
<el-alert type="info" :closable="false" title="备料清单(只读):按 MES 日排产实时计算「今天及以后 × 工单 × 工位 × 物料 × 数量」。"
description="数据来源:MES 日排产(未完成/已启用/执行中)→ 工单工艺路线(工位→物料→单台用量)× 工位分产量(未配置则同工艺工位平均分)。工艺改动后刷新本页即实时联动;本页不触发出库/领料、不管库存(库存不足也照常显示);无历史数据。" style="margin-bottom:10px" />
<el-card shadow="never" class="toolbar">
<el-form inline @submit.prevent>
<el-form-item label="产品工号">
<el-input v-model="q.orderNo" placeholder="按工单号过滤" clearable style="width:200px" @input="page=1" />
</el-form-item>
<el-form-item label="图号">
<el-input v-model="q.materialCode" placeholder="按图号过滤" clearable style="width:180px" @input="page=1" />
</el-form-item>
<el-form-item label="工位">
<el-select v-model="q.stationNo" placeholder="全部" clearable style="width:120px" @change="page=1">
<el-option v-for="n in stationOptions" :key="n" :label="'工位 ' + n" :value="n" />
</el-select>
</el-form-item>
<el-form-item label="排产日期">
<el-date-picker v-model="q.date" type="date" value-format="YYYY-MM-DD" placeholder="全部日期" clearable style="width:150px" @change="page=1" />
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="load" :loading="loading">刷新(实时重算)</el-button>
<el-button plain @click="exportCsv">导出 CSV</el-button>
</el-form-item>
</el-form>
<div style="font-size:12px;color:#909399">
覆盖排产 {{ list.planCnt || 0 }} 行 · 日期范围 {{ list.range || '—' }} · 明细 {{ filtered.length }} 行
</div>
</el-card>
<el-tabs v-model="tab" style="margin-top:8px">
<!-- 明细:日期×工单×工位×物料×数量 -->
<el-tab-pane label="明细(日期×工单×工位×物料)" name="detail">
<el-table :data="pagedDetail" border size="small" v-loading="loading" empty-text="暂无排产备料需求(请先在 MES 日排产启用排产)">
<el-table-column prop="planDate" label="排产日期" width="110" align="center" />
<el-table-column prop="orderNo" label="产品工号" min-width="160" show-overflow-tooltip />
<el-table-column prop="productName" label="产品" min-width="130" show-overflow-tooltip />
<el-table-column label="工位" width="80" align="center">
<template #default="{ row }">工位 {{ row.stationNo }}</template>
</el-table-column>
<el-table-column prop="stationQty" label="分产量(台)" width="95" align="center" />
<el-table-column prop="materialCode" label="图号" min-width="140" show-overflow-tooltip />
<el-table-column prop="materialName" label="物料名称" min-width="130" show-overflow-tooltip />
<el-table-column prop="spec" label="规格" min-width="110" show-overflow-tooltip />
<el-table-column prop="unit" label="单位" width="70" align="center" />
<el-table-column prop="unitQty" label="单台用量" width="90" align="center" />
<el-table-column label="需求量" width="100" align="center">
<template #default="{ row }"><b>{{ row.qty }}</b></template>
</el-table-column>
<el-table-column label="排产状态" width="95" align="center">
<template #default="{ row }">
<el-tag size="small" :type="row.status === 'PROCESSING' ? 'warning' : row.status === 'CONFIRMED' ? 'success' : 'info'">{{ statusLabel(row.status) }}</el-tag>
</template>
</el-table-column>
</el-table>
<el-pagination v-model:current-page="page" v-model:page-size="size" :total="filtered.length"
layout="total, sizes, prev, pager, next, jumper" :page-sizes="[50, 100, 200]" style="margin-top:10px" />
</el-tab-pane>
<!-- 按物料汇总(P1-4:按物料汇总展示) -->
<el-tab-pane label="按物料汇总" name="summary">
<el-table :data="summaryRows" border size="small" v-loading="loading" empty-text="暂无数据">
<el-table-column prop="materialCode" label="图号" min-width="150" show-overflow-tooltip />
<el-table-column prop="materialName" label="物料名称" min-width="140" show-overflow-tooltip />
<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="需求合计" width="110" align="center">
<template #default="{ row }"><b>{{ row.qty }}</b></template>
</el-table-column>
<el-table-column label="涉及工单" width="90" align="center" prop="orders" />
<el-table-column label="涉及工位" width="90" align="center" prop="stations" />
<el-table-column label="覆盖日期" min-width="200">
<template #default="{ row }">{{ row.dates }}</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script setup>
import { ref, reactive, computed, onMounted } from 'vue'
import request from '../utils/request'
// P1 备料清单(2026-11-04 用户拍板):只读展示页,无「备料完成」按钮、不联动库存。
// 明细 = MES /api/preparation/list(日排产×工艺路线×工位分产量 实时算)。
const loading = ref(false)
const list = ref({ rows: [], total: 0, range: '', planCnt: 0 })
const tab = ref('detail')
const page = ref(1)
const size = ref(50)
const q = reactive({ orderNo: '', materialCode: '', stationNo: null, date: '' })
const stationOptions = computed(() => {
const set = new Set((list.value.rows || []).map(r => r.stationNo))
return [...set].sort((a, b) => a - b)
})
const filtered = computed(() => {
let rows = list.value.rows || []
if (q.orderNo) rows = rows.filter(r => (r.orderNo || '').toLowerCase().includes(q.orderNo.toLowerCase()))
if (q.materialCode) rows = rows.filter(r => (r.materialCode || '').toLowerCase().includes(q.materialCode.toLowerCase()))
if (q.stationNo != null) rows = rows.filter(r => r.stationNo === q.stationNo)
if (q.date) rows = rows.filter(r => r.planDate === q.date)
return rows
})
const pagedDetail = computed(() => {
const start = (page.value - 1) * size.value
return filtered.value.slice(start, start + size.value)
})
// 按物料汇总(应用当前筛选条件后聚合)
const summaryRows = computed(() => {
const map = new Map()
for (const r of filtered.value) {
const k = r.materialCode
let m = map.get(k)
if (!m) {
m = { materialCode: k, materialName: r.materialName, spec: r.spec, unit: r.unit, qty: 0, orders: new Set(), stations: new Set(), dates: new Set() }
map.set(k, m)
}
m.qty += r.qty || 0
m.orders.add(r.orderNo)
m.stations.add(r.stationNo)
m.dates.add(r.planDate)
}
return [...map.values()].map(m => ({
...m,
orders: m.orders.size,
stations: m.stations.size,
dates: [...m.dates].sort().join('、')
})).sort((a, b) => b.qty - a.qty)
})
function statusLabel(s) {
return { PENDING: '未启用', CONFIRMED: '已启用', PROCESSING: '执行中' }[s] || s
}
async function load() {
loading.value = true
try {
const data = await request.get('/preparation/list')
list.value = data || { rows: [], total: 0, range: '', planCnt: 0 }
} catch (e) {
list.value = { rows: [], total: 0, range: '', planCnt: 0 }
} finally {
loading.value = false
}
}
function exportCsv() {
const rows = filtered.value
if (!rows.length) return
const headers = ['排产日期', '产品工号', '产品', '工位', '分产量(台)', '图号', '物料名称', '规格', '单位', '单台用量', '需求量', '排产状态']
const lines = rows.map(r => [
r.planDate, r.orderNo, r.productName || '', r.stationNo, r.stationQty,
r.materialCode, r.materialName || '', r.spec || '', r.unit || '', r.unitQty, r.qty, statusLabel(r.status)
].map(v => '"' + String(v ?? '').replaceAll('"', '""') + '"').join(','))
const bom = '\uFEFF'
const blob = new Blob([bom + headers.join(',') + '\n' + lines.join('\n')], { type: 'text/csv;charset=utf-8' })
const a = document.createElement('a')
a.href = URL.createObjectURL(blob)
a.download = '备料清单_' + new Date().toISOString().slice(0, 10) + '.csv'
a.click()
URL.revokeObjectURL(a.href)
}
onMounted(load)
</script>
<style scoped>
.page { padding: 14px; }
.toolbar { margin-bottom: 4px; }
</style>
+176 -26
View File
@@ -1,7 +1,7 @@
<script setup>
defineOptions({ name: 'ReturnOrder' })
import { computed, onMounted, reactive, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import request from '../utils/request'
import { fmtTime } from '../utils/format'
import { can } from '../utils/perm'
@@ -29,37 +29,103 @@ function dockSideCn(code) {
return dockCnMap.value[code] || code
}
/* ===================== 库管代工位退料(2026-11-03 拍板) ===================== */
const manual = reactive({ visible: false, submitting: false, stationNo: 1, orderNo: '', materialCode: '', materialName: '', unit: '个', qty: 1, returnDock: '', reason: '' })
/* ===================== 库管代工位退料(2026-11-03 拍板;2026-11-04 G5 加损耗原因;2026-11-04 定稿加运输方式+参考值) ===================== */
// G5 口径:代退料表单无理论量字段 → 损耗原因一律必填。
// 2026-11-04 定稿:运输方式必选(AGV=传感器检测到接驳台有托盘且库房有空位自动派车,库管不点派车;人工=无 AGV);
// 余量参考值 = 应剩余量 − 已退余量 − 已损耗(仅展示不阻断提交,G2)。
const manual = reactive({ visible: false, submitting: false, stationNo: 1, orderNo: '', materialCode: '', materialName: '', unit: '个', qty: 1, returnDock: '', reason: '', lossReason: '', transportMode: 'agv', forceConfirm: false })
// 拍板2(2026-11-04):PLC 离线退料拦截降级为提示+警戒,人工强行确认走此风险提示(code=2409)
const RETURN_FORCE_RISK = 'PLC 离线,无法确认工件已完工。\n\n风险提示:若物料仍在工人手中或正在装机,强行退料可能导致账实不符。\n\n是否确认强行退料?'
const stationDocks = ref([])
// 余量参考值(转发 MES 聚合:工位全部在产工单的 应剩/已退/已损耗/参考值)
const refRows = ref([])
async function loadReference() {
if (!manual.stationNo) { refRows.value = []; return }
try {
const d = await request.get('/return-order/reference', { params: { stationNo: manual.stationNo } })
refRows.value = Array.isArray(d) ? d : d?.rows || []
} catch { refRows.value = [] }
}
// 当前填写图号匹配的参考值行
const manualRef = computed(() => refRows.value.find(r => r.materialCode === manual.materialCode) || null)
function openManual() {
manual.visible = true
manual.stationNo = 1; manual.orderNo = ''; manual.materialCode = ''; manual.materialName = ''
manual.unit = '个'; manual.qty = 1; manual.returnDock = ''; manual.reason = ''
manual.unit = '个'; manual.qty = 1; manual.returnDock = ''; manual.reason = ''; manual.lossReason = ''
manual.transportMode = 'agv'
stationDocks.value = []
refRows.value = []
}
async function loadStationDocks() {
if (!manual.stationNo) return
try {
const d = await request.get('/pallet/station-docks', { params: { stationNo: manual.stationNo } })
stationDocks.value = d?.docks || []
manual.returnDock = stationDocks.value[0]?.code || ''
manual.returnDock = '' // 不隐式默认选第一项,由库管显式选择左/右(与 G3 同口径)
} catch { stationDocks.value = [] }
}
function onManualStationChange() { loadStationDocks(); loadReference() }
async function doSubmitManual(forceConfirm) {
await request.post('/return-order/manual', { ...manual, visible: undefined, submitting: undefined, forceConfirm })
}
async function submitManual() {
if (!manual.materialCode || manual.qty <= 0 || !manual.returnDock || !manual.reason) {
ElMessage.warning('图号、数量、退料接驳台、原因均必填')
return
}
if (!String(manual.lossReason || '').trim()) {
ElMessage.warning('损耗原因必填(代退料无理论量,一律必填)')
return
}
if (manual.transportMode !== 'agv' && manual.transportMode !== 'manual') {
ElMessage.warning('运输方式必选(AGV / 人工)')
return
}
manual.submitting = true
try {
await request.post('/return-order/manual', { ...manual, visible: undefined, submitting: undefined })
await doSubmitManual(false)
ElMessage.success('代退料已提交,待确认收货')
manual.visible = false
load()
} catch (e) {
// 拍板2(2026-11-04):PLC 离线(业务码 2409)→ 弹风险提示,人工确认后强行提交
if (e?.code === 2409) {
try {
await ElMessageBox.confirm(RETURN_FORCE_RISK, 'PLC 离线:强行退料确认',
{ type: 'warning', confirmButtonText: '强行退料', cancelButtonText: '取消' })
} catch { return }
try {
await doSubmitManual(true)
ElMessage.success('已强行提交,待确认收货')
manual.visible = false
load()
} catch {}
return
}
} finally { manual.submitting = false }
}
/* ===================== 取消退料单(2026-11-04 拍板:PENDING 可取消,库房可取消工位申请) ===================== */
async function cancelOrder(row) {
let reason = ''
try {
const res = await ElMessageBox.prompt(
`确认取消退库单 ${row.returnNo}(${row.materialCode} ×${row.qty})?\n取消后不产生库存变动;已派 AGV 的单将联动作废未完成 AGV 任务;已装车运输中不可取消。`,
'取消退料单', {
type: 'warning',
confirmButtonText: '确认取消',
cancelButtonText: '不取消',
inputPlaceholder: '取消原因(可空)'
})
reason = (res.value || '').trim()
} catch { return }
try {
await request.post('/return-order/cancel', { returnNo: row.returnNo, reason })
ElMessage.success('退料单已取消')
load()
} catch { /* 拦截器已提示 */ }
}
async function load() {
loading.value = true
try {
@@ -130,6 +196,9 @@ const dlg = reactive({
returnType: 'surplus', // surplus=剩余物料 problem=问题物料
zoneCode: '', shelfNo: '', layerNo: '', positionNo: '',
batchNo: '', remark: '',
// R18(2026-11-03 拍板):实收数量可少于应退;2026-11-04 定稿(F):差异必须就地定性——
// 填损耗原因直接落 MES 损耗台账(MES 只读展示),不再「记待核」。
receiveQty: 0, receiveNote: '', lossReason: '',
snList: [], snInput: ''
})
@@ -139,6 +208,9 @@ async function openConfirm(row) {
dlg.returnType = 'surplus'
dlg.batchNo = ''
dlg.remark = ''
dlg.receiveQty = row.qty || 0
dlg.receiveNote = ''
dlg.lossReason = ''
dlg.snList = []
dlg.snInput = ''
dlg.zoneCode = ''; dlg.shelfNo = ''; dlg.layerNo = ''; dlg.positionNo = ''
@@ -167,8 +239,8 @@ function addSn() {
dlg.snInput = ''
return
}
if (dlg.snList.length >= (dlg.row?.qty || 0)) {
ElMessage.warning('已达退库数量 ' + (dlg.row?.qty || 0) + ',无需继续扫码')
if (dlg.snList.length >= (dlg.receiveQty || 0)) {
ElMessage.warning('已达实收数量 ' + (dlg.receiveQty || 0) + ',无需继续扫码')
return
}
dlg.snList.push(sn)
@@ -179,8 +251,17 @@ function removeSn(i) { dlg.snList.splice(i, 1) }
async function submitConfirm() {
const row = dlg.row
if (!row) return
if (dlg.snMode === 1 && dlg.snList.length !== (row.qty || 0)) {
ElMessage.warning(`序列号=是(按 SN 记账)需逐个扫码,已扫 ${dlg.snList.length} 个,应等于退库数量 ${row.qty}`)
if (!dlg.receiveQty || dlg.receiveQty < 1 || dlg.receiveQty > (row.qty || 0)) {
ElMessage.warning(`实收数量须在 1 ~ 应退 ${row.qty} 之间`)
return
}
if (dlg.snMode === 1 && dlg.snList.length !== dlg.receiveQty) {
ElMessage.warning(`序列号=是(按 SN 记账)需逐个扫码,已扫 ${dlg.snList.length} 个,应等于实收数量 ${dlg.receiveQty}`)
return
}
// F(2026-11-04 定稿):实收<应退 → 损耗原因必填,差异就地落损耗台账
if (dlg.receiveQty < (row.qty || 0) && !String(dlg.lossReason || '').trim()) {
ElMessage.warning('实收少于应退,损耗原因必填(差异须落损耗台账)')
return
}
dlg.submitting = true
@@ -194,9 +275,15 @@ async function submitConfirm() {
positionNo: dlg.positionNo,
batchNo: dlg.batchNo.trim(),
remark: dlg.remark.trim(),
// R18:实收数量/差异备注;F:损耗原因(差异直接落 MES 损耗台账)
receiveQty: dlg.receiveQty,
receiveNote: dlg.receiveNote.trim(),
lossReason: dlg.lossReason.trim(),
snList: dlg.snMode === 1 ? dlg.snList : []
})
ElMessage.success('已确认收货,库存已加回')
ElMessage.success(dlg.receiveQty < row.qty
? `已确认收货:实收 ${dlg.receiveQty}/应退 ${row.qty},差异 ${row.qty - dlg.receiveQty} 已落损耗台账`
: '已确认收货,库存已加回')
dlg.visible = false
load()
} finally {
@@ -221,6 +308,7 @@ async function loadAllDocks() {
<el-select v-model="statusFilter" placeholder="全部" clearable style="width:140px" @change="search">
<el-option label="待确认收货" value="PENDING" />
<el-option label="已收货" value="RECEIVED" />
<el-option label="已取消" value="CANCELLED" />
</el-select>
</el-form-item>
<el-form-item label="关联工单号">
@@ -255,6 +343,14 @@ async function loadAllDocks() {
<span v-else>-</span>
</template>
</el-table-column>
<!-- 2026-11-04 定稿:运输方式(AGV=传感器检测到接驳台有托盘且库房有空位自动派车;人工=无 AGV) -->
<el-table-column label="运输方式" width="90" align="center">
<template #default="{ row }">
<el-tag v-if="row.transportMode === 'agv'" type="primary" effect="plain" size="small">AGV</el-tag>
<el-tag v-else-if="row.transportMode === 'manual'" type="info" effect="plain" size="small">人工</el-tag>
<span v-else style="color:#999">-</span>
</template>
</el-table-column>
<el-table-column prop="sn" label="产品序列号" min-width="140">
<template #default="{ row }">{{ row.sn || '-' }}</template>
</el-table-column>
@@ -271,10 +367,14 @@ async function loadAllDocks() {
<el-table-column prop="reason" label="退库原因" min-width="140" show-overflow-tooltip>
<template #default="{ row }">{{ row.reason || '-' }}</template>
</el-table-column>
<!-- G8(2026-11-04 拍板):损耗原因随退库单落库可查 -->
<el-table-column prop="lossReason" label="损耗原因" min-width="140" show-overflow-tooltip>
<template #default="{ row }">{{ row.lossReason || '-' }}</template>
</el-table-column>
<el-table-column label="状态" width="110" align="center">
<template #default="{ row }">
<el-tag :type="row.status === 'RECEIVED' ? 'success' : 'warning'" size="small">
{{ row.status === 'RECEIVED' ? '已收货' : '待确认收货' }}
<el-tag :type="row.status === 'RECEIVED' ? 'success' : (row.status === 'CANCELLED' ? 'info' : 'warning')" size="small">
{{ row.status === 'RECEIVED' ? '已收货' : (row.status === 'CANCELLED' ? '已取消' : '待确认收货') }}
</el-tag>
</template>
</el-table-column>
@@ -290,13 +390,26 @@ async function loadAllDocks() {
<el-table-column label="收货时间" width="165" align="center">
<template #default="{ row }">{{ row.receiveAt ? fmtTime(row.receiveAt) : '-' }}</template>
</el-table-column>
<el-table-column label="操作" width="90" align="center" fixed="right">
<!-- R18:收货差异(实收<应退记「待核」,不自动进损耗台账) -->
<el-table-column label="实收/差异" width="110" align="center">
<template #default="{ row }">
<el-button v-if="canConfirm && row.status !== 'RECEIVED'" type="primary" size="small"
@click="openConfirm(row)">确认收货</el-button>
<span v-if="row.status === 'RECEIVED' && row.receiveDiff > 0">
{{ row.receiveQty }} / <span style="color:#e6a23c">差{{ row.receiveDiff }}</span>
</span>
<span v-else-if="row.status === 'RECEIVED'">{{ row.receiveQty || row.qty }}</span>
<span v-else style="color:#999">-</span>
</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" fixed="right">
<template #default="{ row }">
<el-button v-if="canConfirm && row.status !== 'RECEIVED' && row.status !== 'CANCELLED'" type="primary" size="small"
@click="openConfirm(row)">确认收货</el-button>
<!-- 2026-11-04 拍板:库房可取消 PENDING 退料单(含工位发起的申请);已收货不可取消 -->
<el-button v-if="canConfirm && row.status === 'PENDING'" type="danger" plain size="small"
@click="cancelOrder(row)">取消</el-button>
<span v-if="row.status === 'RECEIVED' || row.status === 'CANCELLED'" style="color:#999">-</span>
</template>
</el-table-column>
</el-table>
<div class="pager">
<el-pagination background layout="total, prev, pager, next" :total="total"
@@ -312,7 +425,7 @@ async function loadAllDocks() {
<div style="font-size:13px;line-height:1.6">
物料 <b>{{ dlg.row?.materialCode }}</b> {{ dlg.row?.materialName || '' }} 
退库数量 <b>{{ dlg.row?.qty }}{{ dlg.row?.unit || '' }}</b> 工位{{ dlg.row?.stationNo || '-' }}<br />
<span style="color:#909399">退库原因:{{ dlg.row?.reason || '-' }}</span>
<span style="color:#909399">退库原因:{{ dlg.row?.reason || '-' }} 损耗原因:{{ dlg.row?.lossReason || '-' }}</span>
</div>
</template>
</el-alert>
@@ -325,6 +438,23 @@ async function loadAllDocks() {
</el-radio-group>
</el-form-item>
<!-- R18(2026-11-03 拍板):实收数量可少于应退;2026-11-04 定稿(F):差异就地落损耗台账 -->
<el-form-item label="实收数量">
<el-input-number v-model="dlg.receiveQty" :min="1" :max="dlg.row?.qty || 0" />
<span style="margin-left:10px;font-size:13px">
应退 <b>{{ dlg.row?.qty }}</b>{{ dlg.row?.unit || '' }}
<template v-if="dlg.receiveQty < (dlg.row?.qty || 0)">
 <span style="color:#e6a23c">收货差异 <b>{{ (dlg.row?.qty || 0) - dlg.receiveQty }}</b>(须填写损耗原因,确认后直接落损耗台账)</span>
</template>
</span>
</el-form-item>
<!-- F(2026-11-04 定稿):实收<应退 → 损耗原因必填,确认后落 MES 损耗台账(MES 只读展示) -->
<el-form-item v-if="dlg.receiveQty < (dlg.row?.qty || 0)" label="损耗原因">
<el-input v-model="dlg.lossReason" type="textarea" :rows="2" maxlength="200"
placeholder="必填:说明差异去向,如运输丢失 2 件/托盘破损遗失(确认收货后直接落损耗台账,挂关联工单)" />
</el-form-item>
<el-form-item label="退回区域">
<el-select v-model="dlg.zoneCode" placeholder="请选择退回区域" clearable style="width:100%" @change="onZoneChange" @visible-change="(v) => v && loadZones(true)">
<el-option v-for="z in zoneOptions" :key="z.zoneCode" :value="z.zoneCode"
@@ -356,7 +486,7 @@ async function loadAllDocks() {
<el-button type="primary" @click="addSn">添加</el-button>
</div>
<div style="color:#909399;font-size:12px;margin-top:2px">
已扫 {{ dlg.snList.length }} / {{ dlg.row?.qty || 0 }} 个,须逐个扫码且数量一致
已扫 {{ dlg.snList.length }} / 实收 {{ dlg.receiveQty || 0 }} 个,须逐个扫码且数量与实收一致
</div>
<div v-if="dlg.snList.length" class="snbox">
<el-tag v-for="(sn, i) in dlg.snList" :key="sn" closable size="small" class="sntag"
@@ -368,15 +498,20 @@ async function loadAllDocks() {
<!-- 序列号=否(按批次记账):按数量加回,可指定批次 -->
<template v-else>
<el-form-item label="退回数量">
<span style="font-weight:600">{{ dlg.row?.qty }}{{ dlg.row?.unit || '' }}</span>
<span style="color:#909399;font-size:12px;margin-left:8px">序列号=否(按批次记账)按数量整体加回,无需逐个扫码</span>
<el-form-item label="实收数量">
<span style="font-weight:600">{{ dlg.receiveQty }}{{ dlg.row?.unit || '' }}</span>
<span style="color:#909399;font-size:12px;margin-left:8px">序列号=否(按批次记账)按实收数量整体加回,无需逐个扫码;可修改上方「实收数量」记录收货差异</span>
</el-form-item>
<el-form-item label="批次号">
<el-input v-model="dlg.batchNo" placeholder="留空则沿用/自动生成批次号" clearable />
</el-form-item>
</template>
<el-form-item label="差异备注">
<el-input v-model="dlg.receiveNote" type="textarea" :rows="2" maxlength="200" show-word-limit
placeholder="可补充差异说明(选填;实收<应退时损耗原因为必填项)" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="dlg.remark" type="textarea" :rows="2" maxlength="200" show-word-limit
placeholder="可填写退库说明(选填)" />
@@ -388,25 +523,40 @@ async function loadAllDocks() {
<el-button type="primary" :loading="dlg.submitting" @click="submitConfirm">确认收货</el-button>
</template>
</el-dialog>
<!-- 库管代工位退料:替操作工建退库单(选工位/工单/物料/数量/接驳台/原因) -->
<el-dialog v-model="manual.visible" title="代工位退料" width="560px" :close-on-click-modal="false">
<!-- 库管代工位退料:替操作工建退库单(选工位/工单/物料/数量/接驳台/运输方式/原因) -->
<el-dialog v-model="manual.visible" title="代工位退料" width="620px" :close-on-click-modal="false">
<el-alert type="info" :closable="false" show-icon class="mb12"
title="库管可替操作工发起退料(现场清理/托盘带料回收)。退料接驳台必选——AGV 将从该接驳台拉货。" />
title="库管可替操作工发起退料(现场清理/托盘带料回收)。退料接驳台必选(托盘放置位置);运输方式选 AGV 时,传感器检测到接驳台有托盘且库房接驳台有空位即自动派车拉运,库管无需手动派车。" />
<el-form label-width="110px">
<el-form-item label="工位号"><el-input-number v-model="manual.stationNo" :min="1" :max="99" @change="loadStationDocks" /></el-form-item>
<el-form-item label="工位号"><el-input-number v-model="manual.stationNo" :min="1" :max="99" @change="onManualStationChange" /></el-form-item>
<el-form-item label="产品工号"><el-input v-model="manual.orderNo" placeholder="可空" /></el-form-item>
<el-form-item label="图号(必填)"><el-input v-model="manual.materialCode" /></el-form-item>
<el-form-item label="物料名称"><el-input v-model="manual.materialName" /></el-form-item>
<!-- G(2026-11-04 定稿):余量参考值=应剩余量−已退余量−已损耗;仅展示不阻断提交 -->
<el-form-item v-if="manualRef" label="余量参考值">
<el-alert type="warning" :closable="false" style="width:100%"
:title="`工单 ${manualRef.orderNo || '-'}:备料 ${manualRef.preparedQty},已消耗 ${manualRef.consumedQty},已退 ${manualRef.returnedQty},已损耗 ${manualRef.lossQty},剩余参考值 ${manualRef.refLeft}${manualRef.unit || ''}`"
:description="manualRef.refLeft < 0 ? '参考值为负=已退加损耗已超应剩余量,请现场核实后再退。' : '参考值仅供核对,实际退量以现场为准,不阻断提交。'" />
</el-form-item>
<el-form-item label="数量 / 单位">
<el-input-number v-model="manual.qty" :min="1" />
<el-input v-model="manual.unit" style="width:80px;margin-left:8px" />
</el-form-item>
<el-form-item label="退料接驳台">
<el-select v-model="manual.returnDock" placeholder="先填工位号自动带出左/右" style="width:100%">
<el-select v-model="manual.returnDock" placeholder="先填工位号带出左/右,必选" style="width:100%">
<el-option v-for="d in stationDocks" :key="d.code" :label="d.label" :value="d.code" />
</el-select>
</el-form-item>
<el-form-item label="运输方式">
<el-radio-group v-model="manual.transportMode">
<el-radio value="agv">AGV 拉运(传感器自动派车)</el-radio>
<el-radio value="manual">人工搬运(不派 AGV)</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="退库原因(必填)"><el-input v-model="manual.reason" /></el-form-item>
<el-form-item label="损耗原因(必填)">
<el-input v-model="manual.lossReason" type="textarea" :rows="2" placeholder="必填:说明退料损耗情况(随退库单留存可查)" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="manual.visible = false">取消</el-button>
@@ -18,6 +18,8 @@ const routes = [
{ path: 'call-queue', name: 'CallQueue', component: () => import('../pages/CallQueue.vue'), meta: { title: '叫料队列', keepAlive: true, componentName: 'CallQueue' } },
{ path: 'return-order', name: 'ReturnOrder', component: () => import('../pages/ReturnOrder.vue'), meta: { title: '退库确认', keepAlive: true, componentName: 'ReturnOrder' } },
{ path: 'pallet-workbench', name: 'PalletWorkbench', component: () => import('../pages/PalletWorkbench.vue'), meta: { title: '托盘工作台', keepAlive: true, componentName: 'PalletWorkbench' } },
// P1(2026-11-04 用户拍板):备料清单——只读(无备料完成按钮、不管库存、无历史)
{ path: 'preparation', name: 'PreparationList', component: () => import('../pages/PreparationList.vue'), meta: { title: '备料清单', keepAlive: true, componentName: 'PreparationList' } },
{ path: 'production-return', name: 'DefectReturn', component: () => import('../pages/DefectReturn.vue'), meta: { title: '生产退不良', keepAlive: true, componentName: 'DefectReturn' } },
{ path: 'inventory', name: 'Inventory', component: () => import('../pages/Inventory.vue'), meta: { title: '库存查询', keepAlive: true, componentName: 'Inventory' } },
{ path: 'inspection-incoming', name: 'InspectionIncoming', component: () => import('../pages/Inspection.vue'), meta: { title: '来料检验', keepAlive: true, componentName: 'InspectionIncoming', inspectionType: 'incoming' } },
@@ -42,6 +42,12 @@ request.interceptors.response.use(
e.errors = body.data.errors
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))