feat: AGV三段链安全机制、补料/损耗/下班闭环、接驳台左右互换
AGV 调度: - 任务重构为 GO_LOAD/TRANSPORT/EMPTY_RETURN/FREE 三段链,到位即停(ARRIVED)需人工确认装卸 - 自由调度单点步进,每段强制弹"请确保路径畅通无杂物";托盘回收独立工作台 - 接驳台 PLC 传感器检测到托盘即自动卸货放行,传感器故障由人工按钮兜底(无轮询) - 车辆状态只读展示(海康3.1.7 queryAgvStatus),调度仍由 RCS 负责 物料闭环: - 补料管理(SHORTAGE):工位申请 + 主管审批调增叫料池额度,与借料/差异补发三轨并行 - 损耗台账(loss_ledger):退料实际 < 理论必填原因、后审核,工单不记损耗 - 退料强制指定左/右接驳台,WMS 库管可代工位退料 下班闭环: - 工位终端自检接驳台剩余物料后下班;库管收货 + 托盘拉走后事件驱动自动结班 - 退出登录未下班仅作安全提示(不强制拦截、不新增责任审批) 接驳台左右按操作员朝向建模(dock.side 字段),废除"奇左偶右"隐式约定; 看板标签 / seed / 迁移补丁 / 布局文档统一为中文左/右。 产线布局说明:C1 前线头 AGV 点、C15 后线尾 AGV 点、外部 O1/O2/O3 散点, 清理修订痕迹为最终态描述。
This commit is contained in:
@@ -124,6 +124,7 @@ const menuGroups = [
|
||||
{ path: '/outbound', title: '全部出库记录', icon: List, code: 'outbound:view' },
|
||||
{ path: '/call-queue', title: '叫料队列', icon: Bell, code: 'call:view' },
|
||||
{ path: '/return-order', title: '退库确认', icon: RefreshLeft, code: 'return:view' },
|
||||
{ path: '/pallet-workbench', title: '托盘工作台', icon: Box, code: 'return:view' },
|
||||
{ path: '/production-return', title: '生产退不良', icon: WarningFilled, code: 'prodreturn:manage' }
|
||||
]
|
||||
},
|
||||
|
||||
@@ -57,6 +57,13 @@
|
||||
:loading="completingNo === row.requestNo"
|
||||
@click="doComplete(row)"
|
||||
>完成备料</el-button>
|
||||
<el-button
|
||||
v-if="can('call:manage') && row.status === 'SHIPPED'"
|
||||
type="success"
|
||||
size="small"
|
||||
:loading="loadingLoad === row.requestNo"
|
||||
@click="confirmLoad(row)"
|
||||
>确认装车并送货</el-button>
|
||||
<el-button
|
||||
v-if="can('call:manage')"
|
||||
type="warning"
|
||||
@@ -147,6 +154,24 @@ async function doComplete(row) {
|
||||
completingNo.value = ''
|
||||
}
|
||||
|
||||
// 确认装车并送货(2026-11-03 三层机制·装卸强制确认):AGV 空车已到位待令(ARRIVED),
|
||||
// 库管把托盘装上 AGV 后点此按钮 → MES 生成重载运输段发往工位接驳台。
|
||||
const loadingLoad = ref('')
|
||||
async function confirmLoad(row) {
|
||||
if (!row?.requestNo) return
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认已将「${row.requestNo}」的托盘装上 AGV?\n\nAGV 将从仓库接驳台出发送至工位 ${row.stationNo};到达后进入「到位待令」,由工位确认卸货放行。`,
|
||||
'确认装车并送货', { type: 'warning', confirmButtonText: '确认装车' })
|
||||
} catch { return }
|
||||
loadingLoad.value = row.requestNo
|
||||
try {
|
||||
await request.post('/call/confirm-load', { requestNo: row.requestNo })
|
||||
ElMessage.success('已确认装车,AGV 出发送货')
|
||||
} catch { /* 拦截器已提示 */ }
|
||||
loadingLoad.value = ''
|
||||
}
|
||||
|
||||
function openReject(row) {
|
||||
rejectDlg.row = row
|
||||
rejectDlg.reason = row?.crossDay ? '非当日排产' : ''
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<h3>托盘工作台</h3>
|
||||
<el-alert type="info" :closable="false" show-icon
|
||||
title="库管托盘回收闭环:工位接驳台「有托盘」的行 = 待处理(库管可先确认现场状况,再派 AGV 回收空托盘,或到「退库单」页代工位退料)。派车为业务自动触发(空车前往工位接驳台免弹窗);AGV 到位后进「到位待令」,在 MES AGV 配送页点「确认装车并送货」才拉走——防止库管不知现场状况被误拖。" />
|
||||
<el-button class="mt" :loading="loading" @click="load">刷新接驳台台账</el-button>
|
||||
</el-card>
|
||||
<el-card class="mt">
|
||||
<el-table :data="rows" border v-loading="loading">
|
||||
<el-table-column prop="dockCode" label="接驳台" width="110" />
|
||||
<el-table-column prop="name" label="名称" min-width="180" show-overflow-tooltip />
|
||||
<el-table-column prop="stationNo" label="工位" width="70" align="center">
|
||||
<template #default="{ row }">{{ row.stationNo || '库房' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="左右" width="70" align="center">
|
||||
<template #default="{ row }"><el-tag size="small" effect="plain">{{ row.sideCn }}</el-tag></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="托盘" width="110" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.hasPallet ? 'warning' : 'success'" size="small">{{ row.hasPallet ? '有托盘' : '空闲' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="palletRef" label="托盘关联" width="150" show-overflow-tooltip />
|
||||
<el-table-column label="状态" width="90" align="center">
|
||||
<template #default="{ row }">{{ row.status === 'DISABLED' ? '已停用' : '启用' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="170" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button v-if="row.hasPallet && row.dockType === 'line'" size="small" type="warning" :loading="dispatching === row.dockCode"
|
||||
@click="dispatchRecovery(row)">派 AGV 回收</el-button>
|
||||
<span v-else style="color:#999">-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
|
||||
defineOptions({ name: 'PalletWorkbench' })
|
||||
|
||||
const rows = ref([])
|
||||
const loading = ref(false)
|
||||
const dispatching = ref('')
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try {
|
||||
const d = await request.get('/pallet/docks')
|
||||
rows.value = d?.list || []
|
||||
} finally { loading.value = false }
|
||||
}
|
||||
|
||||
async function dispatchRecovery(row) {
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认派 AGV 前往 ${row.name} 回收托盘?\n\n流程:AGV 空车前往(免确认)→ 到位后停住(到位待令)→ 请在 MES「AGV 配送」页点「确认装车并送货」→ 送回库房接驳台 → 确认卸货。`,
|
||||
'派 AGV 回收托盘', { type: 'warning', confirmButtonText: '确认派车' })
|
||||
} catch { return }
|
||||
dispatching.value = row.dockCode
|
||||
try {
|
||||
await request.post('/pallet/dispatch', { dockCode: row.dockCode })
|
||||
ElMessage.success('已派车,AGV 前往中')
|
||||
load()
|
||||
} catch { /* 拦截器已提示 */ }
|
||||
dispatching.value = ''
|
||||
}
|
||||
|
||||
load()
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.mt { margin-top: 12px; }
|
||||
</style>
|
||||
@@ -9,6 +9,7 @@ import PageHelp from '../components/PageHelp.vue'
|
||||
import { helpReturnOrder } from '../help'
|
||||
|
||||
const statusFilter = ref('PENDING')
|
||||
const orderNoFilter = ref('')
|
||||
const loading = ref(false)
|
||||
const rows = ref([])
|
||||
const total = ref(0)
|
||||
@@ -16,12 +17,56 @@ const page = reactive({ current: 1, size: 20 })
|
||||
|
||||
const canConfirm = can('return:confirm')
|
||||
|
||||
// 退料接驳台中文(左/右按操作员朝向,side 由 MES dock 主数据下发)
|
||||
const allDocks = ref([])
|
||||
const dockCnMap = computed(() => {
|
||||
const m = {}
|
||||
allDocks.value.forEach((d) => { m[d.dockCode] = d.label || d.dockCode })
|
||||
return m
|
||||
})
|
||||
function dockSideCn(code) {
|
||||
if (!code) return code
|
||||
return dockCnMap.value[code] || code
|
||||
}
|
||||
|
||||
/* ===================== 库管代工位退料(2026-11-03 拍板) ===================== */
|
||||
const manual = reactive({ visible: false, submitting: false, stationNo: 1, orderNo: '', materialCode: '', materialName: '', unit: '个', qty: 1, returnDock: '', reason: '' })
|
||||
const stationDocks = ref([])
|
||||
function openManual() {
|
||||
manual.visible = true
|
||||
manual.stationNo = 1; manual.orderNo = ''; manual.materialCode = ''; manual.materialName = ''
|
||||
manual.unit = '个'; manual.qty = 1; manual.returnDock = ''; manual.reason = ''
|
||||
stationDocks.value = []
|
||||
}
|
||||
async function loadStationDocks() {
|
||||
if (!manual.stationNo) return
|
||||
try {
|
||||
const d = await request.get('/pallet/station-docks', { params: { stationNo: manual.stationNo } })
|
||||
stationDocks.value = d?.docks || []
|
||||
manual.returnDock = stationDocks.value[0]?.code || ''
|
||||
} catch { stationDocks.value = [] }
|
||||
}
|
||||
async function submitManual() {
|
||||
if (!manual.materialCode || manual.qty <= 0 || !manual.returnDock || !manual.reason) {
|
||||
ElMessage.warning('图号、数量、退料接驳台、原因均必填')
|
||||
return
|
||||
}
|
||||
manual.submitting = true
|
||||
try {
|
||||
await request.post('/return-order/manual', { ...manual, visible: undefined, submitting: undefined })
|
||||
ElMessage.success('代退料已提交,待确认收货')
|
||||
manual.visible = false
|
||||
load()
|
||||
} finally { manual.submitting = false }
|
||||
}
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await request.get('/return-order/query', {
|
||||
params: {
|
||||
status: statusFilter.value || undefined,
|
||||
orderNo: orderNoFilter.value.trim() || undefined,
|
||||
page: page.current,
|
||||
pageSize: page.size
|
||||
}
|
||||
@@ -159,7 +204,13 @@ async function submitConfirm() {
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(load)
|
||||
onMounted(() => { load(); loadAllDocks() })
|
||||
async function loadAllDocks() {
|
||||
try {
|
||||
const d = await request.get('/pallet/docks')
|
||||
allDocks.value = d?.list || []
|
||||
} catch { allDocks.value = [] }
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -172,9 +223,13 @@ onMounted(load)
|
||||
<el-option label="已收货" value="RECEIVED" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="关联工单号">
|
||||
<el-input v-model="orderNoFilter" placeholder="按工单号筛选" clearable style="width:180px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="loading" @click="search">查询</el-button>
|
||||
<el-button @click="resetFilters">重置</el-button>
|
||||
<el-button v-if="canConfirm" type="warning" @click="openManual">代工位退料</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
@@ -185,12 +240,21 @@ onMounted(load)
|
||||
</template>
|
||||
<el-table :data="rows" border v-loading="loading" empty-text="暂无退库单">
|
||||
<el-table-column prop="returnNo" label="退库单号" min-width="170" />
|
||||
<el-table-column prop="orderNo" label="产品工号" min-width="130">
|
||||
<template #default="{ row }">{{ row.orderNo || '-' }}</template>
|
||||
<el-table-column prop="orderNo" label="关联工单号" min-width="150">
|
||||
<template #default="{ row }">
|
||||
<el-tag v-if="row.orderNo" type="primary" effect="plain">{{ row.orderNo }}</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="stationNo" label="退库工位" width="90" align="center">
|
||||
<template #default="{ row }">工位{{ row.stationNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="returnDock" label="退料接驳台" width="120" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag v-if="row.returnDock" type="warning" effect="plain">{{ dockSideCn(row.returnDock) }}</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="sn" label="产品序列号" min-width="140">
|
||||
<template #default="{ row }">{{ row.sn || '-' }}</template>
|
||||
</el-table-column>
|
||||
@@ -324,6 +388,31 @@ onMounted(load)
|
||||
<el-button type="primary" :loading="dlg.submitting" @click="submitConfirm">确认收货</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<!-- 库管代工位退料:替操作工建退库单(选工位/工单/物料/数量/接驳台/原因) -->
|
||||
<el-dialog v-model="manual.visible" title="代工位退料" width="560px" :close-on-click-modal="false">
|
||||
<el-alert type="info" :closable="false" show-icon class="mb12"
|
||||
title="库管可替操作工发起退料(现场清理/托盘带料回收)。退料接驳台必选——AGV 将从该接驳台拉货。" />
|
||||
<el-form label-width="110px">
|
||||
<el-form-item label="工位号"><el-input-number v-model="manual.stationNo" :min="1" :max="99" @change="loadStationDocks" /></el-form-item>
|
||||
<el-form-item label="产品工号"><el-input v-model="manual.orderNo" placeholder="可空" /></el-form-item>
|
||||
<el-form-item label="图号(必填)"><el-input v-model="manual.materialCode" /></el-form-item>
|
||||
<el-form-item label="物料名称"><el-input v-model="manual.materialName" /></el-form-item>
|
||||
<el-form-item label="数量 / 单位">
|
||||
<el-input-number v-model="manual.qty" :min="1" />
|
||||
<el-input v-model="manual.unit" style="width:80px;margin-left:8px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="退料接驳台">
|
||||
<el-select v-model="manual.returnDock" placeholder="先填工位号自动带出左/右" style="width:100%">
|
||||
<el-option v-for="d in stationDocks" :key="d.code" :label="d.label" :value="d.code" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="退库原因(必填)"><el-input v-model="manual.reason" /></el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="manual.visible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="manual.submitting" @click="submitManual">提交退料</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
<PageHelp :data="helpReturnOrder" page="ReturnOrder" />
|
||||
</template>
|
||||
|
||||
@@ -17,6 +17,7 @@ const routes = [
|
||||
{ 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: 'pallet-workbench', name: 'PalletWorkbench', component: () => import('../pages/PalletWorkbench.vue'), meta: { title: '托盘工作台', keepAlive: true, componentName: 'PalletWorkbench' } },
|
||||
{ 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' } },
|
||||
|
||||
Reference in New Issue
Block a user