按模块说明

一、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 更新重新生成。
This commit is contained in:
SunYF
2026-11-05 19:18:18 +08:00
parent 46fcb59079
commit 1d1dc1bdd8
102 changed files with 12953 additions and 379 deletions
@@ -194,7 +194,7 @@ async function submit() {
return
}
if (isSn.value && !snList.value.length) {
ElMessage.warning('该物料为序列号=是(按 SN 记账),请先扫码录入 SN')
ElMessage.warning('该物料为序列号=是(按 SN 记账),请先扫码录入序列号')
return
}
if (!isSn.value && (!form.quantity || form.quantity <= 0)) {
@@ -235,7 +235,7 @@ async function submit() {
}
const data = await request.post('/inbound/create', payload)
lastInboundNo.value = data?.inboundNo || ''
const qtyText = isSn.value ? `SN 共 ${snList.value.length} 条` : `数量 ${data?.quantity ?? form.quantity}`
const qtyText = isSn.value ? `序列号共 ${snList.value.length} 条` : `数量 ${data?.quantity ?? form.quantity}`
ElMessage.success(`入库成功:入库单号 ${lastInboundNo.value},${qtyText}`)
const att = await uploadStaged(lastInboundNo.value)
if (att) ElMessage.success(`已挂载 ${att} 个附件`)
@@ -258,7 +258,7 @@ onMounted(() => loadZones())
<template>
<el-card shadow="never">
<div style="margin-bottom:10px;color:#909399;font-size:12px">
录入方式由所选物料的「序列号」决定:<b>序列号=是(按 SN 记账)</b>=SN 逐件扫码;<b>序列号=否(按批次记账)</b>=批次号+数量。
录入方式由所选物料的「序列号」决定:<b>序列号=是(按序列号记账)</b>=逐件扫码;<b>序列号=否(按批次记账)</b>=批次号+数量。
<template v-if="isOther">其他入库用于辅料/螺栓/工装/试验设备等,<b>规格型号强制</b>(在物料档案维护)。</template>
</div>
<el-alert v-if="form.materialCode && !material" type="warning" :closable="false" style="max-width:620px;margin-bottom:10px"
@@ -363,17 +363,17 @@ onMounted(() => loadZones())
<!-- SN 录入区 + 已录入清单(序列号=是(按 SN 记账):扫码区与已录入计数上下相邻,不隔其他内容) -->
<template v-if="isSn">
<el-card shadow="never" style="max-width:620px;margin-bottom:12px">
<div style="font-weight:600;margin-bottom:6px">SN 扫码录入</div>
<div style="font-weight:600;margin-bottom:6px">序列号扫码录入</div>
<el-input v-model="snInput" type="textarea" :rows="4"
placeholder="扫入或粘贴 SN,可用 逗号/分号/顿号/空格/回车 分隔,一次可录入多条" />
placeholder="扫入或粘贴序列号,可用 逗号/分号/顿号/空格/回车 分隔,一次可录入多条" />
<el-button type="primary" plain style="margin-top:6px" :disabled="!snInput.trim()"
@click="addSnLines">录入到列表</el-button>
<span style="margin-left:8px;color:#909399;font-size:12px">点【录入到列表】加入下方清单,回车只是换行</span>
</el-card>
<div style="margin:8px 0">已录入 <b>{{ snList.length }}</b> 条 SN</div>
<el-table :data="snList.map((v, i) => ({ i, v }))" size="small" border max-height="320" empty-text="暂无 SN" style="max-width:620px">
<div style="margin:8px 0">已录入 <b>{{ snList.length }}</b> 条序列号</div>
<el-table :data="snList.map((v, i) => ({ i, v }))" size="small" border max-height="320" empty-text="暂无序列号" style="max-width:620px">
<el-table-column type="index" label="#" width="56" align="center" />
<el-table-column prop="v" label="SN 序列号" min-width="220" />
<el-table-column prop="v" label="序列号" min-width="220" />
<el-table-column label="操作" width="90" align="center">
<template #default="{ row }">
<el-button link type="danger" size="small" @click="removeSn(row.i)">删除</el-button>
@@ -199,7 +199,7 @@ async function submitGen() {
payload.batchNo = genForm.batchNo
payload.qty = genForm.qty
} else {
if (!snList.value.length) { ElMessage.warning('请录入至少一个 SN'); return }
if (!snList.value.length) { ElMessage.warning('请录入至少一个序列号'); return }
payload.snList = [...snList.value]
payload.qty = snList.value.length
}
@@ -288,18 +288,18 @@ onMounted(loadDicts)
</template>
<template v-else>
<el-form-item label="SN 录入" required>
<el-form-item label="序列号录入" required>
<div style="width:100%">
<el-input v-model="snInput" type="textarea" :rows="3"
placeholder="连续扫描 SN,支持 逗号/分号/顿号/空格/回车 分隔,一次可录入多条" />
placeholder="连续扫描序列号,支持 逗号/分号/顿号/空格/回车 分隔,一次可录入多条" />
<div style="margin-top:6px">
<el-button type="primary" plain :disabled="!snInput.trim()" @click="addSnLines">录入到列表</el-button>
<span style="margin-left:8px;color:#909399;font-size:12px">已录入 {{ snList.length }} 条</span>
</div>
<el-table :data="snList.map((v, i) => ({ i, v }))" size="small" border max-height="180"
empty-text="暂无 SN" style="margin-top:8px;width:100%">
empty-text="暂无序列号" style="margin-top:8px;width:100%">
<el-table-column type="index" label="#" width="56" align="center" />
<el-table-column prop="v" label="SN 序列号" min-width="200" />
<el-table-column prop="v" label="序列号" min-width="200" />
<el-table-column label="操作" width="90" align="center">
<template #default="{ row }"><el-button link type="danger" size="small" @click="removeSn(row.i)">移除</el-button></template>
</el-table-column>
@@ -12,11 +12,11 @@ const props = defineProps({
fixedType: { type: String, default: '' }
})
function typeLabel(v) { return ({ workorder: '备料', refill: '补料', general: '通用', project: '科技项目' })[v] || v || '-' }
function typeLabel(v) { return ({ workorder: '备料', refill: '补料', general: '通用', project: '科技项目' })[v] || '—' }
function typeTag(v) { return ({ workorder: 'primary', refill: 'danger', general: 'warning', project: 'success' })[v] || 'info' }
function categoryLabel(v) {
const m = { return: '退料', supplier_return: '退货', sample: '样品', scrap: '报废', deliver: '发货', other: '其他' }
return m[v] || (v || '-')
const m = { return: '退料', supplier_return: '退货', sample: '样品', scrap: '报废', deliver: '发货', other: '其他', call: '叫料配送' }
return m[v] || '—'
}
function locText(row) {
const parts = []
@@ -105,7 +105,7 @@ function openVoid(row) { voidRow.value = row; voidReason.value = ''; voidVisible
async function doVoid() {
try {
const res = await request.post('/outbound/void', { outboundNo: voidRow.value.outboundNo, reason: voidReason.value.trim() })
ElMessage.success(`已作废并回滚库存:批次回加 ${res?.restoredQty || 0} 件、SN 恢复 ${res?.restoredSN || 0} 条`)
ElMessage.success(`已作废并回滚库存:批次回加 ${res?.restoredQty || 0} 件、序列号恢复 ${res?.restoredSN || 0} 条`)
voidVisible.value = false
loadRecords()
} catch (e) { /* 拦截器已提示 */ }
@@ -122,6 +122,7 @@ onMounted(loadRecords)
<el-select v-model="recFilters.outboundType" clearable placeholder="全部" style="width:140px">
<el-option label="备料出库" value="workorder" />
<el-option label="工位补料" value="refill" />
<el-option label="叫料配送" value="call" />
<el-option label="通用出库" value="general" />
<el-option label="科技项目出库" value="project" />
</el-select>
@@ -186,7 +187,7 @@ onMounted(loadRecords)
<el-table-column label="库位" min-width="120" align="center">
<template #default="{ row }">{{ row.zoneCode ? row.zoneCode + ' ' + locText(row) : '-' }}</template>
</el-table-column>
<el-table-column label="SN" min-width="160">
<el-table-column label="序列号" min-width="160">
<template #default="{ row }">{{ row.snCodes || '-' }}</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" width="70" align="center" />
@@ -269,7 +270,7 @@ onMounted(loadRecords)
<!-- 出库作废弹窗:原因必填(留痕),库存按明细回滚 -->
<el-dialog v-model="voidVisible" title="作废出库单" width="440px" append-to-body>
<el-alert type="warning" :closable="false" style="margin-bottom:12px"
title="作废会按本单明细把库存原样回滚(SN 恢复在库、批次数量加回),单据保留显示「已作废」;仅通用/科技项目出库可作废,备料/补料出库请走退库冲正。" />
title="作废会按本单明细把库存原样回滚(序列号恢复在库、批次数量加回),单据保留显示「已作废」;仅通用/科技项目出库可作废,备料/补料出库请走退库冲正。" />
<div v-if="voidRow" style="margin-bottom:12px;color:#606266;font-size:13px">
{{ voidRow.outboundNo }} | {{ typeLabel(voidRow.outboundType) }} | {{ voidRow.materialCode }} × {{ voidRow.quantity }}
</div>
@@ -123,6 +123,8 @@ const menuGroups = [
{ path: '/general-outbound', title: '通用出库', icon: Upload, code: 'outbound:view' },
{ path: '/outbound', title: '全部出库记录', icon: List, code: 'outbound:view' },
{ path: '/call-queue', title: '叫料队列', icon: Bell, code: 'call:view' },
// 配送单(2026-11-05 拍板:叫料与送料拆开)
{ path: '/delivery', 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 日排产实时算)
+159 -1
View File
@@ -16,11 +16,19 @@
<el-form-item>
<el-button type="primary" @click="load">查询</el-button>
<el-button @click="resetFilters">重置</el-button>
<!-- 2026-11-05 拍板:WMS 代叫料(与工位终端同一套叫料包逻辑) -->
<el-button v-if="can('call:manage')" type="success" plain @click="openCallCreate">代叫料</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 label="叫料包" min-width="150" align="center">
<template #default="{row}">
<span v-if="row.packageNo" style="color:#409eff">{{ row.packageNo }}</span>
<span v-else style="color:#909399">单包</span>
</template>
</el-table-column>
<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 />
@@ -64,6 +72,13 @@
:loading="dispatchingNo === row.requestNo"
@click="dispatchAgv(row)"
>送货</el-button>
<!-- 2026-11-05 拍板:叫料与送料拆开——按包建配送单(一包可拆多张,可分批/部分送) -->
<el-button
v-if="can('call:manage') && row.status === 'SHIPPED'"
type="success"
size="small"
@click="openDelivery(row)"
>建配送单</el-button>
<el-button
v-if="can('call:manage') && row.status === 'SHIPPED'"
type="success"
@@ -96,6 +111,77 @@
<el-button type="warning" :loading="rejectingNo === rejectDlg.row?.requestNo" @click="doReject">确认驳回</el-button>
</template>
</el-dialog>
<!-- 建配送单(2026-11-05 拍板:一包可拆多张;默认送全部未送完,可改数量部分送;接驳台只能选空台) -->
<el-dialog v-model="deliveryDlg.visible" title="建配送单(按叫料包配送)" width="720px">
<el-alert type="info" :closable="false" style="margin-bottom:10px"
title="默认勾选本包全部未送完物料并预填剩余量,可改小做分批配送;一个包可建多张配送单。接驳台左右手必选、只能选空台(提交时校验传感器+台账)。" />
<el-form inline>
<el-form-item label="包号"><b>{{ deliveryDlg.pkg }}</b></el-form-item>
<el-form-item label="工位"><b>{{ deliveryDlg.stationNo }}</b></el-form-item>
<el-form-item label="配送接驳台">
<el-select v-model="deliveryDlg.targetDock" placeholder="左右手必选" style="width:160px">
<el-option v-for="d in deliveryDlg.docks" :key="d.dockCode || d.code"
:label="(d.name || d.label || d.dockCode || d.code) + (d.sideCn ? '(' + d.sideCn + ')' : '')"
:value="d.dockCode || d.code" />
</el-select>
</el-form-item>
<el-form-item label="操作人"><el-input v-model="deliveryDlg.operator" style="width:120px" /></el-form-item>
</el-form>
<el-table :data="deliveryDlg.rows" border size="small" empty-text="本包没有已发货待配送的物料">
<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 prop="sentQty" label="实发" width="70" align="center" />
<el-table-column prop="delivered" label="已配送" width="80" align="center" />
<el-table-column prop="remainQty" label="剩余可送" width="90" align="center" />
<el-table-column label="本次配送量" width="120" align="center">
<template #default="{row}">
<el-input-number v-model="row.sendQty" :min="0" :max="row.remainQty" size="small" />
</template>
</el-table-column>
</el-table>
<template #footer>
<el-button @click="deliveryDlg.visible = false">取消</el-button>
<el-button type="primary" :loading="deliveryDlg.submitting" @click="submitDelivery">创建配送单</el-button>
</template>
</el-dialog>
<!-- WMS 代叫料(2026-11-05 拍板:与工位终端同一套逻辑——一次提交=一个叫料包,两接驳台为空才能提交) -->
<el-dialog v-model="callDlg.visible" title="代叫料(WMS 仓库端)" width="680px">
<el-alert type="info" :closable="false" style="margin-bottom:10px"
title="与工位终端同一套叫料包逻辑:一次提交=一个叫料包;期望接驳台可空;提交时校验该工位两个接驳台都为空(传感器判断)。" />
<el-form inline>
<el-form-item label="工位">
<el-input-number v-model="callDlg.stationNo" :min="1" :max="20" @change="loadCallPool" />
</el-form-item>
<el-form-item label="叫料日">
<el-date-picker v-model="callDlg.callDate" type="date" value-format="YYYY-MM-DD" style="width:140px" />
</el-form-item>
<el-form-item label="操作人"><el-input v-model="callDlg.operator" style="width:100px" /></el-form-item>
<el-form-item>
<el-checkbox v-model="callDlg.force">PLC 离线强行提交</el-checkbox>
</el-form-item>
<el-form-item>
<el-button size="small" @click="loadCallPool">加载叫料池</el-button>
</el-form-item>
</el-form>
<el-table :data="callDlg.rows" border size="small" empty-text="请先加载叫料池(工位无排产则为空)" max-height="320">
<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 prop="availQty" label="可用量" width="80" align="center" />
<el-table-column label="叫料量" width="130" align="center">
<template #default="{row}">
<el-input-number v-model="row.callQty" :min="0" :max="row.availQty > 0 ? row.availQty : 0" size="small" />
</template>
</el-table-column>
</el-table>
<template #footer>
<el-button @click="callDlg.visible = false">取消</el-button>
<el-button type="primary" :loading="callDlg.submitting" @click="submitCallCreate">提交叫料</el-button>
</template>
</el-dialog>
</template>
<script setup>
@@ -151,7 +237,7 @@ async function doComplete(row) {
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?.short > 0) parts.push(`缺料:物料「${row.materialName || row.materialCode}(${row.materialCode})」缺少 ${res.short} 个(请求 ${row.reqQty}、实发 ${res?.sentQty ?? 0}),差额已自动释放,请补入库后再补叫`)
if (res?.agvNote) parts.push(res.agvNote)
ElMessage.success('已完成备料:' + parts.join(';'))
load()
@@ -222,4 +308,76 @@ async function doReject() {
}
onMounted(load)
/* ===================== 2026-11-05 拍板:配送单(一包可拆多张,默认送全部未送完,可分批/部分送) ===================== */
const deliveryDlg = reactive({ visible: false, pkg: '', stationNo: 0, targetDock: '', operator: '', rows: [], docks: [], submitting: false })
async function openDelivery(row) {
const pkg = row.packageNo || row.requestNo
deliveryDlg.pkg = pkg
deliveryDlg.stationNo = row.stationNo
deliveryDlg.targetDock = row.targetDock || ''
deliveryDlg.operator = ''
deliveryDlg.docks = []
deliveryDlg.visible = true
try {
const d = await request.get('/delivery/package', { params: { packageNo: pkg } })
deliveryDlg.rows = (d?.rows || []).map(r => ({ ...r, sendQty: r.remainQty > 0 ? r.remainQty : 0 }))
} catch { deliveryDlg.rows = [] }
// 接驳台候选(该工位左右两台;提交时后端校验只能选空台)
try {
const d2 = await request.get('/pallet/station-docks', { params: { stationNo: row.stationNo } })
deliveryDlg.docks = d2?.docks || d2?.list || d2 || []
} catch { deliveryDlg.docks = [] }
}
async function submitDelivery() {
if (!deliveryDlg.targetDock) { ElMessage.warning('请选择配送接驳台(左右手)'); return }
const items = deliveryDlg.rows.filter(r => Number(r.sendQty) > 0)
.map(r => ({ requestNo: r.requestNo, qty: Number(r.sendQty) }))
if (!items.length) { ElMessage.warning('请至少填写一行配送数量'); return }
deliveryDlg.submitting = true
try {
const d = await request.post('/delivery/create', {
packageNo: deliveryDlg.pkg, targetDock: deliveryDlg.targetDock,
operator: deliveryDlg.operator, items,
})
ElMessage.success(`配送单已创建:${d?.deliveryNo}(待配送;在「配送单」页派车)`)
deliveryDlg.visible = false
load()
} catch { /* 拦截器已提示 */ }
deliveryDlg.submitting = false
}
/* ===================== 2026-11-05 拍板:WMS 代叫料(与工位终端同一套叫料包逻辑) ===================== */
const callDlg = reactive({ visible: false, stationNo: 3, callDate: '', force: false, operator: '', rows: [], submitting: false })
function openCallCreate() {
callDlg.stationNo = 3
callDlg.callDate = new Date().toISOString().slice(0, 10)
callDlg.force = false
callDlg.operator = ''
callDlg.rows = []
callDlg.visible = true
}
async function loadCallPool() {
if (!callDlg.stationNo) return
try {
const d = await request.get('/call/pool-raw', { params: { stationNo: callDlg.stationNo } })
callDlg.rows = (d?.rows || []).map(r => ({ ...r, callQty: 0 }))
} catch { callDlg.rows = [] }
}
async function submitCallCreate() {
const items = callDlg.rows.filter(r => Number(r.callQty) > 0)
.map(r => ({ materialCode: r.materialCode, qty: Number(r.callQty), dock: '' }))
if (!items.length) { ElMessage.warning('请至少填写一行叫料数量'); return }
callDlg.submitting = true
try {
await request.post('/call/create', {
stationNo: callDlg.stationNo, callDate: callDlg.callDate,
force: callDlg.force, operator: callDlg.operator, items,
})
ElMessage.success('代叫料已提交(一次提交=一个叫料包)')
callDlg.visible = false
load()
} catch { /* 拦截器已提示(含两接驳台有托盘 / PLC 离线提示) */ }
callDlg.submitting = false
}
</script>
@@ -649,7 +649,7 @@ function fmtDay(unix) {
return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`
}
function statusText(s) {
return { success: '成功', failed: '失败', partial: '部分', cleanup: '清理完成', cleanup_forced: '强制清理' }[s] || s
return { success: '成功', failed: '失败', partial: '部分', cleanup: '清理完成', cleanup_forced: '强制清理' }[s] || '—'
}
function statusType(s) {
return { success: 'success', failed: 'danger', partial: 'warning', cleanup: 'warning', cleanup_forced: 'danger' }[s] || 'info'
@@ -0,0 +1,149 @@
<script setup>
// 配送单(2026-11-05 拍板):叫料与送料拆开——WMS 按叫料包建配送单,一包可拆多张;
// 一单=一次托盘配送(接驳台左右手必选、只能选空台)。列表可查历史,详情含
// 配送详情(物料×量×工位×工单×工艺×排产日)+ 关联出库单号 + AGV 状态。
import { onMounted, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import request from '../utils/request'
import { can } from '../utils/perm'
const query = reactive({ status: '', stationNo: '', packageNo: '' })
const rows = ref([])
const loading = ref(false)
const STATUS_TEXT = { PENDING: '待配送', DISPATCHED: '配送中', DONE: '已送达', CANCELLED: '已取消' }
const statusTag = (s) => ({ PENDING: 'info', DISPATCHED: 'warning', DONE: 'success', CANCELLED: 'danger' })[s] || 'info'
async function load() {
loading.value = true
try {
const d = await request.get('/delivery/list', { params: query })
rows.value = d?.list || []
} catch { /* 拦截器已提示 */ }
loading.value = false
}
function resetFilters() {
Object.assign(query, { status: '', stationNo: '', packageNo: '' })
load()
}
/* 详情:单头 + 配送详情 + 关联出库单号 */
const dlg = reactive({ visible: false, order: null, items: [], outboundNos: [] })
async function openDetail(row) {
try {
const d = await request.get('/delivery/detail', { params: { deliveryNo: row.deliveryNo } })
dlg.order = d?.order || null
dlg.items = d?.items || []
dlg.outboundNos = d?.outboundNos || []
dlg.visible = true
} catch { /* 拦截器已提示 */ }
}
/* 派车(AGV 派车改配送单驱动):空车前往装货点 → 到位待令 → 确认装车并送货 */
const dispatching = ref('')
async function doDispatch(row) {
try {
await ElMessageBox.confirm(
`确认对配送单「${row.deliveryNo}」派 AGV?\n\nAGV 空车前往库房装货点(到位待令)→ 请点「确认装车并送货」(目标接驳台 ${row.targetDock})→ 到工位后卸货放行,配送单自动置「已送达」。`,
'配送派车', { type: 'warning', confirmButtonText: '确认派车' })
} catch { return }
dispatching.value = row.deliveryNo
try {
await request.post('/delivery/dispatch', { deliveryNo: row.deliveryNo })
ElMessage.success('配送单已派车')
load()
} catch { /* 拦截器已提示 */ }
dispatching.value = ''
}
async function doCancel(row) {
try {
await ElMessageBox.confirm(`确认取消配送单「${row.deliveryNo}」?仅待配送可取消。`, '取消配送单', { type: 'warning', confirmButtonText: '确认取消' })
} catch { return }
try {
await request.post('/delivery/cancel', { deliveryNo: row.deliveryNo })
ElMessage.success('已取消')
load()
} catch { /* 拦截器已提示 */ }
}
onMounted(load)
</script>
<template>
<el-card>
<el-alert type="info" :closable="false" style="margin-bottom:12px"
title="配送单(2026-11-05 拍板):叫料与送料拆开——在「叫料队列」对已发货的叫料包点「建配送单」,一包可拆多张、可分批/部分送;本页派车与查历史。一单=一次托盘配送,配送接驳台左右手必选、只能选空台(传感器判断)。" />
<el-form inline @submit.prevent>
<el-form-item label="状态">
<el-select v-model="query.status" clearable placeholder="全部" style="width:120px">
<el-option v-for="(t, k) in STATUS_TEXT" :key="k" :label="t" :value="k" />
</el-select>
</el-form-item>
<el-form-item label="工位">
<el-input v-model="query.stationNo" clearable style="width:90px" @keyup.enter="load" />
</el-form-item>
<el-form-item label="包号">
<el-input v-model="query.packageNo" clearable style="width:190px" @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="rows" border size="small" v-loading="loading">
<el-table-column prop="deliveryNo" label="配送单号" min-width="170" />
<el-table-column prop="packageNo" label="叫料包" min-width="150" />
<el-table-column prop="stationNo" label="工位" width="70" align="center" />
<el-table-column prop="targetDock" label="配送接驳台" width="110" align="center" />
<el-table-column label="状态" width="90" align="center">
<template #default="{row}">
<el-tag :type="statusTag(row.status)" size="small">{{ STATUS_TEXT[row.status] || row.status }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="kinds" label="物料种数" width="90" align="center" />
<el-table-column prop="totalQty" label="总件数" width="90" align="center" />
<el-table-column prop="operator" label="操作人" width="90" align="center" />
<el-table-column label="创建时间" width="160" align="center">
<template #default="{row}">{{ row.createdAt ? new Date(row.createdAt).toLocaleString() : '—' }}</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center" fixed="right">
<template #default="{row}">
<el-button size="small" @click="openDetail(row)">详情</el-button>
<el-button v-if="can('call:manage') && row.status === 'PENDING'"
type="primary" size="small" :loading="dispatching === row.deliveryNo"
@click="doDispatch(row)">派车</el-button>
<el-button v-if="can('call:manage') && row.status === 'PENDING'"
type="danger" plain size="small" @click="doCancel(row)">取消</el-button>
</template>
</el-table-column>
</el-table>
<el-empty v-if="!loading && !rows.length" description="暂无配送单" :image-size="60" />
</el-card>
<el-dialog v-model="dlg.visible" title="配送单详情" width="760px">
<el-descriptions v-if="dlg.order" :column="3" border size="small">
<el-descriptions-item label="配送单号">{{ dlg.order.deliveryNo }}</el-descriptions-item>
<el-descriptions-item label="叫料包">{{ dlg.order.packageNo }}</el-descriptions-item>
<el-descriptions-item label="工位">{{ dlg.order.stationNo }}</el-descriptions-item>
<el-descriptions-item label="配送接驳台">{{ dlg.order.targetDock }}</el-descriptions-item>
<el-descriptions-item label="状态">{{ STATUS_TEXT[dlg.order.status] || dlg.order.status }}</el-descriptions-item>
<el-descriptions-item label="操作人">{{ dlg.order.operator || '—' }}</el-descriptions-item>
<el-descriptions-item label="关联出库单" :span="3">{{ dlg.outboundNos.join('、') || '—' }}</el-descriptions-item>
<el-descriptions-item label="备注" :span="3">{{ dlg.order.remark || '—' }}</el-descriptions-item>
</el-descriptions>
<el-table :data="dlg.items" border size="small" style="margin-top:10px" empty-text="无明细">
<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="qty" label="数量" width="70" align="center" />
<el-table-column prop="unit" label="单位" width="60" align="center" />
<el-table-column prop="stationNo" label="工位" width="60" align="center" />
<el-table-column prop="orderNo" label="工单" min-width="140" />
<el-table-column prop="flowName" label="工艺" min-width="110" />
<el-table-column prop="planDate" label="排产日" width="100" align="center" />
</el-table>
</el-dialog>
</template>
+2 -2
View File
@@ -127,14 +127,14 @@ const ENTITY_TYPES = [
function familyName(evt) {
const k = Object.keys(FAMILY_LABEL).find((p) => evt && evt.startsWith(p))
return k ? FAMILY_LABEL[k] : (evt || '-')
return k ? FAMILY_LABEL[k] : '其他事件'
}
function familyTag(evt) {
const k = Object.keys(FAMILY_TAG).find((p) => evt && evt.startsWith(p))
return (k && FAMILY_TAG[k]) || 'info'
}
function entityName(t) {
return (t && ENTITY_LABEL[t]) || t || '-'
return (t && ENTITY_LABEL[t]) || '其他'
}
// 对象标识兜底翻译:历史日志把动作名写进了对象标识(如 attachment.archive 的 entityId=archive)
function entityIdLabel(row) {
@@ -353,7 +353,7 @@ function changeDetailDrawerPage(p) {
const inboundTypeLabel = (t) => {
const m = { purchase: '采购入库', semi: '半成品入库', finished: '成品入库', return: '退库入库', other: '其他入库' }
return m[t] || t || '-'
return m[t] || '—'
}
// 与物料档案字段口径一致:类型(1结构件/2电气件/3其他) / 序列号(1是/2否/0未选择)
const matTypeText = (m) => (m === 3 ? '其他' : m === 2 ? '电气件' : '结构件')
@@ -487,10 +487,10 @@ const page = reactive({ current: 1, size: 20 })
function typeLabel(t) {
const m = { incoming: '来料检' }
return m[t] || t || '-'
return m[t] || '—'
}
function targetTypeLabel(t) {
return t === 'SN' ? 'SN' : t === 'BATCH' ? '批次' : t === 'OTHER' ? '其他' : (t || '-')
return t === 'SN' ? '序列号' : t === 'BATCH' ? '批次' : t === 'OTHER' ? '其他' : (t || '-')
}
function disposalLabel(t) {
const m = { RETURN: '退货', SCRAP: '报废', PARTIAL: '部分入库', REWORK: '换修' }
@@ -298,7 +298,7 @@ function openDetails(row) {
detailCond.positionNo = row.positionNo || ''
detailCond.qualityStatus = row.qualityStatus || ''
detailCond.snMode = row.snMode || ''
drawerTitle.value = `批次/SN 明细 · ${row.materialCode} ${row.materialName || ''}`
drawerTitle.value = `批次/序列号明细 · ${row.materialCode} ${row.materialName || ''}`
detailPage.current = 1
drawerVisible.value = true
loadDetails()
@@ -546,7 +546,7 @@ onMounted(() => {
<el-card v-if="viewTab === 'material'" shadow="never">
<template #header>
<div style="display:flex;align-items:center;justify-content:space-between">
<span>物料汇总(一物料一行:总数 + 质量分布 + 分布区域,点「详情」下钻批次/SN 明细)</span>
<span>物料汇总(一物料一行:总数 + 质量分布 + 分布区域,点「详情」下钻批次/序列号明细)</span>
<span style="font-size:12px;color:#f56c6c">红色 = 低于安全库存</span>
</div>
</template>
@@ -613,7 +613,7 @@ onMounted(() => {
</el-card>
<!-- ============ 视图二:库位明细 ============ -->
<el-card v-if="viewTab === 'detail'" shadow="never" header="库位明细(按 物料 × 库位(区域/货架/层/位置) 聚合,质量三列与批次/SN数降为列,点「详情」下钻批次/SN 明细)">
<el-card v-if="viewTab === 'detail'" shadow="never" header="库位明细(按 物料 × 库位(区域/货架/层/位置) 聚合,质量三列与批次/序列号数降为列,点「详情」下钻批次/序列号明细)">
<el-table :data="list" border size="small" v-loading="loading" empty-text="暂无库存数据"
row-key="id">
<el-table-column label="ID" prop="id" width="60" align="center" />
@@ -39,6 +39,8 @@
</el-tooltip>
<!-- R14(2026-11-03 拍板):托盘带余料时代发起退料(入口收敛到本页,免跳退库单页) -->
<el-button size="small" type="primary" plain @click="openManual(row)">代发起退料</el-button>
<!-- 2026-11-05 兜底:托盘被人工卸走(未走 AGV)台账卡死 → 人工清台(仅清台账不碰账) -->
<el-button size="small" type="danger" plain @click="clearDock(row)">人工清台</el-button>
</template>
<span v-else style="color:#999">-</span>
</template>
@@ -151,6 +153,21 @@ async function dispatchRecovery(row) {
dispatching.value = ''
}
// 2026-11-05 兜底:人工清台——托盘被人工卸走(未走 AGV)后台账 hasPallet 卡 true,
// 会卡住 JBT21 空位判定与防撞;仅清台账,物料账/库存不变。
async function clearDock(row) {
try {
const { value } = await ElMessageBox.prompt(
`确认把「${row.name}(${row.dockCode})」台账清为无托盘?\n\n适用:托盘已被人工卸走(未走 AGV);仅改台账,物料账与库存不变。可填原因留痕。`,
'人工清台', { inputPlaceholder: '原因(可空)', inputValue: '', confirmButtonText: '确认清台' })
await request.post('/pallet/clear', { dockCode: row.dockCode, reason: (value || '').trim() })
ElMessage.success('已清台')
load()
} catch (e) {
if (e !== 'cancel' && e?.message) { /* 拦截器已提示 */ }
}
}
/* ===================== R14:本页代发起退料(拍板 2026-11-03;2026-11-04 加损耗原因/运输方式/参考值) ===================== */
// G5 口径:代退料表单无理论量字段 → 损耗原因一律必填。
// 2026-11-04 定稿:运输方式必选(AGV=传感器自动派车;人工=无 AGV);余量参考值仅展示不阻断(G2)。
@@ -135,7 +135,7 @@ const summaryRows = computed(() => {
})
function statusLabel(s) {
return { PENDING: '未启用', CONFIRMED: '已启用', PROCESSING: '执行中' }[s] || s
return { PENDING: '未启用', CONFIRMED: '已启用', PROCESSING: '执行中' }[s] || '—'
}
async function load() {
@@ -235,7 +235,7 @@ function addSn() {
const sn = (dlg.snInput || '').trim()
if (!sn) return
if (dlg.snList.includes(sn)) {
ElMessage.warning('该 SN 已录入')
ElMessage.warning('该序列号已录入')
dlg.snInput = ''
return
}
@@ -256,7 +256,7 @@ async function submitConfirm() {
return
}
if (dlg.snMode === 1 && dlg.snList.length !== dlg.receiveQty) {
ElMessage.warning(`序列号=是(按 SN 记账)需逐个扫码,已扫 ${dlg.snList.length} 个,应等于实收数量 ${dlg.receiveQty}`)
ElMessage.warning(`序列号=是(按序列号记账)需逐个扫码,已扫 ${dlg.snList.length} 个,应等于实收数量 ${dlg.receiveQty}`)
return
}
// F(2026-11-04 定稿):实收<应退 → 损耗原因必填,差异就地落损耗台账
@@ -478,10 +478,10 @@ async function loadAllDocks() {
<!-- 序列号=是(按 SN 记账):SN 逐个扫码录入 -->
<template v-if="dlg.snMode === 1">
<el-form-item label="扫码录入 SN">
<el-form-item label="扫码录入序列号">
<div style="width:100%">
<div style="display:flex;gap:6px">
<el-input v-model="dlg.snInput" placeholder="扫描/输入 SN 后回车添加" clearable
<el-input v-model="dlg.snInput" placeholder="扫描/输入序列号后回车添加" clearable
style="flex:1" @keyup.enter="addSn" />
<el-button type="primary" @click="addSn">添加</el-button>
</div>
+9 -9
View File
@@ -59,7 +59,7 @@ async function submitInbound(cat) {
return
}
if (!snLists[cat].length) {
ElMessage.warning('请扫码录入 SN(回车追加)')
ElMessage.warning('请扫码录入序列号(回车追加)')
return
}
// 归属必选(与入库管理同口径,不再有「无」);选其他可不填编号,产品工号/科技项目号必须填编号
@@ -146,11 +146,11 @@ async function scanSn(cat) {
const data = await request.get('/semi/query', { params: { sn, category: cat, page: 1, pageSize: 5 } })
const hit = (data?.list || []).find((r) => r.sn === sn)
if (!hit) {
ElMessage.warning(`未找到该 SN 的半成品记录`)
ElMessage.warning(`未找到该序列号的半成品记录`)
return
}
if (hit.status !== '在库') {
ElMessage.warning(`该 SN 当前状态为「${hit.status}」,不可出库`)
ElMessage.warning(`该序列号当前状态为「${hit.status}」,不可出库`)
return
}
f.info = hit
@@ -162,7 +162,7 @@ async function submitOutbound(cat) {
const label = '半成品'
const sn = f.sn.trim()
if (!sn) {
ElMessage.warning('请扫描或输入 SN')
ElMessage.warning('请扫描或输入序列号')
return
}
if (!f.reason) {
@@ -286,15 +286,15 @@ onMounted(() => {
</el-form-item>
<el-form-item label="扫码录入">
<el-input v-model="snInputs[2]" type="textarea" :rows="3" autofocus
placeholder="连续扫描 SN,每次回车追加(可一次多条,空白分隔)"
placeholder="连续扫描序列号,每次回车追加(可一次多条,空白分隔)"
@keydown.enter.prevent="addSnLines(2)" />
</el-form-item>
</el-form>
<div style="margin-bottom:8px">待入库 SN:<b>{{ snLists[2].length }}</b> 条</div>
<div style="margin-bottom:8px">待入库序列号:<b>{{ snLists[2].length }}</b> 条</div>
<el-table :data="snLists[2].map((v, i) => ({ i, v }))" size="small" border max-height="220"
empty-text="暂无 SN" style="max-width:760px">
empty-text="暂无序列号" style="max-width:760px">
<el-table-column type="index" label="#" width="56" align="center" />
<el-table-column prop="v" label="SN 序列号" min-width="220" />
<el-table-column prop="v" label="序列号" min-width="220" />
<el-table-column label="操作" width="90" align="center">
<template #default="{ row }">
<el-button link type="danger" size="small" @click="removeSn(2, row.i)">移除</el-button>
@@ -311,7 +311,7 @@ onMounted(() => {
<el-tab-pane label="半成品出库">
<el-form label-width="110px" style="max-width:680px" @submit.prevent>
<el-form-item label="SN">
<el-input v-model="outForms[2].sn" placeholder="扫描或输入 SN,回车带出信息" clearable autofocus
<el-input v-model="outForms[2].sn" placeholder="扫描或输入序列号,回车带出信息" clearable autofocus
@keyup.enter="scanSn(2)" />
</el-form-item>
</el-form>
@@ -119,7 +119,7 @@ async function submitRecord() {
}
const targetId = recordForm.targetId.trim()
if (!targetId) {
ElMessage.warning('请扫入批次号(序列号=否)或 SN 序列号(序列号=是)')
ElMessage.warning('请扫入批次号(序列号=否)或序列号(序列号=是)')
return
}
const qty = Number(recordForm.scanQty)
@@ -150,7 +150,7 @@ async function submitRecord() {
if (hit >= 0) records.value.splice(hit, 1, row)
else { records.value.unshift(row); active.counted++ }
ElMessage.success(
`已记录 ${row.targetId}(${isSn ? 'SN 自动记 1' : '批次'}):账面 ${row.bookQty},实盘 ${row.scannedQty},差异 ${row.diffQty}`
`已记录 ${row.targetId}(${isSn ? '序列号自动记 1' : '批次'}):账面 ${row.bookQty},实盘 ${row.scannedQty},差异 ${row.diffQty}`
)
recordForm.targetId = ''
recordForm.scanQty = 1
@@ -386,7 +386,7 @@ const currentStep = computed(() => {
扫 <b>SN(电气件)</b> 自动记实盘数 = 1,无需填写数量;扫 <b>批次号(结构件)</b> 才需填「实盘数量」。
</p>
<el-table :data="records" border size="small" max-height="300" empty-text="尚无扫码记录">
<el-table-column prop="targetId" label="批次号 / SN 序列号" min-width="170" />
<el-table-column prop="targetId" label="批次号 / 序列号" min-width="170" />
<el-table-column label="类型" width="80" align="center">
<template #default="{ row }">{{ row.targetType === 'SN' ? 'SN' : '批次' }}</template>
</el-table-column>
@@ -437,7 +437,7 @@ const currentStep = computed(() => {
style="margin-bottom:10px" />
<el-table :data="finishResult.diffs || []" border size="small"
empty-text="无差异,账实相符">
<el-table-column prop="targetId" label="批次号 / SN 序列号" min-width="190" />
<el-table-column prop="targetId" label="批次号 / 序列号" min-width="190" />
<el-table-column label="货位" min-width="150">
<template #default="{ row }">{{ locText(row) }}</template>
</el-table-column>
@@ -16,6 +16,8 @@ const routes = [
{ path: 'general-outbound', name: 'GeneralOutbound', component: () => import('../pages/GeneralOutbound.vue'), meta: { title: '通用出库', keepAlive: true, componentName: 'GeneralOutbound' } },
{ 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' } },
// 配送单(2026-11-05 拍板:叫料与送料拆开——按包建单、可分批送、派车与历史)
{ path: 'delivery', name: 'DeliveryOrders', component: () => import('../pages/DeliveryOrders.vue'), meta: { title: '配送单', keepAlive: true, componentName: 'DeliveryOrders' } },
{ 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 用户拍板):备料清单——只读(无备料完成按钮、不管库存、无历史)