feat: 多系统新增扫码中间件与 AGV 对接,优化拧紧与退库流程
新增扫码中间件支持网络型扫码枪键盘注入,AGV 对接从 WMS 迁至 MES 统一管理;新增拧紧不合格人工处置与 PLC 对账机制,优化退库单关联与工位终端功能,同时清理旧 AGV 任务表,完善数据库与配置项。
This commit is contained in:
@@ -3,8 +3,8 @@ import { ref, computed, onMounted, onBeforeUnmount, watch } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import {
|
||||
HomeFilled, Download, Upload, Search, CircleCheck, List,
|
||||
Box, Tickets, Monitor, EditPen, Fold, Expand, Location, Goods, Key, Operation, Van, Clock, RefreshLeft, Folder, WarningFilled
|
||||
HomeFilled, Download, Upload, Search, CircleCheck, List, Bell,
|
||||
Box, Monitor, EditPen, Fold, Expand, Location, Goods, Key, Operation, Van, Clock, RefreshLeft, Folder, WarningFilled
|
||||
} from '@element-plus/icons-vue'
|
||||
import { getUser, getToken, logout, setSession } from '../utils/auth'
|
||||
import request from '../utils/request'
|
||||
@@ -76,7 +76,6 @@ const menuGroups = [
|
||||
{ path: '/inventory', title: '库存查询', icon: Search, code: 'inventory:view' },
|
||||
{ path: '/stocktake', title: '库存盘点', icon: List, code: 'stocktake:view' },
|
||||
{ path: '/semi', title: '半成品管理', icon: Box, code: 'semi:view' },
|
||||
{ path: '/ledger', title: '工单备料台账', icon: Tickets, code: 'ledger:view' },
|
||||
{ path: '/agv', title: 'AGV配送', icon: Van, code: 'agv:manage' }
|
||||
]
|
||||
},
|
||||
@@ -85,6 +84,7 @@ const menuGroups = [
|
||||
{ path: '/inbound', title: '入库管理', icon: Download, code: 'inbound:view' },
|
||||
{ path: '/finished-inbound', title: '成品入库', icon: Box, code: 'wms.finished:edit' },
|
||||
{ path: '/outbound', title: '出库管理', icon: Upload, code: 'outbound:view' },
|
||||
{ path: '/call-queue', title: '叫料队列', icon: Bell, code: 'call:view' },
|
||||
{ path: '/return-order', title: '退库确认', icon: RefreshLeft, code: 'return:view' },
|
||||
{ path: '/production-return', title: '生产退不良', icon: WarningFilled, code: 'prodreturn:manage' },
|
||||
{ path: '/inspection-incoming', title: '来料检验', icon: CircleCheck, code: 'inspection:view' }
|
||||
|
||||
@@ -0,0 +1,160 @@
|
||||
<template>
|
||||
<el-card>
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:12px"
|
||||
title="叫料队列(仓库端):工位从「叫料池」发起的叫料单在此排队。选一条点「完成备料」= 系统按 FIFO 从合格在库库存选批/选 SN → 自动生成 WMS 出库单(类别:叫料配送)并扣库存 → 通知 MES 已发货 → 即将触发 AGV 派车(仓库接驳台 → 工位接驳台)。缺多少发多少,差额自动释放;也可「驳回」(必须填理由,如:非当日排产)。" />
|
||||
|
||||
<el-form inline>
|
||||
<el-form-item label="工位">
|
||||
<el-input v-model="query.stationNo" clearable style="width:100px" placeholder="如 3" @keyup.enter="load" />
|
||||
</el-form-item>
|
||||
<el-form-item label="图号">
|
||||
<el-input v-model="query.materialCode" clearable style="width:150px" placeholder="不区分大小写" @keyup.enter="load" />
|
||||
</el-form-item>
|
||||
<el-form-item label="叫料单号">
|
||||
<el-input v-model="query.requestNo" clearable style="width:180px" placeholder="不区分大小写" @keyup.enter="load" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="load">查询</el-button>
|
||||
<el-button @click="resetFilters">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-table :data="list" border size="small" v-loading="loading">
|
||||
<el-table-column prop="requestNo" label="叫料单号" min-width="180" />
|
||||
<el-table-column prop="stationNo" label="工位" width="70" align="center" />
|
||||
<el-table-column prop="materialCode" label="图号" min-width="110" />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="110" show-overflow-tooltip />
|
||||
<el-table-column prop="unit" label="单位" width="60" align="center" />
|
||||
<el-table-column label="序列号方式" width="100" align="center">
|
||||
<template #default="{row}">{{ row.snMode === 1 ? '序列号=是' : '序列号=否' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="targetDock" label="目标接驳台" width="110" align="center" />
|
||||
<el-table-column prop="reqQty" label="请求量" width="90" align="center" />
|
||||
<el-table-column label="跨日" width="80" align="center">
|
||||
<template #default="{row}">
|
||||
<el-tag v-if="row.crossDay" type="warning" size="small">非当日</el-tag>
|
||||
<span v-else>—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="来源" width="120" align="center">
|
||||
<template #default="{row}">
|
||||
<el-tag v-if="row.source === 'REFILL'" type="danger" size="small">数量不符补发</el-tag>
|
||||
<el-tag v-else type="info" size="small">工位叫料</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="200" align="center" fixed="right">
|
||||
<template #default="{row}">
|
||||
<el-button
|
||||
v-if="can('call:manage')"
|
||||
type="primary"
|
||||
size="small"
|
||||
:loading="completingNo === row.requestNo"
|
||||
@click="doComplete(row)"
|
||||
>完成备料</el-button>
|
||||
<el-button
|
||||
v-if="can('call:manage')"
|
||||
type="warning"
|
||||
plain
|
||||
size="small"
|
||||
:loading="rejectingNo === row.requestNo"
|
||||
@click="openReject(row)"
|
||||
>驳回</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-empty v-if="!loading && !list.length" description="暂无待备料叫料单" :image-size="60" />
|
||||
</el-card>
|
||||
|
||||
<!-- 驳回对话框(理由必填;跨日单可一键填「非当日排产」) -->
|
||||
<el-dialog v-model="rejectDlg.visible" title="驳回叫料单" width="460px">
|
||||
<div style="margin-bottom:10px">
|
||||
叫料单:<b>{{ rejectDlg.row?.requestNo }}</b>(工位 {{ rejectDlg.row?.stationNo }} / {{ rejectDlg.row?.materialName || rejectDlg.row?.materialCode }} × {{ rejectDlg.row?.reqQty }})
|
||||
</div>
|
||||
<el-input v-model="rejectDlg.reason" type="textarea" :rows="3" maxlength="128" show-word-limit placeholder="请填写驳回理由(如:非当日排产 / 库存质量异常 / 目标接驳台占用)" />
|
||||
<template #footer>
|
||||
<el-button @click="rejectDlg.visible = false">取消</el-button>
|
||||
<el-button type="warning" :loading="rejectingNo === rejectDlg.row?.requestNo" @click="doReject">确认驳回</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { reactive, ref, onMounted } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
import { can } from '../utils/perm'
|
||||
|
||||
const query = reactive({ stationNo: '', materialCode: '', requestNo: '' })
|
||||
const list = ref([])
|
||||
const loading = ref(false)
|
||||
const completingNo = ref('')
|
||||
const rejectingNo = ref('')
|
||||
const rejectDlg = reactive({ visible: false, row: null, reason: '' })
|
||||
|
||||
function resetFilters() {
|
||||
Object.assign(query, { stationNo: '', materialCode: '', requestNo: '' })
|
||||
load()
|
||||
}
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await request.get('/call/pending', { params: query })
|
||||
list.value = data?.list || []
|
||||
} catch {
|
||||
// 拦截器已提示
|
||||
}
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
// 完成备料:一键(FIFO 选库存 → WMS 出库扣库存 → 通知 MES → AGV 派车)
|
||||
async function doComplete(row) {
|
||||
if (!row?.requestNo) return
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认完成叫料单「${row.requestNo}」的备料?\n\n将按 FIFO 从合格在库库存选批/选 SN,生成 WMS 出库单(叫料配送)扣减库存,通知 MES 已发货,并即将触发 AGV 派车,由 AGV 将物料从仓库接驳台送至工位 ${row.stationNo} 接驳台 ${row.targetDock}。\n\n缺多少发多少,差额自动释放。`,
|
||||
'完成备料', { type: 'warning', confirmButtonText: '确认完成' })
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
completingNo.value = row.requestNo
|
||||
try {
|
||||
const res = await request.post('/call/complete', { requestNo: row.requestNo })
|
||||
const parts = [`实发 ${res?.sentQty ?? 0}`]
|
||||
if (res?.short > 0) parts.push(`差额 ${res.short} 已自动释放`)
|
||||
if (res?.agvNote) parts.push(res.agvNote)
|
||||
ElMessage.success('已完成备料:' + parts.join(';'))
|
||||
load()
|
||||
} catch {
|
||||
// 拦截器已提示(如:无可用合格库存 / 通知 MES 失败——出库单号在错误信息里,可重试)
|
||||
}
|
||||
completingNo.value = ''
|
||||
}
|
||||
|
||||
function openReject(row) {
|
||||
rejectDlg.row = row
|
||||
rejectDlg.reason = row?.crossDay ? '非当日排产' : ''
|
||||
rejectDlg.visible = true
|
||||
}
|
||||
|
||||
async function doReject() {
|
||||
const row = rejectDlg.row
|
||||
if (!row?.requestNo) return
|
||||
if (!rejectDlg.reason.trim()) {
|
||||
ElMessage.warning('请填写驳回理由')
|
||||
return
|
||||
}
|
||||
rejectingNo.value = row.requestNo
|
||||
try {
|
||||
await request.post('/call/reject', { requestNo: row.requestNo, reason: rejectDlg.reason.trim() })
|
||||
ElMessage.success('已驳回:' + row.requestNo)
|
||||
rejectDlg.visible = false
|
||||
load()
|
||||
} catch {
|
||||
// 拦截器已提示
|
||||
}
|
||||
rejectingNo.value = ''
|
||||
}
|
||||
|
||||
onMounted(load)
|
||||
</script>
|
||||
@@ -1,335 +0,0 @@
|
||||
<script setup>
|
||||
defineOptions({ name: 'Ledger' })
|
||||
import { onMounted, reactive, ref, computed } from 'vue'
|
||||
import request from '../utils/request'
|
||||
import { fmtTime } from '../utils/format'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
import { helpLedger } from '../help'
|
||||
|
||||
const orderNo = ref('')
|
||||
const materialCode = ref('')
|
||||
const materialName = ref('')
|
||||
const stateFilter = ref('')
|
||||
const completeRange = ref([]) // 完成时间范围 [start, end]
|
||||
const loading = ref(false)
|
||||
const queried = ref(false)
|
||||
const rows = ref([])
|
||||
const total = ref(0)
|
||||
const page = reactive({ current: 1, size: 20 })
|
||||
|
||||
// 页签:备料台账 / 退料台账(并列)
|
||||
const activeTab = ref('prep')
|
||||
|
||||
// 退料台账:return_orders(RECEIVED) 按工单+物料聚合的读模型,与备料台账并列,不回写已出库量
|
||||
const retOrderNo = ref('')
|
||||
const retMaterialCode = ref('')
|
||||
const retMaterialName = ref('')
|
||||
const retLoading = ref(false)
|
||||
const retQueried = ref(false)
|
||||
const retRows = ref([])
|
||||
const retTotal = ref(0)
|
||||
const retPage = reactive({ current: 1, size: 20 })
|
||||
|
||||
async function loadReturn() {
|
||||
retLoading.value = true
|
||||
try {
|
||||
const data = await request.get('/return-order/ledger', {
|
||||
params: {
|
||||
orderNo: retOrderNo.value.trim() || undefined,
|
||||
materialCode: retMaterialCode.value.trim() || undefined,
|
||||
materialName: retMaterialName.value.trim() || undefined,
|
||||
page: retPage.current,
|
||||
pageSize: retPage.size
|
||||
}
|
||||
})
|
||||
retRows.value = data?.list || []
|
||||
retTotal.value = data?.total || 0
|
||||
retQueried.value = true
|
||||
} finally {
|
||||
retLoading.value = false
|
||||
}
|
||||
}
|
||||
function searchReturn() {
|
||||
retPage.current = 1
|
||||
loadReturn()
|
||||
}
|
||||
|
||||
function resetReturnFilters() {
|
||||
retOrderNo.value = ''
|
||||
retMaterialCode.value = ''
|
||||
retMaterialName.value = ''
|
||||
retPage.current = 1
|
||||
searchReturn()
|
||||
}
|
||||
function onTabChange(name) {
|
||||
if (name === 'return' && !retQueried.value) loadReturn()
|
||||
}
|
||||
|
||||
// 缺口按净领用计算:净领用 = 已出库 − 已退回(退料自动回补缺口,退料后可再次补料)
|
||||
function gapOf(row) {
|
||||
const net = (row.outQty || 0) - (row.returnedQty || 0)
|
||||
return Math.max((row.totalQty || 0) - net, 0)
|
||||
}
|
||||
// 净领用 net_out = 已出库 − 已退回(台账强约束:net_out ≤ total_qty,等于时领料完结)
|
||||
function netOf(row) {
|
||||
return (row.outQty || 0) - (row.returnedQty || 0)
|
||||
}
|
||||
// 在途/线边(WMS 可派生口径)= 已发出未消耗 = net_out − 已消耗。
|
||||
// WMS 不猜 MES 的「已接料量」,故此处含在途+工位余量两段,细分在 MES 侧(临时.md §三)。
|
||||
function transitOf(row) {
|
||||
return Math.max(netOf(row) - (row.consumedQty || 0), 0)
|
||||
}
|
||||
|
||||
// 闭环核对(当前页汇总):需求量 = 已出库 + 剩余缺口;净领用 ≤ 需求量;等式必须成立。
|
||||
const recon = computed(() => {
|
||||
let total = 0, out = 0, ret = 0, consumed = 0, gap = 0
|
||||
let bad = 0
|
||||
for (const r of rows.value) {
|
||||
const net = netOf(r)
|
||||
total += r.totalQty || 0
|
||||
out += r.outQty || 0
|
||||
ret += r.returnedQty || 0
|
||||
consumed += r.consumedQty || 0
|
||||
gap += gapOf(r)
|
||||
// 逐行校验:净领用不得超过需求量;已消耗不得超过净领用
|
||||
if (net > (r.totalQty || 0) || (r.consumedQty || 0) > net) bad++
|
||||
}
|
||||
// 需求量 = 已出库 + 剩余缺口(此处以净领用口径核对:total = net + gap)
|
||||
const eqOk = bad === 0
|
||||
return { total, out, ret, consumed, gap, net: out - ret, bad, eqOk }
|
||||
})
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await request.get('/ledger/query', {
|
||||
params: {
|
||||
orderNo: orderNo.value.trim() || undefined,
|
||||
materialCode: materialCode.value.trim() || undefined,
|
||||
materialName: materialName.value.trim() || undefined,
|
||||
state: stateFilter.value || undefined,
|
||||
completeStart: completeRange.value?.[0] || undefined,
|
||||
completeEnd: completeRange.value?.[1] || undefined,
|
||||
page: page.current,
|
||||
pageSize: page.size
|
||||
}
|
||||
})
|
||||
rows.value = data?.list || []
|
||||
total.value = data?.total || 0
|
||||
queried.value = true
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function search() {
|
||||
page.current = 1
|
||||
load()
|
||||
}
|
||||
|
||||
function resetFilters() {
|
||||
orderNo.value = ''
|
||||
materialCode.value = ''
|
||||
materialName.value = ''
|
||||
stateFilter.value = ''
|
||||
completeRange.value = []
|
||||
page.current = 1
|
||||
search()
|
||||
}
|
||||
|
||||
onMounted(load)
|
||||
|
||||
// 备料四态(服务端派生,客户诉求 L242-258):齐套 / 预警 / 未齐套 / 未到货
|
||||
function stateTagType(s) {
|
||||
switch (s) {
|
||||
case '齐套': return 'success'
|
||||
case '预警': return 'danger'
|
||||
case '未齐套': return 'warning'
|
||||
case '未到货': return 'info'
|
||||
default: return 'info'
|
||||
}
|
||||
}
|
||||
function statusView(row) {
|
||||
return row.state || '未齐套'
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div>
|
||||
<el-tabs v-model="activeTab" @tab-change="onTabChange">
|
||||
<el-tab-pane label="备料台账" name="prep">
|
||||
<el-card shadow="never" class="mb12">
|
||||
<el-form inline @submit.prevent="search">
|
||||
<el-form-item label="工单号">
|
||||
<el-input v-model="orderNo" placeholder="工单号(可空,查全部)" clearable
|
||||
style="width:200px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="图号">
|
||||
<el-input v-model="materialCode" placeholder="图号(可空)" clearable
|
||||
style="width:160px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料名称">
|
||||
<el-input v-model="materialName" placeholder="物料名称(可空)" clearable
|
||||
style="width:160px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备料状态">
|
||||
<el-select v-model="stateFilter" placeholder="全部" clearable style="width:130px" @change="search">
|
||||
<el-option label="齐套" value="齐套" />
|
||||
<el-option label="预警" value="预警" />
|
||||
<el-option label="未齐套" value="未齐套" />
|
||||
<el-option label="未到货" value="未到货" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="完成时间">
|
||||
<el-date-picker v-model="completeRange" type="daterange" value-format="YYYY-MM-DD"
|
||||
start-placeholder="开始" end-placeholder="结束" clearable
|
||||
style="width:240px" @change="search" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="loading" @click="search">查询</el-button>
|
||||
<el-button @click="resetFilters">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-card v-if="queried" shadow="never">
|
||||
<template #header>
|
||||
工单备料台账(共 {{ total }} 条)
|
||||
</template>
|
||||
<el-alert :type="recon.eqOk ? 'success' : 'error'" :closable="false" show-icon class="mb12">
|
||||
<template #title>
|
||||
<span style="font-weight:600">闭环核对(本页汇总)</span>
|
||||
<span style="margin-left:12px">需求 {{ recon.total }}</span>
|
||||
<span style="margin-left:12px">已出库 {{ recon.out }}</span>
|
||||
<span style="margin-left:12px">已退回 {{ recon.ret }}</span>
|
||||
<span style="margin-left:12px">净领用 {{ recon.net }}</span>
|
||||
<span style="margin-left:12px">已消耗 {{ recon.consumed }}</span>
|
||||
<span style="margin-left:12px">剩余缺口 {{ recon.gap }}</span>
|
||||
</template>
|
||||
<div style="font-size:12px;line-height:1.7">
|
||||
等式:需求量 = 净领用 + 剩余缺口;净领用 = 已出库 − 已退回;在途/线边 = 净领用 − 已消耗。
|
||||
<span v-if="recon.eqOk" style="color:#67c23a">✔ 本页 {{ rows.length }} 行等式均成立。</span>
|
||||
<span v-else style="color:#f56c6c">✖ 有 {{ recon.bad }} 行账实不符(净领用 > 需求量 或 已消耗 > 净领用),请核查。</span>
|
||||
</div>
|
||||
</el-alert>
|
||||
<el-table :data="rows" border v-loading="loading" empty-text="暂无台账数据">
|
||||
<el-table-column prop="id" label="ID" width="64" align="center" />
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="150" />
|
||||
<el-table-column prop="materialCode" label="图号" min-width="140" />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="160">
|
||||
<template #default="{ row }">{{ row.materialName || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="totalQty" label="需求总量" width="100" align="center" />
|
||||
<el-table-column prop="availableQty" label="可用库存" width="100" align="center">
|
||||
<template #default="{ row }">{{ row.availableQty ?? 0 }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="outQty" label="已出库" width="90" align="center" />
|
||||
<el-table-column prop="returnedQty" label="已退回" width="90" align="center" />
|
||||
<el-table-column label="净领用" width="90" align="center">
|
||||
<template #default="{ row }">{{ netOf(row) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="consumedQty" label="已消耗" width="90" align="center" />
|
||||
<el-table-column label="在途/线边" width="100" align="center">
|
||||
<template #header>
|
||||
<el-tooltip placement="top" content="已发出未消耗 = 净领用 − 已消耗(含在途+工位余量,细分在 MES 侧)">
|
||||
<span>在途/线边</span>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
<template #default="{ row }">{{ transitOf(row) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="缺口" width="90" align="center">
|
||||
<template #default="{ row }">{{ gapOf(row) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="目标工位" width="100" align="center">
|
||||
<template #default="{ row }">{{ row.targetStation || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备料状态" width="110" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="stateTagType(statusView(row))" size="small">{{ statusView(row) }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="备注" min-width="140">
|
||||
<template #default="{ row }">{{ row.remark || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="完成时间" width="165" align="center">
|
||||
<template #default="{ row }">{{ row.completedAt ? fmtTime(row.completedAt) : '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" width="165" align="center">
|
||||
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="pager">
|
||||
<el-pagination background layout="total, prev, pager, next" :total="total"
|
||||
:current-page="page.current" :page-size="page.size"
|
||||
@current-change="(p) => { page.current = p; load() }" />
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-card v-else shadow="never">
|
||||
<el-skeleton :rows="6" animated />
|
||||
</el-card>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="退料台账" name="return">
|
||||
<el-card shadow="never" class="mb12">
|
||||
<el-form inline @submit.prevent="searchReturn">
|
||||
<el-form-item label="工单号">
|
||||
<el-input v-model="retOrderNo" placeholder="工单号(可空,查全部)" clearable
|
||||
style="width:200px" @keyup.enter="searchReturn" />
|
||||
</el-form-item>
|
||||
<el-form-item label="图号">
|
||||
<el-input v-model="retMaterialCode" placeholder="图号(可空)" clearable
|
||||
style="width:160px" @keyup.enter="searchReturn" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料名称">
|
||||
<el-input v-model="retMaterialName" placeholder="物料名称(可空)" clearable
|
||||
style="width:160px" @keyup.enter="searchReturn" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="retLoading" @click="searchReturn">查询</el-button>
|
||||
<el-button @click="resetReturnFilters">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<el-card v-if="retQueried" shadow="never">
|
||||
<template #header>
|
||||
工单退料台账(共 {{ retTotal }} 条)· 数据源:已收货退库单聚合,独立于备料台账、不回写已出库量
|
||||
</template>
|
||||
<el-table :data="retRows" border v-loading="retLoading" empty-text="暂无退料数据">
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="150">
|
||||
<template #default="{ row }">{{ row.orderNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="materialCode" label="图号" min-width="140" />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="160">
|
||||
<template #default="{ row }">{{ row.materialName || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="spec" label="规格" min-width="120">
|
||||
<template #default="{ row }">{{ row.spec || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="returnedQty" label="已退数量" width="100" align="center" />
|
||||
<el-table-column prop="returnCount" label="退库笔数" width="100" align="center" />
|
||||
<el-table-column label="退库工位" width="140" align="center">
|
||||
<template #default="{ row }">{{ (row.stations && row.stations.length) ? row.stations.join('、') : '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="最近退库时间" width="165" align="center">
|
||||
<template #default="{ row }">{{ row.lastReceive ? fmtTime(row.lastReceive) : '-' }}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="pager">
|
||||
<el-pagination background layout="total, prev, pager, next" :total="retTotal"
|
||||
:current-page="retPage.current" :page-size="retPage.size"
|
||||
@current-change="(p) => { retPage.current = p; loadReturn() }" />
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card v-else shadow="never">
|
||||
<el-skeleton :rows="6" animated />
|
||||
</el-card>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
<PageHelp :data="helpLedger" page="Ledger" />
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.mb12 { margin-bottom: 12px; }
|
||||
.pager { display: flex; justify-content: flex-end; margin-top: 10px; }
|
||||
</style>
|
||||
@@ -12,101 +12,8 @@ import PageHelp from '../components/PageHelp.vue'
|
||||
import MaterialSelect from '../components/MaterialSelect.vue'
|
||||
import { helpOutbound } from '../help'
|
||||
|
||||
const activeTab = ref('prep') // prep=备料出库 / general=通用出库 / records=出库记录
|
||||
const activeTab = ref('general') // general=通用出库 / records=出库记录(工单领料出库已随叫料池模型退役,见「叫料队列」)
|
||||
const operator = getRealName()
|
||||
|
||||
/* ===================== 备料出库(WMS 工单备料台账,由 MES 备料单同步) ===================== */
|
||||
const queryForm = reactive({ orderNo: '' })
|
||||
// 目标工位:AGV 配送 toDock 参数,DOCK01~DOCK20 下拉选填(不选默认产线入口 DOCK01)
|
||||
const targetDock = ref('')
|
||||
const dockOptions = Array.from({ length: 20 }, (_, i) => 'DOCK' + String(i + 1).padStart(2, '0'))
|
||||
const loadingPrep = ref(false)
|
||||
const queried = ref(false)
|
||||
const rows = ref([])
|
||||
|
||||
const orders = ref([])
|
||||
const ordersLoading = ref(false)
|
||||
// 工单号来自 MES 实时查询:无输入默认拉「未完成优先」的前 20 条;输入时按工单号模糊远程搜索。
|
||||
async function searchOrders(query) {
|
||||
ordersLoading.value = true
|
||||
try {
|
||||
const data = await request.get('/orders', { params: { orderNo: query || '', limit: 20 } })
|
||||
orders.value = Array.isArray(data) ? data : data?.list || []
|
||||
} catch { orders.value = [] }
|
||||
finally { ordersLoading.value = false }
|
||||
}
|
||||
async function loadOrders() { await searchOrders('') }
|
||||
function orderLabel(o) { return o.productName ? `${o.workOrderNo} ${o.productName}` : o.workOrderNo }
|
||||
// 选中下拉项或手输兜底(allow-create)后直接查该工单台账
|
||||
function onOrderPick(v) { if (v && String(v).trim()) queryPrep() }
|
||||
onMounted(loadOrders)
|
||||
|
||||
const pendingRows = computed(() => rows.value.filter(r => r.status !== '领料完结'))
|
||||
function gapOf(row) { return Math.max((row.totalQty || 0) - (row.outQty || 0), 0) }
|
||||
|
||||
// 一键自动分配批次:合格区 Z02,batchNo 正序 FIFO 凑够缺口
|
||||
async function autoAllocate(row) {
|
||||
const gap = gapOf(row)
|
||||
if (gap <= 0) return
|
||||
const stock = await request.get('/stock/details', { params: { materialCode: row.materialCode, snMode: 2, page: 1, pageSize: 200 } })
|
||||
const batches = (stock?.list || [])
|
||||
.filter(b => b.qualityStatus === '合格' && b.zoneCode === 'Z02')
|
||||
.sort((a, b) => String(a.batchNo).localeCompare(String(b.batchNo)))
|
||||
|
||||
const plan = []
|
||||
let remain = gap
|
||||
for (const b of batches) {
|
||||
if (remain <= 0) break
|
||||
const avail = (b.quantity || 0) - (b.lockedQty || 0)
|
||||
if (avail <= 0) continue
|
||||
const take = Math.min(avail, remain)
|
||||
plan.push({ batchNo: b.batchNo, qty: take, zoneCode: b.zoneCode })
|
||||
remain -= take
|
||||
}
|
||||
if (!plan.length) {
|
||||
ElMessage.warning(`物料 ${row.materialCode} 在合格区(Z02)无可用批次库存`)
|
||||
return
|
||||
}
|
||||
if (remain > 0) {
|
||||
ElMessage.error(`可用量不足:缺口 ${gap},Z02 仅可凑 ${gap - remain},还差 ${remain}`)
|
||||
return
|
||||
}
|
||||
|
||||
const lines = plan.map(p => `· 批次 ${p.batchNo} 出库 ${p.qty}`).join('\n')
|
||||
await ElMessageBox.confirm(
|
||||
`工单 ${row.orderNo} 物料 ${row.materialCode}\n缺口 ${gap},按 FIFO 分配如下:\n${lines}\n\n操作人:${operator}${targetDock.value ? `\n目标口:${targetDock.value}` : ''}`,
|
||||
'确认自动分配出库',
|
||||
{ type: 'warning', confirmButtonText: '确认出库', cancelButtonText: '取消' }
|
||||
)
|
||||
|
||||
const outboundNos = []
|
||||
let lastStatus = ''
|
||||
for (const p of plan) {
|
||||
const res = await request.post('/outbound/create', {
|
||||
orderNo: row.orderNo, materialCode: row.materialCode, batchNo: p.batchNo,
|
||||
qty: p.qty, operator, targetDock: targetDock.value.trim() || undefined
|
||||
})
|
||||
if (res?.outboundNo) outboundNos.push(res.outboundNo)
|
||||
lastStatus = res?.status || lastStatus
|
||||
}
|
||||
const done = lastStatus === '领料完结'
|
||||
ElMessage.success(`出库完成:出库单号 ${outboundNos.join('、')};该物料${done ? '已' : '未'}领料完结`)
|
||||
await queryPrep()
|
||||
}
|
||||
|
||||
function statusTag(s) { return s === '领料完结' ? 'success' : s === '进行中' ? 'primary' : 'info' }
|
||||
|
||||
async function queryPrep() {
|
||||
if (!queryForm.orderNo.trim()) { ElMessage.warning('请输入工单号'); return }
|
||||
loadingPrep.value = true
|
||||
try {
|
||||
const data = await request.get('/ledger/query', { params: { orderNo: queryForm.orderNo.trim(), page: 1, pageSize: 100 } })
|
||||
rows.value = data?.list || []
|
||||
queried.value = true
|
||||
if (!rows.value.length) ElMessage.info('该工单暂无台账记录')
|
||||
} finally { loadingPrep.value = false }
|
||||
}
|
||||
|
||||
/* ===================== 通用出库(手动,不依赖工单) ===================== */
|
||||
// 出库类别:退料/退货/样品/报废/发货/其他(客户诉求 L96-108 + U5)
|
||||
const CATEGORY_OPTIONS = [
|
||||
@@ -397,68 +304,6 @@ onMounted(loadDicts)
|
||||
<template>
|
||||
<div>
|
||||
<el-tabs v-model="activeTab" @tab-change="onTabChange">
|
||||
<!-- ============ 备料出库(WMS 工单备料台账,由 MES 备料单同步) ============ -->
|
||||
<el-tab-pane label="工单领料出库(操作)" name="prep">
|
||||
<el-alert type="info" :closable="false" class="mb12"
|
||||
title="本页按 MES 工单号查询 WMS 工单备料台账(由 MES 备料单同步),按缺口一键领料;工单号下拉来自 MES 实时工单。"
|
||||
description="未启用 MES 或工单未同步时,工单下拉可能为空——此时可直接手输工单号(前提是台账已同步),或改用「通用出库」处理退料/样品/报废/发货等不挂靠工单的场景。" />
|
||||
<el-card shadow="never" class="mb12">
|
||||
<el-form inline label-width="90px" @submit.prevent>
|
||||
<el-form-item label="工单号">
|
||||
<el-select v-model="queryForm.orderNo" filterable remote allow-create default-first-option
|
||||
clearable reserve-keyword :remote-method="searchOrders" :loading="ordersLoading"
|
||||
placeholder="选择或输入工单号(默认未完成优先前20条,可模糊搜索)"
|
||||
style="width:340px" @change="onOrderPick">
|
||||
<el-option v-for="o in orders" :key="o.workOrderNo" :value="o.workOrderNo" :label="orderLabel(o)">
|
||||
<span style="float:left">{{ o.workOrderNo }}</span>
|
||||
<span style="float:right;color:#909399;font-size:12px">{{ o.productName }} {{ o.status }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="操作人">
|
||||
<el-input :model-value="operator" disabled style="width:160px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标工位">
|
||||
<el-select v-model="targetDock" placeholder="选填,默认 DOCK01" clearable filterable
|
||||
style="width:180px">
|
||||
<el-option v-for="d in dockOptions" :key="d" :value="d" :label="d" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="loadingPrep" @click="queryPrep">查询备料台账</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-card v-if="queried" shadow="never">
|
||||
<template #header>
|
||||
台账明细(共 {{ rows.length }} 行,待补 {{ pendingRows.length }} 行)
|
||||
</template>
|
||||
<el-table :data="rows" border v-loading="loadingPrep">
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="140" />
|
||||
<el-table-column prop="materialCode" label="图号" min-width="150" />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="140">
|
||||
<template #default="{ row }">{{ row.materialName || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="totalQty" label="需求总量" width="100" align="center" />
|
||||
<el-table-column prop="outQty" label="已出库" width="90" align="center" />
|
||||
<el-table-column label="缺口" width="90" align="center">
|
||||
<template #default="{ row }"><span :class="{ gap: gapOf(row) > 0 }">{{ gapOf(row) }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" width="110" align="center">
|
||||
<template #default="{ row }"><el-tag :type="statusTag(row.status)" size="small">{{ row.status }}</el-tag></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="90" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button v-if="row.status !== '领料完结'" type="primary" size="small" @click="autoAllocate(row)">分配</el-button>
|
||||
<span v-else style="color:#67c23a">已完结</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
<el-empty v-else description="请先按工单号查询备料台账" />
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- ============ 通用出库 ============ -->
|
||||
<el-tab-pane label="通用出库" name="general">
|
||||
<el-card shadow="never" class="mb12" header="通用出库(不依赖工单:退料 / 样品 / 报废 / 发货)">
|
||||
|
||||
@@ -13,13 +13,13 @@ const routes = [
|
||||
{ path: 'inbound', name: 'Inbound', component: () => import('../pages/Inbound.vue'), meta: { title: '入库管理', keepAlive: true, componentName: 'Inbound' } },
|
||||
{ path: 'finished-inbound', name: 'FinishedInbound', component: () => import('../pages/FinishedInbound.vue'), meta: { title: '成品入库', keepAlive: true, componentName: 'FinishedInbound' } },
|
||||
{ path: 'outbound', name: 'Outbound', component: () => import('../pages/Outbound.vue'), meta: { title: '出库管理', keepAlive: true, componentName: 'Outbound' } },
|
||||
{ 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: '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' } },
|
||||
{ path: 'stocktake', name: 'Stocktake', component: () => import('../pages/Stocktake.vue'), meta: { title: '库存盘点', keepAlive: true, componentName: 'Stocktake' } },
|
||||
{ path: 'semi', name: 'Semi', component: () => import('../pages/Semi.vue'), meta: { title: '半成品管理', keepAlive: true, componentName: 'Semi' } },
|
||||
{ path: 'ledger', name: 'Ledger', component: () => import('../pages/Ledger.vue'), meta: { title: '工单备料台账', keepAlive: true, componentName: 'Ledger' } },
|
||||
{ path: 'agv', name: 'Agv', component: () => import('../pages/Agv.vue'), meta: { title: 'AGV配送', keepAlive: true, componentName: 'Agv' } },
|
||||
{ path: 'zone', name: 'Zone', component: () => import('../pages/BaseData.vue'), props: { mode: 'zone' }, meta: { title: '区域维护', keepAlive: true, componentName: 'BaseData' } },
|
||||
{ path: 'material', name: 'Material', component: () => import('../pages/BaseData.vue'), props: { mode: 'material' }, meta: { title: '物料档案', keepAlive: true, componentName: 'BaseData' } },
|
||||
|
||||
Reference in New Issue
Block a user