按模块说明

一、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
+14 -1
View File
@@ -84,9 +84,22 @@ export const callPool = (params) => request.get('/api/call/pool', { params })
// 接驳台列表(本工位 左L/右R 下拉用)
export const listDocks = (params) => request.get('/api/docks', { params })
// 发起叫料:{stationNo, items:[{materialCode, qty, dock?}]} → 按物料行拆 N 张单(占用池子可用量)
// 发起叫料:{stationNo, callDate?, force?, items:[{materialCode, qty, dock?}]}
// 2026-11-05 叫料包拍板:一次提交=一个叫料包;期望接驳台可空;两接驳台为空才能提交(force=PLC 离线强提)
export const callCreate = (data) => request.post('/api/call/create', data)
// 叫料需求明细(工单×排产日)+「当日剩余没叫/跨日量明细」两类提示(实时计算不落库不拦提交)
export const callPlanDetail = (params) => request.get('/api/call/plan-detail', { params })
// 左右接驳台实时传感器(叫料空台校验/下班校验共用;plcOk=false 为台账回退值)
export const stationDockPallets = (params) => request.get('/api/dock/station-pallets', { params })
// 托盘回库(物理拉回仓库,非退料:物料账与库存不变;传感器为准、台账软校验)
export const palletReturn = (data) => request.post('/api/dock/pallet-return', data)
// 工位物料明细(工艺物料全集 左连接 工位账四数,量为0也显示、不分左右托盘)
export const materialDetail = (params) => request.get('/api/call/material-detail', { params })
// 叫料单列表(本工位):{stationNo, status, materialCode, requestNo, source}
export const callList = (params) => request.get('/api/call/list', { params })
@@ -156,7 +156,7 @@ import {
helpPdf,
helpWorkstation
} from '../help'
import { stationLogout, getStationAlerts, listDocks, returnReference } from '../api'
import { stationLogout, getStationAlerts, listDocks, returnReference, stationDockPallets } from '../api'
import { speak, setSpeechMuted } from '../utils/speech'
import request, { clearAuth } from '../utils/request'
import {
@@ -399,6 +399,23 @@ async function offDuty() {
if (!docks.value.length) {
try { docks.value = (await listDocks({ stationNo: stationNo.value }))?.list || [] } catch { /* 忽略 */ }
}
// 2026-11-05 下班校验(传感器判断):左右托盘都不在才允许直接下班;有托盘 → 引导「托盘回库」
//(物料不做清算、只拉回仓库暂存,物料继续挂本工位,下一个人登录仍可见);PLC 离线提示后可继续
try {
const ds = await stationDockPallets({ stationNo: stationNo.value })
const list = Array.isArray(ds) ? ds : []
const occupied = list.filter((d) => d.hasPallet)
const plcBad = list.length > 0 && list.every((d) => !d.plcOk)
if (occupied.length && !plcBad) {
ElMessage.warning('接驳台有托盘(' + occupied.map((d) => d.name || d.dockCode).join('、') + '):请先到「物料 / 叫料」页点「托盘回库」拉走(不用退料),或走退料流程')
return
}
if (plcBad) {
try {
await ElMessageBox.confirm('PLC 离线,无法确认接驳台托盘是否已拉走。确认继续下班?', 'PLC 离线', { type: 'warning', confirmButtonText: '继续' })
} catch { return }
}
} catch { /* 读取失败不拦,仍走人工自检流程 */ }
let hasLeftover = false
try {
await ElMessageBox.confirm(
@@ -70,10 +70,10 @@
</el-collapse-item>
<!-- 4. 完工确认 -->
<el-collapse-item name="done" title="④ 完工确认(扫 SN)">
<el-collapse-item name="done" title="④ 完工确认(扫序列号)">
<el-form label-width="84px" size="large">
<el-form-item label="工件 SN">
<el-input v-model="done.sn" placeholder="扫描或输入工件 SN" />
<el-form-item label="工件序列号">
<el-input v-model="done.sn" placeholder="扫描或输入工件序列号" />
</el-form-item>
<el-form-item label="现场拍照">
<PhotoField v-model="done.photo" />
@@ -82,7 +82,7 @@
<el-input v-model="done.remark" type="textarea" :rows="2" />
</el-form-item>
<el-alert v-if="!canReport" type="warning" :closable="false" title="本工位步骤未全部完成 / 物料未齐套,暂不能完工确认" />
<el-button type="success" size="large" :disabled="!canReport" @click="submitDone">确认该SN已完成生产</el-button>
<el-button type="success" size="large" :disabled="!canReport" @click="submitDone">确认该序列号已完成生产</el-button>
</el-form>
</el-collapse-item>
@@ -145,7 +145,7 @@
<el-form-item label="单位">
<el-input v-model="ret.unit" />
</el-form-item>
<el-form-item label="工件 SN">
<el-form-item label="工件序列号">
<el-input v-model="ret.sn" placeholder="可空" />
</el-form-item>
<el-form-item label="接驳台(必选)">
@@ -289,12 +289,12 @@ async function submitDone() {
}
const sn = done.value.sn || snState.value
if (!sn) {
ElMessage.warning('请先扫描或输入工件 SN')
ElMessage.warning('请先扫描或输入工件序列号')
return
}
try {
// 二次确认弹窗:客户要求文案「确认该SN已完成生产」
await ElMessageBox.confirm(`确认该SN已完成生产?(SN:${sn})`, '完工确认', {
// 二次确认弹窗:客户要求文案「确认该序列号已完成生产」
await ElMessageBox.confirm(`确认该序列号已完成生产?(序列号:${sn})`, '完工确认', {
type: 'warning', confirmButtonText: '确认完成', cancelButtonText: '取消'
})
} catch { return }
@@ -13,7 +13,7 @@
<el-tag v-else type="info" size="large">本工位未配置需绑物料</el-tag>
</div>
<el-empty v-if="!sn" description="请先在「作业」页扫描工件SN" :image-size="70" />
<el-empty v-if="!sn" description="请先在「作业」页扫描工件序列号" :image-size="70" />
<el-empty v-else-if="!required.length" description="该工件在本工位无需绑定物料" :image-size="70" />
<div v-for="r in required" :key="r.materialCode" class="bind-item">
@@ -21,7 +21,7 @@
<span class="bind-name">{{ r.materialName || r.materialCode }}</span>
<span class="bind-code">{{ r.materialCode }}</span>
<el-tag size="small" :type="r.snMode === 1 ? 'primary' : 'warning'">
{{ r.snMode === 1 ? '序列号=是·扫码SN' : '序列号=否·批次' }}
{{ r.snMode === 1 ? '序列号=是·扫码序列号' : '序列号=否·批次' }}
</el-tag>
<span class="bind-count" :class="r.complete ? 'ok' : 'ng'">{{ r.boundCount }}/{{ r.need }}</span>
</div>
@@ -39,7 +39,7 @@
<el-input
v-model.trim="bindInputs[r.materialCode]"
size="large"
:placeholder="r.snMode === 1 ? '扫描序列号=是的SN(必扫)' : '扫描/输入批次号'"
:placeholder="r.snMode === 1 ? '扫描序列号=是的序列号(必扫)' : '扫描/输入批次号'"
clearable
@keyup.enter="doBind(r)"
/>
@@ -48,41 +48,84 @@
</div>
</section>
<!-- ② 叫料(从叫料池发起:一行一物料一量一接驳台=一单一托盘) -->
<!-- ② 工位物料明细(2026-11-05 拍板:比叫料列表更突出——工艺物料全集×工位账四数,
量为 0 也显示、不分左右托盘;底层池 工位×物料 聚合记账不动,两层并存) -->
<section class="card">
<div class="card-title">
叫料(送到本工位接驳台)
本工位物料明细
<span class="card-sub">当前工艺全部物料 + 工位账四数;量为 0 也显示,不分左右托盘</span>
<el-button size="small" @click="loadMaterialDetail">刷新</el-button>
</div>
<el-table :data="matDetail" border size="small" class="call-table" v-loading="matLoading"
max-height="300" empty-text="本工位暂无绑定工艺或无物料(排产未启用)">
<el-table-column prop="materialCode" label="图号" min-width="110" />
<el-table-column prop="materialName" label="物料名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="flowName" label="工艺" min-width="100" show-overflow-tooltip />
<el-table-column prop="unit" label="单位" width="55" align="center" />
<el-table-column label="需求" width="70" align="center">
<template #default="{row}">{{ fmtQty(row.reqQty + row.adjQty) }}</template>
</el-table-column>
<el-table-column label="已发" width="70" align="center">
<template #default="{row}">{{ fmtQty(row.sentQty) }}</template>
</el-table-column>
<el-table-column label="可用" width="70" align="center">
<template #default="{row}">
<span :class="row.availQty > 0 ? 'ok' : 'ng'" style="font-weight:700">{{ fmtQty(row.availQty) }}</span>
</template>
</el-table-column>
</el-table>
</section>
<!-- ③ 叫料(2026-11-05 叫料包拍板:一次提交=一个叫料包——默认当天、默认全部物料(可勾选分批)、
期望接驳台一包选一次可空;两个接驳台都为空才能提交;当日没叫全/跨日量提示明细但不拦提交) -->
<section class="card">
<div class="card-title">
叫料(一次提交=一个叫料包)
<el-button size="small" @click="loadPool">刷新池子</el-button>
<el-button size="small" type="warning" plain @click="doPalletReturn">托盘回库</el-button>
</div>
<el-alert v-if="crossDayWarn" type="warning" :closable="false" show-icon style="margin-bottom:10px"
title="叫料池含非今日排产的料(跨日叫料):工位端预警提示;仓库可正常发,也可按「非当日」驳回。" />
<el-alert v-if="todayRemainText" type="warning" :closable="false" show-icon style="margin-bottom:8px" :title="todayRemainText" />
<el-alert v-if="crossDayRemainText" type="info" :closable="false" show-icon style="margin-bottom:8px" :title="crossDayRemainText" />
<el-alert v-if="hasBorrow" type="warning" :closable="false" show-icon style="margin-bottom:10px"
title="部分物料将【跨工位借料】发出:本工位不足的部分会从同工序其他工位的剩余额度借出(由您手动分配,借出工位可用量相应扣减)。请确认无误后再提交。" />
<div class="call-row" style="flex-wrap:wrap">
<span class="lab">叫料日:</span>
<el-date-picker v-model="callDate" type="date" value-format="YYYY-MM-DD" :clearable="false" size="large" style="width:150px" />
<span class="lab" style="margin-left:16px">期望接驳台(可空):</span>
<el-select v-model="expectedDock" size="large" clearable placeholder="配送时仓库可改" style="width:200px">
<el-option v-for="d in dockOptions" :key="d.value" :label="d.label" :value="d.value" />
</el-select>
</div>
<el-table :data="pool" border size="large" class="call-table" v-loading="poolLoading" empty-text="本工位暂无叫料池(排产未启用或工艺无物料)">
<el-table-column label="图号" prop="materialCode" min-width="120" />
<el-table-column label="物料名称" prop="materialName" min-width="130" show-overflow-tooltip />
<el-table-column label="单位" prop="unit" width="60" align="center" />
<el-table-column label="序列号方式" width="105" align="center">
<template #default="{row}">{{ row.snMode === 1 ? '序列号=是' : '序列号=否' }}</template>
<el-table-column width="50" align="center">
<template #default="{row}">
<el-checkbox v-model="row.checked" />
</template>
</el-table-column>
<el-table-column label="需求" width="80" align="center">
<el-table-column label="图号" prop="materialCode" min-width="110" />
<el-table-column label="物料名称" prop="materialName" min-width="130" show-overflow-tooltip />
<el-table-column label="单位" prop="unit" width="55" align="center" />
<el-table-column label="需求" width="75" align="center">
<template #default="{row}">{{ fmtQty(row.reqQty + row.adjQty) }}</template>
</el-table-column>
<el-table-column label="已发" width="80" align="center">
<el-table-column label="已发" width="75" align="center">
<template #default="{row}">{{ fmtQty(row.sentQty) }}</template>
</el-table-column>
<el-table-column label="占用中" width="90" align="center">
<el-table-column label="占用中" width="80" align="center">
<template #default="{row}">{{ fmtQty(row.reservedQty) }}</template>
</el-table-column>
<el-table-column label="可用/可借" width="120" align="center">
<el-table-column label="可用/可借" width="115" align="center">
<template #default="{row}">
<span :class="row.availQty > 0 ? 'ok' : 'ng'" style="font-weight:700">{{ fmtQty(row.availQty) }}</span>
<el-tag v-if="row.crossDay" type="warning" size="small" style="margin-left:6px">非当日</el-tag>
<div v-if="Number(row.borrowAvail) > 0" style="font-size:12px;color:#909399;margin-top:2px">可借 {{ fmtQty(row.borrowAvail) }}</div>
</template>
</el-table-column>
<el-table-column label="叫料量 / 借料" width="320" align="center">
<el-table-column label="叫料量 / 借料" min-width="240" align="center">
<template #default="{row}">
<el-input-number v-model="row.callQty" size="large" :min="0" :max="Number(row.availQty)" :precision="0" controls-position="right" />
<!-- 严格收口:仅当本工位可用额度为 0(完全没料)才出现「无料」提示与借料入口;availQty>0 绝不出现 -->
@@ -109,22 +152,15 @@
</div>
</template>
</el-table-column>
<el-table-column label="目标接驳台" width="150" align="center">
<template #default="{row}">
<el-select v-model="row.dock" size="large" placeholder="选接驳台" clearable>
<el-option v-for="d in dockOptions" :key="d.value" :label="d.label" :value="d.value" />
</el-select>
</template>
</el-table-column>
</el-table>
<div class="call-foot">
<el-button type="primary" size="large" class="big-btn" :loading="calling" :disabled="!canCall" @click="doCall">提交叫料</el-button>
<span class="block-tip" v-if="!canCall">填「叫料量」并选「目标接驳台」后可提交(量不超过本工位可用+同工序可借)</span>
<span class="block-tip" v-if="!canCall">勾选物料并填「叫料量」后可提交(默认全选;两接驳台须为空)</span>
</div>
</section>
<!-- ③ 我的叫料单(签收/退库/取消) -->
<!-- ④ 我的叫料单(签收/退库/取消) -->
<section class="card">
<div class="card-title">
我的叫料单
@@ -141,7 +177,7 @@
<el-table-column prop="requestNo" label="叫料单号" min-width="175" />
<el-table-column prop="materialCode" label="图号" min-width="110" />
<el-table-column prop="materialName" label="物料名称" min-width="120" show-overflow-tooltip />
<el-table-column label="接驳台" width="140" align="center">
<el-table-column label="期望接驳台" width="130" align="center">
<template #default="{row}">{{ dockCn(row.targetDock) }}</template>
</el-table-column>
<el-table-column label="请求/实发" width="120" align="center">
@@ -164,13 +200,34 @@
</el-table-column>
</el-table>
</section>
<!-- 托盘回库对话框(选接驳台;传感器/台账不一致时可勾选确认留痕) -->
<el-dialog v-model="prDlg.visible" title="托盘回库" width="500px">
<el-alert type="info" :closable="false" show-icon style="margin-bottom:10px"
title="物理拉回仓库,不是退料:物料账仍挂本工位、库存不变、托盘按空托盘处理(盘上有无料都不管)。下班走本功能即可不用退料,下一个人登录仍能看到这些物料。" />
<el-form label-width="110px">
<el-form-item label="接驳台">
<el-select v-model="prDlg.dock" style="width:220px">
<el-option v-for="d in dockOptions" :key="d.value" :label="d.label" :value="d.value" />
</el-select>
</el-form-item>
<el-form-item label=" ">
<el-checkbox v-model="prDlg.confirm">确认台上有托盘(传感器显示无托盘但台账有托盘时勾选,操作留痕)</el-checkbox>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="prDlg.visible = false">取消</el-button>
<el-button type="warning" :loading="prDlg.busy" @click="submitPalletReturn">确认回库</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { computed, ref, onMounted } from 'vue'
import { computed, ref, reactive, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { bindRecord, bindRemove, callPool, callCreate, callList, callSign, callCancel, callReturn, listDocks } from '../../api'
import { bindRecord, bindRemove, callPool, callCreate, callList, callSign, callCancel, callReturn, listDocks,
callPlanDetail, stationDockPallets, palletReturn, materialDetail } from '../../api'
import {
bindInputs,
flowId,
@@ -187,19 +244,52 @@ const bindPanel = computed(() => state.bindPanel)
const required = computed(() => (bindPanel.value?.required || []))
const binding = ref(false)
// ② 叫料池
// ② 工位物料明细(量为0也显示、不分左右托盘)
const matDetail = ref([])
const matLoading = ref(false)
async function loadMaterialDetail() {
matLoading.value = true
try {
const rows = await materialDetail({ stationNo: stationNo.value })
matDetail.value = Array.isArray(rows) ? rows : []
} catch { matDetail.value = [] }
matLoading.value = false
}
// ③ 叫料池(叫料包:一次提交=一包)
const pool = ref([])
const poolLoading = ref(false)
const calling = ref(false)
const dockOptions = ref([])
const callDate = ref(new Date().toISOString().slice(0, 10))
const expectedDock = ref('')
const planDetail = ref(null)
const crossDayWarn = computed(() => pool.value.some((r) => r.crossDay))
const hasBorrow = computed(() =>
pool.value.some((r) => borrowSum(r) > 0)
)
const canCall = computed(() =>
pool.value.some((r) => Number(r.callQty) > 0 && r.dock)
pool.value.some((r) => r.checked !== false && (Number(r.callQty) > 0 || borrowSum(r) > 0))
)
// 两类提示(实时计算不落库不拦提交):当日剩余没叫 / 跨日量明细
const todayRemainText = computed(() => {
const rows = planDetail.value?.todayRemain || []
if (!rows.length) return ''
return '今日排产还有没叫完的:' + rows.map((r) => `${r.materialCode} 缺 ${r.remainQty}`).join('、')
})
const crossDayRemainText = computed(() => {
const rows = planDetail.value?.crossDayRemain || []
if (!rows.length) return ''
return '跨日排产未叫量:' + rows.map((r) => `${r.planDate} ${r.materialCode} 缺 ${r.remainQty}`).join('、')
})
async function loadPlanDetail() {
try {
planDetail.value = await callPlanDetail({ stationNo: stationNo.value })
} catch { planDetail.value = null }
}
function fmtQty(v) {
const n = Number(v || 0)
return Number.isInteger(n) ? String(n) : n.toFixed(2)
@@ -228,13 +318,13 @@ async function loadPool() {
try {
const rows = await callPool({ stationNo: stationNo.value })
const list = Array.isArray(rows) ? rows : []
// 每行:默认叫料量 0、接驳台默认本工位配置(yaml Station.Dock)
// 2026-11-05 拍板:默认全部勾选、叫料量预填可用量(可改小=分批叫);期望接驳台一包选一次(可空)
pool.value = list.map((r) => ({
...r,
callQty: 0,
checked: true,
callQty: Math.max(Number(r.availQty) || 0, 0),
borrow: {},
borrowOpen: false,
dock: stationDock.value || ''
borrowOpen: false
}))
} catch {
pool.value = []
@@ -260,25 +350,44 @@ async function loadDocks() {
}
}
// 提交叫料:按行拆单(每行=物料+量+接驳台=一单)
// 提交叫料(2026-11-05 叫料包拍板):一次提交=一个叫料包;提交前校验两接驳台为空
// (传感器判断,PLC 离线降级=提示后可强行提交);期望接驳台一包一个(可空)
async function doCall() {
// 借料:叫料量 = 本工位自取 + 借料(借料不默认、不替人决定,由各候选工位手动填);总量上限由各 input 的 max 兜底
const items = pool.value
.filter((r) => (Number(r.callQty) > 0 || borrowSum(r) > 0) && r.dock)
.filter((r) => r.checked !== false && (Number(r.callQty) > 0 || borrowSum(r) > 0))
.map((r) => {
const borrow = {}
for (const [k, v] of Object.entries(r.borrow || {})) {
if (Number(v) > 0) borrow[k] = Number(v)
}
const qty = Number(r.callQty) + borrowSum(r)
const item = { materialCode: r.materialCode, qty, dock: r.dock }
const item = { materialCode: r.materialCode, qty }
if (expectedDock.value) item.dock = expectedDock.value
if (Object.keys(borrow).length) item.borrow = borrow
return item
})
if (!items.length) {
ElMessage.warning('请填写本工位叫料量(或借料量)并选择目标接驳台')
ElMessage.warning('请勾选物料并填写叫料量(或借料量)')
return
}
// 两个接驳台都为空才能叫料(传感器判断;PLC 离线降级=提示后可强行提交)
let force = false
try {
const docks = await stationDockPallets({ stationNo: stationNo.value })
const list = Array.isArray(docks) ? docks : []
const occupied = list.filter((d) => d.hasPallet)
const plcBad = list.length > 0 && list.every((d) => !d.plcOk)
if (occupied.length && !plcBad) {
ElMessage.error('本工位接驳台有托盘(' + occupied.map((d) => d.name || d.dockCode).join('、') + '),请先退料或点「托盘回库」拉走后再叫料')
return
}
if (plcBad) {
try {
await ElMessageBox.confirm('PLC 离线,无法确认两个接驳台是否为空。确认强行提交叫料?', 'PLC 离线', { type: 'warning', confirmButtonText: '强行提交' })
force = true
} catch { return }
}
} catch { /* 读取失败不拦(后端仍有校验) */ }
// 跨工位借料:明确确认(提示清楚即可,避免误操作,也免改排产)
if (hasBorrow.value) {
try {
@@ -293,15 +402,34 @@ async function doCall() {
}
calling.value = true
try {
const res = await callCreate({ stationNo: stationNo.value, items })
ElMessage.success(`叫料已提交:${res?.count ?? items.length} 项(仓库完成备料后 AGV 配送)`)
await Promise.all([loadPool(), loadList()])
const res = await callCreate({ stationNo: stationNo.value, callDate: callDate.value, force, items })
ElMessage.success(`叫料已提交:${res?.count ?? items.length} 项(一次提交=一个叫料包;仓库备料后在「配送单」派送)`)
await Promise.all([loadPool(), loadList(), loadPlanDetail(), loadMaterialDetail()])
} catch {
// 拦截器已提示(如:可用量不足/不允许跨日叫料)
// 拦截器已提示(如:可用量不足/不允许跨日叫料/接驳台有托盘)
}
calling.value = false
}
// 托盘回库(2026-11-05 拍板):物理拉回仓库 JBT21,不是退料——物料账仍挂工位、库存不变,
// 托盘按空托盘处理(盘上有无料都不管);下班走托盘回库即可不退料。
const prDlg = reactive({ visible: false, dock: '', confirm: false, busy: false })
function doPalletReturn() {
prDlg.dock = dockOptions.value[0]?.value || ''
prDlg.confirm = false
prDlg.visible = true
}
async function submitPalletReturn() {
if (!prDlg.dock) { ElMessage.warning('请选择接驳台'); return }
prDlg.busy = true
try {
await palletReturn({ dockCode: prDlg.dock, confirmHasPallet: prDlg.confirm })
ElMessage.success('托盘回库已派车(物理拉回仓库,非退料;物料账与库存不变,下一个人登录仍能看到这些物料)')
prDlg.visible = false
} catch { /* 拦截器已提示(含传感器/台账不一致确认) */ }
prDlg.busy = false
}
// ③ 我的叫料单
const list = ref([])
const listLoading = ref(false)
@@ -315,7 +443,7 @@ const STATUS_TAG = {
PENDING: 'warning', SHIPPED: 'primary', DONE: 'success', CANCELLED: 'info',
REJECTED: 'danger', RETURNING: 'warning', RETURNED: 'info'
}
const statusText = (s) => STATUS_TEXT[s] || s || '—'
const statusText = (s) => STATUS_TEXT[s] || '—'
const statusTag = (s) => STATUS_TAG[s] || 'info'
async function loadList() {
@@ -367,11 +495,11 @@ async function doReturn(row) {
async function doBind(r) {
const v = (bindInputs.value[r.materialCode] || '').trim()
if (!v) {
ElMessage.warning('请先扫描/输入' + (r.snMode === 1 ? '序列号=是的SN' : '批次号'))
ElMessage.warning('请先扫描/输入' + (r.snMode === 1 ? '序列号=是的序列号' : '批次号'))
return
}
if (!sn.value) {
ElMessage.warning('请先扫描工件SN')
ElMessage.warning('请先扫描工件序列号')
return
}
binding.value = true
@@ -407,13 +535,18 @@ onMounted(() => {
loadPool()
loadList()
loadDocks()
loadPlanDetail()
loadMaterialDetail()
if (stationDock.value && !expectedDock.value) expectedDock.value = stationDock.value
})
</script>
<style scoped>
/* 2026-11-05 布局修复:auto-fit 自适应 + 卡片可收缩——表格超宽时出内部横向滚动条,
不再把「叫料量/可用」等右侧列挤出屏幕 */
.mat-panel {
display: grid;
grid-template-columns: 1fr 1fr;
grid-template-columns: repeat(auto-fit, minmax(560px, 1fr));
gap: 12px;
align-content: start;
}
@@ -422,6 +555,12 @@ onMounted(() => {
border-radius: 10px;
padding: 14px 16px;
box-shadow: 0 1px 6px rgba(0, 21, 41, 0.08);
min-width: 0;
}
.card-sub {
font-size: 12px;
font-weight: 400;
color: #909399;
}
.card-title {
font-size: 18px;
@@ -4,19 +4,19 @@
<section class="card">
<div class="card-title">下线完工</div>
<div class="form-row">
<span class="lab">工件 SN</span>
<span class="lab">工件序列号</span>
<el-input
v-model.trim="snInput"
size="large"
class="grow"
placeholder="扫描或输入工件 SN"
placeholder="扫描或输入工件序列号"
clearable
@keyup.enter="onQuery"
/>
<el-button type="primary" size="large" :loading="loading" @click="onQuery">查询完工状态</el-button>
</div>
<el-empty v-if="!trace" description="请扫描工件 SN 查看完工状态与终检结果" :image-size="80" />
<el-empty v-if="!trace" description="请扫描工件序列号 查看完工状态与终检结果" :image-size="80" />
<template v-else>
<div class="stat-grid">
@@ -93,7 +93,7 @@
</div>
<el-empty v-if="!wip.length" description="暂无末端待取件工件" :image-size="70" />
<el-table v-else :data="wip" border size="large" max-height="420" @row-click="pickWip">
<el-table-column prop="sn" label="工件 SN" min-width="160" />
<el-table-column prop="sn" label="工件序列号" min-width="160" />
<el-table-column prop="orderNo" label="工单号" min-width="140" />
<el-table-column prop="productName" label="产品" min-width="140" show-overflow-tooltip />
<el-table-column label="进度" width="110" align="center">
@@ -188,7 +188,7 @@ const stepNgCount = computed(() => stepData.value.filter((s) => s.isOK === false
const canFinish = computed(() => !!snInput.value && !!trace.value && !!pointNo.value && workpiece.value.status !== 'DONE')
const blockTip = computed(() => {
if (!snInput.value) return '请先扫描工件 SN'
if (!snInput.value) return '请先扫描工件序列号'
if (!trace.value) return '请先查询该工件的完工状态'
if (!pointNo.value) return '请选择下料位置(两个末端下料检测位都被占用时请联系班长协调)'
if (workpiece.value.status === 'DONE') return '该工件已完工入库'
@@ -206,13 +206,13 @@ function fmt(v) {
}
function wpStatusText(s) {
// DONE=完工(与 MES 工件六态口径统一,2026-10-19)
return { ONLINE: '已上线', PROCESSING: '在制', DONE: '完工' }[s] || s || '-'
return { ONLINE: '已上线', PROCESSING: '在制', DONE: '完工' }[s] || '—'
}
function wpStatusType(s) {
return { ONLINE: 'info', PROCESSING: 'primary', DONE: 'success' }[s] || 'info'
}
function wipStatusText(s) {
return { ONLINE: '已上线', PROCESSING: '在制' }[s] || s || '-'
return { ONLINE: '已上线', PROCESSING: '在制' }[s] || '—'
}
function wipStatusType(s) {
return { ONLINE: 'info', PROCESSING: 'primary' }[s] || 'info'
@@ -221,7 +221,7 @@ function wipStatusType(s) {
async function onQuery() {
const v = snInput.value.trim()
if (!v) {
ElMessage.warning('请先扫描或输入工件 SN')
ElMessage.warning('请先扫描或输入工件序列号')
return
}
loading.value = true
@@ -18,7 +18,7 @@
</div>
<div class="form-row">
<span class="lab">工件 SN</span>
<span class="lab">工件序列号</span>
<el-input
v-model.trim="form.sn"
size="large"
@@ -49,13 +49,10 @@
/>
</section>
<!-- ② 领料确认:按物料清单展示应领料,核对确认 -->
<!-- ② 领料确认:按物料清单展示应领料 -->
<section class="card">
<div class="card-title">
领料确认(按物料清单核对)
<el-tag size="large" effect="dark" :type="form.materialChecked ? 'success' : 'warning'">
{{ form.materialChecked ? '已核对' : '未核对' }}
</el-tag>
</div>
<el-empty v-if="!form.orderNo" description="请先选择工单" :image-size="70" />
@@ -81,9 +78,6 @@
<template #default="{ row }">{{ row.processCode || '-' }}</template>
</el-table-column>
</el-table>
<el-checkbox v-model="form.materialChecked" size="large" border style="margin-top:12px">
我已按物料清单核对本次上线应领料,确认无误
</el-checkbox>
</template>
</section>
@@ -96,7 +90,7 @@
</div>
<el-empty v-if="!onlineWip.length" description="暂无待流转工件" :image-size="60" />
<el-table v-else :data="onlineWip" border size="large" max-height="300">
<el-table-column prop="sn" label="工件 SN" min-width="160" />
<el-table-column prop="sn" label="工件序列号" min-width="160" />
<el-table-column prop="orderNo" label="工单号" min-width="140" />
<el-table-column label="状态" width="110" align="center">
<template #default="{ row }">
@@ -134,7 +128,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import { getBom, mismatchCheck, onlineRegister, queryOrder } from '../../api'
import { loadPoints, loadWipScope, operatorName, state, wip } from '../../store/station'
const form = reactive({ orderNo: '', sn: '', materialChecked: false, pointNo: '' })
const form = reactive({ orderNo: '', sn: '', pointNo: '' })
const product = reactive({ code: '', name: '', workOrderId: 0, snMode: 0 })
const bomItems = ref([])
const orders = ref([])
@@ -142,17 +136,17 @@ const loadingOrder = ref(false)
const submitting = ref(false)
// SN 口径按产品型号/物料档案「序列号(是/否)」分流(2026-09-30 解耦定稿,2026-10-19 术语统一):
// 1=序列号=是:SN 输入必填,扫已在 WMS 入库登记的来料SN,工件 SN=来料SN(不自动发号);
// 1=序列号=是:SN 输入必填,扫已在 WMS 入库登记的来料序列号,工件序列号=来料序列号(不自动发号);
// 2=序列号=否:提交后系统自动发号(提交时若未填则本地自动生成);
// 0=未选择:不可建档,提示先去产品型号/物料档案选择「序列号(是/否)」。
const snPlaceholder = computed(() => {
if (product.snMode === 1) return '请扫描来料SN(已在WMS入库登记)'
if (product.snMode === 1) return '请扫描来料序列号(已在WMS入库登记)'
if (product.snMode === 2) return '提交后系统自动发号'
return '请先在产品型号/物料档案选择「序列号(是/否)」'
})
const snTip = computed(() => {
if (product.snMode === 1) return '该产品为「序列号=是」:请扫描来料SN(需已在 WMS 入库登记),建档后工件 SN = 来料SN,不再自动发号。'
if (product.snMode === 2) return '该产品为「序列号=否」:提交后系统自动发号,全程可追溯;成品 SN 与工件 SN 一致。'
if (product.snMode === 1) return '该产品为「序列号=是」:请扫描来料序列号(需已在 WMS 入库登记),建档后工件序列号 = 来料序列号,不再自动发号。'
if (product.snMode === 2) return '该产品为「序列号=否」:提交后系统自动发号,全程可追溯;成品 SN 与工件序列号 一致。'
return '该产品未选择「序列号(是/否)」:请先在 MES 产品型号/物料档案设置,否则无法建档上线。'
})
@@ -216,20 +210,18 @@ const canSubmit = computed(
!!form.orderNo &&
!!form.pointNo &&
product.snMode !== 0 &&
(product.snMode === 2 || !!form.sn) &&
(!bomItems.value.length || form.materialChecked)
(product.snMode === 2 || !!form.sn)
)
const blockTip = computed(() => {
if (!form.orderNo) return '请先选择工单号'
if (!form.pointNo) return '请选择工件当前位置(无空闲点位时请联系班长协调)'
if (product.snMode === 0) return '请先在产品型号/物料档案选择「序列号(是/否)」'
if (product.snMode === 1 && !form.sn) return '请扫描来料SN(已在WMS入库登记)'
if (bomItems.value.length && !form.materialChecked) return '请勾选「已按物料清单核对领料」'
if (product.snMode === 1 && !form.sn) return '请扫描来料序列号(已在WMS入库登记)'
return ''
})
function wipStatusText(s) {
return { ONLINE: '已上线', PROCESSING: '在制' }[s] || s || '-'
return { ONLINE: '已上线', PROCESSING: '在制' }[s] || '—'
}
function wipStatusType(s) {
return { ONLINE: 'info', PROCESSING: 'primary' }[s] || 'info'
@@ -251,7 +243,6 @@ async function onOrderChange(orderNo) {
product.workOrderId = 0
product.snMode = 0
bomItems.value = []
form.materialChecked = false
form.sn = ''
if (!orderNo) return
const opt = orderOptions.value.find((o) => o.value === orderNo)
@@ -288,7 +279,7 @@ async function onSubmit() {
ElMessage.warning(blockTip.value || '当前不满足建档条件')
return
}
// 序列号=否:提交时兜底自动发号(序列号=是必须扫来料SN,不自动生成)
// 序列号=否:提交时兜底自动发号(序列号=是必须扫来料序列号,不自动生成)
if (product.snMode === 2 && !form.sn) genSn()
try {
await ElMessageBox.confirm(
@@ -316,7 +307,6 @@ async function onSubmit() {
if (data && data.hasMismatch) showMismatch(data)
}
form.sn = ''
form.materialChecked = false
// 建档后该点位已被占用:回填下一个默认空闲位
form.pointNo = defaultStartPointNo()
loadWipScope('pending')
@@ -9,7 +9,7 @@
<el-table-column label="类型" width="100" align="center">
<template #default="{ row }">{{ kindLabel(row.kind) }}</template>
</el-table-column>
<el-table-column label="工件SN" width="170" show-overflow-tooltip>
<el-table-column label="工件序列号" width="170" show-overflow-tooltip>
<template #default="{ row }">{{ brief(row).sn }}</template>
</el-table-column>
<el-table-column label="工单" min-width="140" show-overflow-tooltip>
@@ -39,7 +39,7 @@
<el-table-column label="类型" width="100" align="center">
<template #default="{ row }">{{ kindLabel(row.kind) }}</template>
</el-table-column>
<el-table-column label="工件SN" width="150" show-overflow-tooltip>
<el-table-column label="工件序列号" width="150" show-overflow-tooltip>
<template #default="{ row }">{{ brief(row).sn }}</template>
</el-table-column>
<el-table-column label="工单" min-width="130" show-overflow-tooltip>
@@ -97,7 +97,7 @@ const KIND_LABEL = {
online_register: '上线建档',
offline_finish: '下线完工'
}
function kindLabel(k) { return KIND_LABEL[k] || k }
function kindLabel(k) { return KIND_LABEL[k] || '—' }
// 解析 payload(JSON 字符串),取出展示字段
function brief(row) {
@@ -26,7 +26,7 @@
v-model.trim="scanInput"
size="large"
class="scan-input"
placeholder="扫描或输入工件SN"
placeholder="扫描或输入工件序列号"
clearable
@keyup.enter="onScan"
/>
@@ -363,7 +363,7 @@ const stepSummaryType = computed(() => (missingSteps.value.length ? 'warning' :
const blockTip = computed(() => {
if (paused.value) return '已停止接单' + (state.pauseReason ? ':' + state.pauseReason : '') + ',恢复接单后才能报工'
if (!sn.value) return '请先扫描工件 SN'
if (!sn.value) return '请先扫描工件序列号'
if (!orderNo.value) return '请选择工单号'
if (!flowId.value) return '本工位未绑定工艺流程,无法报工'
if (bindBlocking.value) return '装配物料未绑齐:' + (state.bindPanel?.missing || '缺料')
@@ -470,7 +470,7 @@ async function onScan() {
async function onTakeIn() {
const v = (scanInput.value || '').trim() || sn.value
if (!v) {
ElMessage.warning('请先扫描或输入工件SN')
ElMessage.warning('请先扫描或输入工件序列号')
focusScan()
return
}
@@ -674,7 +674,7 @@ async function onProcessDone() {
async function onTempStore() {
if (!sn.value) {
ElMessage.warning('请先扫描工件 SN')
ElMessage.warning('请先扫描工件序列号')
return
}
try {
@@ -707,7 +707,7 @@ async function onTempStore() {
// 与「暂存退库」互斥:退库=合法暂停可重上线,报废=永久退出不可恢复。不做离线排队(防重复误报)。
async function onScrap() {
if (!sn.value) {
ElMessage.warning('请先扫描工件 SN')
ElMessage.warning('请先扫描工件序列号')
return
}
let reason
@@ -737,7 +737,7 @@ async function onScrap() {
/* ---------- 5.2 在制品:点击某工件 → 继续该工件的工艺步骤填报 ---------- */
function wipStatusText(s) {
return { ONLINE: '已上线', PROCESSING: '在制' }[s] || s || '-'
return { ONLINE: '已上线', PROCESSING: '在制' }[s] || '—'
}
function wipStatusType(s) {
return { ONLINE: 'info', PROCESSING: 'primary' }[s] || 'info'