一、MES — 叫料单扩展(schema + 逻辑) material_request 新增字段:packageNo(叫料包号,一次提交=一包)、callDate(叫料日,默认当天)、planBreakdown(jsonb,工单×排产日明细 []CallPlanBreakdown);targetDock 语义降级为"期望接驳台(可空,配送时 WMS 确定实际台)"。 新增 internal/logic/call_plan.go:实时计算「叫料需求明细(工单×排产日×物料)」,派生两类提示(当日剩余未叫 / 跨日量明细),不落库、不拦提交;接驳台空台校验 EnsureStationDocksEmpty、托盘回库 DispatchPalletReturnManual、人工清台 ClearDockLedger、配送单派车 DispatchDeliveryAgv、工位物料明细 StationMaterialDetail。 新增 internal/handler/production/call_pkg.go:8 个 MES 内部端点(X-API-TOKEN 网关),供 WMS 调用——叫料需求明细、按包查单、接驳台状态、托盘回库、人工清台、配送单派车、叫料池原始行、工位物料明细、WMS 代叫料。 internal/handler/production/call.go、internal/logic/call.go、agv.go、qty_report.go、routes_production.go、wmsclient/client.go、db.go 同步接入上述逻辑。 二、WMS — 配送单(新功能,叫料与送料彻底拆开) 新增 schema/delivery_order.go + delivery_order_item.go 及 ent 生成代码:delivery_order(PENDING→DISPATCHED→DONE / CANCELLED,一单=一次托盘配送)、delivery_order_item(配送物料明细快照:工单/工艺/排产日)。 新增 internal/handler/delivery.go + 路由 + DeliveryOrders.vue 页面(仓储作业 → 配送单)。 mesclient/client.go 扩展:MES 叫料单结构补 packageNo/callDate/workOrderNo/planBreakdown,新增 PoolRow/DockPalletState/DeliveryAgvItem/getJSON 等。 CallQueue.vue:按叫料包展示,新增「代叫料」「建配送单」按钮与对话框;出库单回写所属配送单号(outbound_order 加字段);AGV 派送改由配送单驱动。 三、工位终端 — 叫料体验升级 MaterialPanel.vue:新增「本工位物料明细」卡(工艺物料全集×工位账四数,量为 0 也显示);叫料改为「叫料包」模式(默认当天、可勾选分批、可选其他排产日、期望接驳台可空),新增叫料日选择器、两条提示横幅(当日剩余未叫 / 跨日量明细)、托盘回库按钮。 InspectPanel.vue/Main.vue/OnlinePanel.vue/OfflinePanel.vue/WorkPanel.vue/SyncQueueDialog.vue/api/index.js/internal/handler/line.go/routes.go 同步接入接驳台状态、托盘回库、下班双台空台校验等。 web/static/index.html 构建刷新。 四、文档 案例.md:重写第 5/6/8/9 节与新「配送单」流程,补「模拟模式跳过接驳台校验」说明,库管员菜单加「配送单」;并修正"本单箱体"等措辞歧义。 客户问题.md:同步本轮拍板口径。 五、构建产物 / 同步 多个 MES 前端页面(.vue)随本次改动统一重新构建刷新;ent 生成代码(MES material_request、WMS delivery_order/outbound_order 相关)随 schema 更新重新生成。
188 lines
10 KiB
Vue
188 lines
10 KiB
Vue
<template>
|
||
<el-card>
|
||
<el-alert type="info" :closable="false" style="margin-bottom:12px"
|
||
title="叫料单(只读):工位在终端按叫料池发起、仓库在 WMS「叫料队列」完成备料/驳回、退库由工位申请并经仓库确认收回。本页仅查看全部叫料单;数量账(需求/已发/占用/可用)以叫料池为准,随启用状态日排产自动派生。" />
|
||
|
||
<el-form inline>
|
||
<el-form-item label="叫料单号"><el-input v-model="query.requestNo" clearable style="width:180px" placeholder="不区分大小写" @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.materialName" clearable style="width:150px" @keyup.enter="load" /></el-form-item>
|
||
<el-form-item label="接驳台"><el-input v-model="query.targetDock" clearable style="width:120px" placeholder="如 DOCK05" @keyup.enter="load" /></el-form-item>
|
||
<el-form-item label="工位"><el-input v-model="query.stationNo" clearable style="width:90px" placeholder="如 3" @keyup.enter="load" /></el-form-item>
|
||
<el-form-item label="来源">
|
||
<el-select v-model="query.source" clearable placeholder="全部" style="width:130px">
|
||
<el-option label="工位叫料" value="CALL" />
|
||
<el-option label="数量不符补发" value="REFILL" />
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item label="状态">
|
||
<el-select v-model="query.status" clearable placeholder="全部" style="width:130px">
|
||
<el-option label="待备料" value="PENDING" />
|
||
<el-option label="已发货" value="SHIPPED" />
|
||
<el-option label="已完成" value="DONE" />
|
||
<el-option label="已取消" value="CANCELLED" />
|
||
<el-option label="已驳回" value="REJECTED" />
|
||
<el-option label="退库中" value="RETURNING" />
|
||
<el-option label="已退库" value="RETURNED" />
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item>
|
||
<el-button type="primary" @click="load">查询</el-button>
|
||
<el-button @click="resetFilters">重置</el-button>
|
||
<el-button type="success" plain @click="exportCsv">导出</el-button>
|
||
</el-form-item>
|
||
</el-form>
|
||
|
||
<el-table :data="list" border size="small">
|
||
<el-table-column prop="requestNo" label="叫料单号" min-width="180" />
|
||
<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 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="70" align="center" />
|
||
<el-table-column label="序列号方式" width="100" align="center">
|
||
<template #default="{row}">{{ row.snMode === 1 ? '序列号=是' : '序列号=否' }}</template>
|
||
</el-table-column>
|
||
<el-table-column prop="stationNo" label="工位" width="70" align="center" />
|
||
<el-table-column prop="targetDock" label="接驳台" width="100" align="center" />
|
||
<el-table-column label="借料来源" min-width="170" align="center">
|
||
<template #default="{row}">
|
||
<span v-if="hasBorrow(row)" style="color:#e6a23c">{{ borrowText(row) }}</span>
|
||
<span v-else>—</span>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column prop="reqQty" label="请求量" width="90" align="center" />
|
||
<el-table-column label="实发量" width="90" align="center">
|
||
<template #default="{row}">{{ Number(row.sentQty || 0) > 0 ? fmtQty(row.sentQty) : '—' }}</template>
|
||
</el-table-column>
|
||
<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>
|
||
<span v-else>—</span>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column prop="outboundNo" label="WMS出库单号" min-width="150" show-overflow-tooltip>
|
||
<template #default="{row}">{{ row.outboundNo || '—' }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="状态" width="100" align="center">
|
||
<template #default="{row}"><el-tag :type="statusTag(row.status)" size="small">{{ statusText(row.status) }}</el-tag></template>
|
||
</el-table-column>
|
||
<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>
|
||
|
||
<PageHelp :data="helpMaterial" page="MaterialRequest" />
|
||
</template>
|
||
|
||
<script setup>
|
||
import { reactive, ref, onMounted } from 'vue'
|
||
import request from '../utils/request'
|
||
import { confirmExport } from '../utils/confirm'
|
||
import PageHelp from '../components/PageHelp.vue'
|
||
import { helpMaterial } from '../help'
|
||
|
||
const query = reactive({ requestNo: '', status: '', materialCode: '', materialName: '', targetDock: '', stationNo: '', source: '' })
|
||
function resetFilters() {
|
||
Object.assign(query, { requestNo: '', status: '', materialCode: '', materialName: '', targetDock: '', stationNo: '', source: '' })
|
||
load()
|
||
}
|
||
const list = ref([])
|
||
|
||
const STATUS_TEXT = {
|
||
PENDING: '待备料', SHIPPED: '已发货', DONE: '已完成', CANCELLED: '已取消',
|
||
REJECTED: '已驳回', RETURNING: '退库中', RETURNED: '已退库'
|
||
}
|
||
const STATUS_TAG = {
|
||
PENDING: 'warning', SHIPPED: 'primary', DONE: 'success', CANCELLED: 'info',
|
||
REJECTED: 'danger', RETURNING: 'warning', RETURNED: 'info'
|
||
}
|
||
const statusText = (s) => STATUS_TEXT[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 || {}
|
||
const self = String(row.stationNo)
|
||
return Object.entries(b).some(([k, v]) => Number(v) > 0 && String(k) !== self)
|
||
}
|
||
function borrowText(row) {
|
||
const b = row.borrowFrom || {}
|
||
const self = String(row.stationNo)
|
||
const parts = Object.entries(b)
|
||
.filter(([k, v]) => Number(v) > 0 && String(k) !== self)
|
||
.map(([k, v]) => `工位${k}:${fmtQty(v)}`)
|
||
return parts.length ? parts.join(',') : '—'
|
||
}
|
||
|
||
function fmtQty(v) {
|
||
const n = Number(v || 0)
|
||
return Number.isInteger(n) ? String(n) : n.toFixed(2)
|
||
}
|
||
|
||
async function load() {
|
||
list.value = (await request.get('/material-requests', { params: query })) || []
|
||
}
|
||
|
||
// 全量导出 CSV(带 BOM,Excel 直接打开中文不乱码)
|
||
async function exportCsv() {
|
||
if (!(await confirmExport(list.value.length, '叫料单记录'))) return
|
||
const header = ['叫料单号', '来源', '图号', '物料名称', '单位', '序列号方式', '工位', '接驳台',
|
||
'借料来源', '请求量', '实发量', '退库量', '实收量', '收货差异', '差异备注', '跨日', '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.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(','))
|
||
}
|
||
const blob = new Blob(['\ufeff' + lines.join('\r\n')], { type: 'text/csv;charset=utf-8' })
|
||
const a = document.createElement('a')
|
||
a.href = URL.createObjectURL(blob)
|
||
a.download = '叫料单.csv'
|
||
a.click()
|
||
URL.revokeObjectURL(a.href)
|
||
}
|
||
|
||
onMounted(load)
|
||
</script>
|