按模块说明
一、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:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user