- 操作列按6条标准统一(WMS 13页/MES 18页):fixed right、宽160超限折更多、一列一填充、危险操作link+二次确认置末、页面级新建移工具栏 - 修复MES物料档案启用报错:改走 POST /product-types/status 专用端点,不再被全字段必填校验拦截 - 附件归档清理由按年改为用户选月(精确到月,截止月最晚6个月前,默认当前月-6),前后端同步 - 序列号文案统一为「是=逐件录SN,否=按数量(不录SN)」,MES 下拉改单选框 - 入库货架/层/位置必填校验(InboundEntry 前端 + inbound.go 后端),杜绝有区域无货架的新脏数据 - 生产流程卡新增列表Tab(新接口 GET /process-card/list 分页),去掉筛选默认时间 - 清理遗留 assets_bak/public_bak 备份目录;更新 WMS/MES 前端构建产物(index.html)
311 lines
15 KiB
Vue
311 lines
15 KiB
Vue
<script setup>
|
||
defineOptions({ name: 'Agv' })
|
||
import { computed, onMounted, reactive, ref } from 'vue'
|
||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||
import request from '../utils/request'
|
||
import { getRealName } from '../utils/auth'
|
||
import { fmtTime } from '../utils/format'
|
||
import { can } from '../utils/perm'
|
||
import PageHelp from '../components/PageHelp.vue'
|
||
import { helpAgv } from '../help'
|
||
|
||
const activeTab = ref('docks') // docks=接驳台状态 / tasks=AGV任务 / dispatch=下发AGV
|
||
const operator = getRealName()
|
||
|
||
/* ===================== 接驳台状态 ===================== */
|
||
const docks = ref([])
|
||
const loadingDocks = ref(false)
|
||
async function loadDocks() {
|
||
loadingDocks.value = true
|
||
try {
|
||
const data = await request.get('/agv/docks')
|
||
docks.value = (data?.list || []).sort((a, b) => String(a.dockCode).localeCompare(String(b.dockCode)))
|
||
} catch { docks.value = [] }
|
||
loadingDocks.value = false
|
||
}
|
||
|
||
/* ===================== AGV 任务列表 ===================== */
|
||
const tasks = ref([])
|
||
const taskTotal = ref(0)
|
||
const taskPage = reactive({ current: 1, size: 20 })
|
||
const taskQuery = reactive({ status: '' })
|
||
const loadingTasks = ref(false)
|
||
const statusOptions = [
|
||
{ v: 'PENDING', l: '待下发' }, { v: 'DISPATCHED', l: '待搬运' },
|
||
{ v: 'DELIVERING', l: '搬运中' }, { v: 'DONE', l: '已到位' },
|
||
{ v: 'FAILED', l: '下发失败' }, { v: 'CANCELLED', l: '已取消' }
|
||
]
|
||
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || s
|
||
const statusTag = (s) =>
|
||
s === 'DONE' ? 'success' : s === 'FAILED' || s === 'CANCELLED' ? 'info' : s === 'DELIVERING' ? 'warning' : s === 'DISPATCHED' ? 'primary' : ''
|
||
|
||
async function loadTasks() {
|
||
loadingTasks.value = true
|
||
try {
|
||
const data = await request.get('/agv/tasks', { params: { ...taskQuery, page: taskPage.current, pageSize: taskPage.size } })
|
||
tasks.value = data?.list || []
|
||
taskTotal.value = data?.total || 0
|
||
} catch { tasks.value = [] }
|
||
loadingTasks.value = false
|
||
}
|
||
|
||
/* ===================== 下发 AGV(仓管操作) ===================== */
|
||
const mrs = ref([])
|
||
const mrTotal = ref(0)
|
||
const mrPage = reactive({ current: 1, size: 20 })
|
||
const mrQuery = reactive({ status: 'PENDING' })
|
||
const loadingMrs = ref(false)
|
||
const selected = ref([])
|
||
|
||
// DOCK 选项:DOCK01~20 产线 + DOCK21 库房
|
||
const dockOptions = Array.from({ length: 21 }, (_, i) => 'DOCK' + String(i + 1).padStart(2, '0'))
|
||
const sourceDock = ref('DOCK21')
|
||
|
||
async function loadMrs() {
|
||
loadingMrs.value = true
|
||
try {
|
||
const data = await request.get('/agv/materials', { params: { ...mrQuery, page: mrPage.current, pageSize: mrPage.size } })
|
||
mrs.value = data?.list || []
|
||
mrTotal.value = data?.total || 0
|
||
} catch { mrs.value = [] }
|
||
loadingMrs.value = false
|
||
}
|
||
|
||
// 行级改 DOCK
|
||
function changeDock(row, v) {
|
||
row.targetDock = v
|
||
}
|
||
// 批量设同值
|
||
async function batchSetDock(v) {
|
||
if (!selected.value.length) return ElMessage.warning('请先勾选待发料行')
|
||
selected.value.forEach((r) => (r.targetDock = v))
|
||
ElMessage.success(`已批量设为 ${v}`)
|
||
}
|
||
|
||
// 按 targetDock 分组统计(下发确认弹窗展示)
|
||
const groupPreview = computed(() => {
|
||
const g = {}
|
||
for (const r of selected.value) {
|
||
const d = r.targetDock || '未指定'
|
||
g[d] = (g[d] || 0) + 1
|
||
}
|
||
return Object.entries(g).map(([dock, n]) => ({ dock, n }))
|
||
})
|
||
|
||
async function submitAgv() {
|
||
const rows = selected.value.filter((r) => r.targetDock)
|
||
if (!rows.length) return ElMessage.warning('请至少选择一行且指定目标接驳台')
|
||
const lines = groupPreview.value.map((g) => `· ${g.dock}:${g.n} 行`).join('\n')
|
||
await ElMessageBox.confirm(
|
||
`确认下发 ${rows.length} 行待发料给 AGV?\n\n按目标接驳台分组:\n${lines}\n\n源点:${sourceDock.value}\n操作人:${operator}`,
|
||
'确认下发 AGV',
|
||
{ type: 'warning', confirmButtonText: '确认下发', cancelButtonText: '取消' }
|
||
)
|
||
const res = await request.post('/agv/submit', { rows, sourceDock: sourceDock.value })
|
||
ElMessage.success(`已创建 ${res?.created || 0} 个 AGV 任务`)
|
||
selected.value = []
|
||
mrQuery.status = 'PENDING'
|
||
mrPage.current = 1
|
||
loadMrs(); loadTasks(); loadDocks()
|
||
}
|
||
|
||
// 刷新任务状态(轮询 RCS)
|
||
const refreshing = ref(false)
|
||
async function refreshTasks() {
|
||
refreshing.value = true
|
||
try {
|
||
const res = await request.post('/agv/refresh')
|
||
if (res?.changed > 0) {
|
||
ElMessage.success(`${res.changed} 个任务状态已更新`)
|
||
loadTasks(); loadDocks()
|
||
}
|
||
} catch { /* 忽略 */ }
|
||
refreshing.value = false
|
||
}
|
||
|
||
// 表格行多选保留
|
||
function onSelectionChange(sel) { selected.value = sel }
|
||
function rowKey(row) { return row.requestNo + '-' + row.materialCode + '-' + row.planDate }
|
||
|
||
/* ===================== 取消任务 / 对接模式 ===================== */
|
||
const agvMode = reactive({ mock: false, tip: '' })
|
||
|
||
function canCancel(status) {
|
||
return status === 'PENDING' || status === 'DISPATCHED' || status === 'DELIVERING'
|
||
}
|
||
|
||
async function cancelTask(row) {
|
||
const { value: reason } = await ElMessageBox.prompt(
|
||
`确认取消 AGV 任务 ${row.taskNo}(${row.sourceDock} → ${row.targetDock})?\n取消后关联的备料单行将退回待发料。`,
|
||
'取消 AGV 任务',
|
||
{ type: 'warning', confirmButtonText: '确认取消', cancelButtonText: '返回', inputPlaceholder: '取消原因(选填)', inputValue: '' }
|
||
).catch(() => ({ value: null }))
|
||
if (reason === null) return
|
||
await request.post('/agv/cancel', { taskNo: row.taskNo, reason: reason || '' })
|
||
ElMessage.success('已取消')
|
||
loadTasks(); loadDocks()
|
||
}
|
||
|
||
async function loadMode() {
|
||
try {
|
||
const m = await request.get('/agv/mode')
|
||
agvMode.mock = !!m?.mock
|
||
agvMode.tip = m?.tip || ''
|
||
} catch { /* 忽略 */ }
|
||
}
|
||
|
||
onMounted(() => { loadDocks(); loadTasks(); loadMode() })
|
||
</script>
|
||
|
||
<template>
|
||
<div class="page">
|
||
<PageHelp :page="'Agv'" :data="helpAgv" />
|
||
|
||
<!-- AGV 对接状态(J:维持 mock,标注待现场对接)——置于页签外层,所有页签均可见 -->
|
||
<el-alert v-if="agvMode.mock" type="warning" :closable="false" show-icon style="margin-bottom:10px"
|
||
title="AGV 待对接:当前为模拟模式(未接真实海康 RCS)"
|
||
:description="agvMode.tip || '下发/到位/取消均为本地模拟,任务会立即标记为已到位,不会驱动真实小车。现场对接时在配置中关闭 EnableMock 并填写 RCS 地址 / appKey / appSecret 即切换为真实调度。'" />
|
||
|
||
<el-tabs v-model="activeTab">
|
||
<!-- ① 接驳台状态(默认) -->
|
||
<el-tab-pane label="接驳台状态" name="docks">
|
||
<div class="toolbar">
|
||
<el-button type="primary" :loading="loadingDocks" @click="loadDocks">刷新</el-button>
|
||
<span class="tip">● 绿色 = 空闲(无托盘) / 橙色 = 有托盘;AGV 到达前需确认目标口空闲</span>
|
||
</div>
|
||
<div class="dock-grid">
|
||
<div v-for="d in docks" :key="d.dockCode" class="dock-card"
|
||
:class="{ busy: d.hasPallet, line: d.dockType === 'line', wh: d.dockType !== 'line' }">
|
||
<div class="dock-code">{{ d.dockCode }}</div>
|
||
<div class="dock-name">{{ d.name }}</div>
|
||
<div class="dock-status">{{ d.hasPallet ? '有托盘' : '空闲' }}</div>
|
||
<div class="dock-ref" v-if="d.palletRef">托盘号 {{ d.palletRef }}</div>
|
||
</div>
|
||
</div>
|
||
</el-tab-pane>
|
||
|
||
<!-- ② AGV 任务列表 -->
|
||
<el-tab-pane label="AGV任务" name="tasks" lazy>
|
||
<div class="toolbar">
|
||
<el-select v-model="taskQuery.status" clearable placeholder="任务状态" style="width: 140px" @change="taskPage.current = 1; loadTasks()">
|
||
<el-option v-for="s in statusOptions" :key="s.v" :label="s.l" :value="s.v" />
|
||
</el-select>
|
||
<el-button type="primary" :loading="refreshing" @click="refreshTasks">刷新状态</el-button>
|
||
<el-button @click="taskPage.current = 1; loadTasks()">查询</el-button>
|
||
<el-button @click="taskQuery.status=''; taskPage.current=1; loadTasks()">重置</el-button>
|
||
</div>
|
||
<el-table :data="tasks" v-loading="loadingTasks" border stripe>
|
||
<el-table-column prop="id" label="ID" width="70" align="center" />
|
||
<el-table-column prop="taskNo" label="任务号" width="150" />
|
||
<el-table-column prop="sourceDock" label="源" width="80" align="center" />
|
||
<el-table-column prop="targetDock" label="目标" width="80" align="center" />
|
||
<el-table-column label="状态" width="100" align="center">
|
||
<template #default="{ row }">
|
||
<el-tag :type="statusTag(row.status)">{{ statusText(row.status) }}</el-tag>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column label="物料" min-width="220">
|
||
<template #default="{ row }">
|
||
<div v-if="row.materialsJson">
|
||
<div v-for="(m, i) in (typeof row.materialsJson === 'string' ? JSON.parse(row.materialsJson) : row.materialsJson)" :key="i">
|
||
{{ m.materialName || m.materialCode }} ×{{ m.qty }}
|
||
</div>
|
||
</div>
|
||
<span v-else>-</span>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column label="下发时间" width="150">
|
||
<template #default="{ row }">{{ row.dispatchedAt ? fmtTime(row.dispatchedAt) : '-' }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="到位时间" width="150">
|
||
<template #default="{ row }">{{ row.arrivedAt ? fmtTime(row.arrivedAt) : '-' }}</template>
|
||
</el-table-column>
|
||
<el-table-column label="创建时间" width="155" align="center">
|
||
<template #default="{ row }">{{ row.createdAt ? fmtTime(row.createdAt) : '-' }}</template>
|
||
</el-table-column>
|
||
<el-table-column prop="operator" label="下发人" width="100" />
|
||
<el-table-column prop="hikTaskCode" label="RCS任务码" width="150" show-overflow-tooltip />
|
||
<el-table-column prop="remark" label="备注" min-width="140" show-overflow-tooltip />
|
||
<el-table-column label="操作" width="90" align="center" fixed="right">
|
||
<template #default="{ row }">
|
||
<el-popconfirm v-if="canCancel(row.status)" title="确认取消该 AGV 任务?" @confirm="cancelTask(row)">
|
||
<template #reference>
|
||
<el-button size="small" type="danger" link>取消</el-button>
|
||
</template>
|
||
</el-popconfirm>
|
||
<span v-else>-</span>
|
||
</template>
|
||
</el-table-column>
|
||
</el-table>
|
||
<el-pagination background layout="total, sizes, prev, pager, next" :total="taskTotal"
|
||
:current-page="taskPage.current" :page-size="taskPage.size" :page-sizes="[10, 20, 50, 100]"
|
||
@current-change="(p) => { taskPage.current = p; loadTasks() }"
|
||
@size-change="(s) => { taskPage.size = s; taskPage.current = 1; loadTasks() }" />
|
||
</el-tab-pane>
|
||
|
||
<!-- ③ 下发 AGV(仓管操作) -->
|
||
<el-tab-pane label="下发AGV" name="dispatch" lazy>
|
||
<div class="toolbar">
|
||
<el-select v-model="mrQuery.status" style="width: 130px" placeholder="请选择状态" @change="mrPage.current = 1; loadMrs()">
|
||
<el-option label="待发料(PENDING)" value="PENDING" />
|
||
<el-option label="已备料(已出库)" value="LOCKED" />
|
||
<el-option label="配送中(DELIVERING)" value="DELIVERING" />
|
||
<el-option label="已完成(DONE)" value="DONE" />
|
||
</el-select>
|
||
<el-button @click="mrPage.current = 1; loadMrs()">查询</el-button>
|
||
<el-button @click="mrQuery.status='PENDING'; mrPage.current=1; loadMrs()">重置</el-button>
|
||
<span class="tip">勾选待发料行 → 行内可改目标接驳台 → 下发</span>
|
||
</div>
|
||
<div class="toolbar">
|
||
<el-select v-model="sourceDock" style="width: 130px" placeholder="请选择接驳台">
|
||
<el-option v-for="d in dockOptions" :key="d" :label="d" :value="d" />
|
||
</el-select>
|
||
<el-button @click="batchSetDock('DOCK01')">批量设 DOCK01</el-button>
|
||
<el-button @click="batchSetDock('DOCK02')">批量设 DOCK02</el-button>
|
||
<el-button type="primary" :disabled="!selected.length" @click="submitAgv">下发选中</el-button>
|
||
<span class="tip" v-if="groupPreview.length">将生成:{{ groupPreview.map((g) => g.dock + '×' + g.n).join(',') }}</span>
|
||
</div>
|
||
<el-table :data="mrs" v-loading="loadingMrs" border stripe @selection-change="onSelectionChange" :row-key="rowKey">
|
||
<el-table-column type="selection" :reserve-selection="true" width="42" />
|
||
<el-table-column prop="requestNo" label="备料单号" width="170" />
|
||
<el-table-column prop="orderNo" label="工单号" width="140" show-overflow-tooltip />
|
||
<el-table-column prop="materialCode" label="图号" width="120" />
|
||
<el-table-column prop="materialName" label="物料名称" min-width="140" show-overflow-tooltip />
|
||
<el-table-column prop="reqQty" label="数量" width="80" align="right" />
|
||
<el-table-column prop="unit" label="单位" width="60" align="center" />
|
||
<el-table-column label="目标接驳台" width="130">
|
||
<template #default="{ row }">
|
||
<el-select :model-value="row.targetDock || ''" placeholder="选择" size="small" @change="(v) => changeDock(row, v)">
|
||
<el-option v-for="d in dockOptions" :key="d" :label="d" :value="d" />
|
||
</el-select>
|
||
</template>
|
||
</el-table-column>
|
||
<el-table-column prop="planDate" label="排产日期" width="110" />
|
||
<el-table-column label="状态" width="90" align="center">
|
||
<template #default="{ row }">{{ statusText(row.status) }}</template>
|
||
</el-table-column>
|
||
</el-table>
|
||
<el-pagination background layout="total, sizes, prev, pager, next" :total="mrTotal"
|
||
:current-page="mrPage.current" :page-size="mrPage.size" :page-sizes="[10, 20, 50, 100]"
|
||
@current-change="(p) => { mrPage.current = p; loadMrs() }"
|
||
@size-change="(s) => { mrPage.size = s; mrPage.current = 1; loadMrs() }" />
|
||
</el-tab-pane>
|
||
</el-tabs>
|
||
</div>
|
||
</template>
|
||
|
||
<style scoped>
|
||
.toolbar { display: flex; align-items: center; gap: 8px; margin-bottom: 12px; flex-wrap: wrap; }
|
||
.tip { color: #909399; font-size: 12px; margin-left: 4px; }
|
||
.dock-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 12px; }
|
||
.dock-card { border: 1px solid #e4e7ed; border-radius: 8px; padding: 12px; text-align: center; transition: all .2s; }
|
||
.dock-card.busy { background: #fdf6ec; border-color: #e6a23c; }
|
||
.dock-card.line { border-left: 4px solid #409eff; }
|
||
.dock-card.wh { border-left: 4px solid #67c23a; }
|
||
.dock-code { font-size: 18px; font-weight: 700; }
|
||
.dock-name { font-size: 12px; color: #909399; margin: 4px 0; }
|
||
.dock-status { font-size: 13px; font-weight: 600; color: #67c23a; }
|
||
.dock-card.busy .dock-status { color: #e6a23c; }
|
||
.dock-ref { font-size: 12px; color: #e6a23c; margin-top: 2px; }
|
||
</style>
|