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:
@@ -241,7 +241,7 @@ export const helpLineManagement = {
|
||||
export const helpAgv = {
|
||||
title: 'AGV 配送',
|
||||
overview:
|
||||
'AGV(海康 RCS-Lite V1.5)配送管理:库房出库后由 AGV 将物料托盘送到产线接驳台。AGV 任务与 RCS 客户端的唯一真源在 MES(2026-10-14 自 WMS 迁入),本页合并「状态查看」与「手动派车」。\n\n派车主链路:MES 叫料单 → 仓库在 WMS 完成备料(叫料单状态转「已发货」)→ MES 自动派车(系统按目标接驳台生成 AGV 任务并调海康 RCS-Lite)。「手动派车」页签仅用于补派、或对下发失败的任务重试。\n\n接驳台状态:有传感器,PLC 可反馈「是否有托盘」;AGV 到达目标口前系统可查询该口是否空闲,托盘未清走前不会再次下料到该口。\n\n说明:RCS-Lite 未对接时走模拟模式(mock)用于联调完整链路;现场配置 BaseURL(默认端口 8182)后自动切换真实调度,业务代码无需改动。',
|
||||
'AGV(海康 RCS-Lite V1.5)配送管理:库房出库后由 AGV 将物料托盘送到产线接驳台。AGV 任务与 RCS 客户端的唯一真源在 MES(2026-10-14 自 WMS 迁入),本页合并「接驳台状态」「车辆状态(只读)」「AGV任务」与「手动派车 / 自由调度」。\n\n【三层安全机制(2026-11-03 拍板)】\n· ① 业务自动触发(免弹窗):仓库完成备料→系统自动派空车去装货点;卸货放行后自动派空车回充电位——这两段无需人工点确认。\n· ② 装卸强制确认(到位待令):AGV 到达目标接驳台后状态变「到位待令」,必须人工在「AGV任务」页或 WMS「叫料队列」点「确认装车并送货 / 卸货完成并放行」才走下一段。\n· ③ 传感器自动放行 + 人工兜底:接驳台有 PLC 托盘传感器,AGV 送达后系统按「传感器检测到托盘」自动放行(货已卸到位即放行,无需点按钮);传感器故障时由人工点「卸货完成并放行 / 人工强制放行」兜底。\n· ④ 自由调度(单点步进):每次点「开始搬运」必须弹「请确保路径畅通无杂物」才出发;到位停住待令,再选下一段或回充电位。\n\n【车辆状态页签】纯只读展示车辆闲忙/充电/电量/位置(海康 3.1.7);调度完全交给 RCS,本系统不干预(AGV 自己判定优先级与闲忙)。\n\n接驳台状态:有传感器,PLC 可反馈「是否有托盘」;AGV 到达目标口前系统可查询该口是否空闲,托盘未清走前不会再次下料到该口。\n\n说明:RCS-Lite 未对接时走模拟模式(mock)用于联调完整链路;现场配置 BaseURL(默认端口 8182)后自动切换真实调度,业务代码无需改动。',
|
||||
fields: [
|
||||
{ name: '接驳台状态', source: '系统维护。产线接驳台按工位绑定 + 库房接驳台。', purpose: '查看每个接驳台当前是否有托盘', fill: '绿色=空闲(无托盘);橙色=有托盘(占用中,AGV 到达前需确认空闲);已停用接驳台置灰' },
|
||||
{ name: 'AGV任务', source: '系统生成。每次派车一个目标口生成一条任务。', purpose: '追踪每批料的搬运进度', fill: '状态:待下发 → 待搬运 → 搬运中 → 已到位;「刷新状态」拉取 RCS 最新状态;未终态任务可取消' },
|
||||
@@ -255,7 +255,8 @@ export const helpTrace = {
|
||||
'输入工件 SN,查它的完整履历:进线/完工时间、各工位时间线、步骤考核数据(扭矩/角度)、拧紧记录、以及它用了哪些批次号/序列号=是。\n\n「检验记录」页签只读展示该工件的过程检/完工检结论(合格/部分通过/不合格)、处置方式、相关标准/试验记录单号、记录人及附件(点文件名打开),无记录显示"无检验记录"。\n\n数据来源:全部由前端各环节自动写入(扫码报工、拧紧采集、产线设备下发、工位完成),本页只读查询。\n\n与「生产流程卡」分工:本页以 **SN(工件成品序列号)** 为入口做全链路追溯——装配物料绑定明细、装机绑定关系、暂存退库/重上线、检验记录等单件履历,适合查"某一台"的来龙去脉;生产流程卡以工单为主卡看工艺实绩/用料/签字,适合看"一整单"的进度。两页数据同源(均读工件实绩),按查询维度互补,不重复录入。\n\n入口说明:本页查询入口 SN 为**成品/工件序列号**(成品实例 SN);物料 SN 只在「装机绑定」页签里作为绑定值展示,不能作本页查询入口。',
|
||||
fields: [
|
||||
{ name: '工件SN', source: '扫码枪/手输。来自工件条码。', purpose: '要追溯的工件唯一序列号', fill: '扫 SN 或手动输入后点查询' },
|
||||
{ name: '产品工号', source: '手动输入。筛选条件。', purpose: '按产品工号列出该工单下全部工件,再点行内「追溯」查看单个工件履历', fill: '可空;支持模糊匹配,回车即查' }
|
||||
{ name: '产品工号', source: '手动输入。筛选条件。', purpose: '按产品工号列出该工单下全部工件,再点行内「追溯」查看单个工件履历', fill: '可空;支持模糊匹配,回车即查' },
|
||||
{ name: '报废/取走登记', source: '按钮操作(权限「工件-报废/取走登记」),原因必填。', purpose: '工件被人工从产线取走(报废/丢失/磕碰损伤/人工处理)时的收口入口:状态置「已报废」、永久退出产线、不计入在制,工单须以强制完工收尾;全程留痕生命周期流水与操作日志', fill: '先查询出该 SN → 点「报废/取走登记」→ 填原因 → 确认。注意与「暂存退库」互斥:退库=合法暂停(SEMI_STORED)可重上线,报废=永久退出不可恢复;已退库半成品请走 WMS 在库处置' }
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -144,7 +144,10 @@ const menuGroups = [
|
||||
{ code: 'produce.quality', name: '质量检验', path: '/quality', icon: CircleCheck },
|
||||
{ code: 'produce.performance', name: '绩效报表', path: '/performance', icon: DataLine },
|
||||
{ code: 'produce.plc', name: '工位下发', path: '/plc-send', icon: Monitor },
|
||||
{ code: 'produce.plc.monitor', name: 'PLC管理', path: '/plc-monitor', icon: Monitor }
|
||||
{ code: 'produce.plc.monitor', name: 'PLC管理', path: '/plc-monitor', icon: Monitor },
|
||||
{ code: 'produce.transfer', name: '转产退料', path: '/transfer-return', icon: Van },
|
||||
{ code: 'produce.shortage', name: '补料管理', path: '/shortage', icon: ShoppingCart },
|
||||
{ code: 'produce.loss', name: '损耗台账', path: '/loss-ledger', icon: Warning }
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
@@ -31,9 +31,20 @@ async function loadDocks() {
|
||||
loadingDocks.value = false
|
||||
}
|
||||
|
||||
// 显示层统一(2026-10-17 裁定):库房接驳台一律显示「库房接驳台」,不显示 DOCK21/JBT21 编号
|
||||
// (DOCK21 仅作后端映射/提交值;PLC 侧对应点位于监控页同样只显示「库房接驳台」)
|
||||
const dockLabel = (code) => (String(code || '') === 'DOCK21' ? '库房接驳台' : code || '—')
|
||||
// 显示层统一(2026-11-03 左右互换拍板):接驳台按 side(操作员朝向 left/right)显示「工位X左/右」;
|
||||
// 库房接驳台一律显示「库房接驳台」,不显示 DOCK21/JBT21 编号。
|
||||
const dockCn = (d) => {
|
||||
if (!d) return '—'
|
||||
if (String(d.dockCode || '') === 'DOCK21') return '库房接驳台'
|
||||
const s = d.side === 'left' ? '左' : d.side === 'right' ? '右' : ''
|
||||
return `工位${d.stationNo || ''}${s}`
|
||||
}
|
||||
const dockCnMap = computed(() => {
|
||||
const m = {}
|
||||
docks.value.forEach((d) => { m[d.dockCode] = dockCn(d) })
|
||||
return m
|
||||
})
|
||||
const dockLabel = (d) => dockCn(typeof d === 'string' ? { dockCode: d } : d)
|
||||
|
||||
/* ===================== AGV 点位(独立点位表,硬件真源) ===================== */
|
||||
const agvPoints = ref([])
|
||||
@@ -53,7 +64,11 @@ const pointMap = computed(() => {
|
||||
agvPoints.value.forEach((p) => { m[p.positionCode] = p })
|
||||
return m
|
||||
})
|
||||
const pointLabel = (code) => (pointMap.value[String(code)]?.name) || String(code || '—')
|
||||
const pointLabel = (code) => {
|
||||
const p = pointMap.value[String(code)]
|
||||
if (p?.isDock && dockCnMap.value[p.dockCode]) return dockCnMap.value[p.dockCode]
|
||||
return p?.name || String(code || '—')
|
||||
}
|
||||
const savingPoint = ref(0)
|
||||
async function savePoint(p) {
|
||||
savingPoint.value = p.id
|
||||
@@ -74,11 +89,71 @@ const loadingTasks = ref(false)
|
||||
const statusOptions = [
|
||||
{ v: 'PENDING', l: '待下发' }, { v: 'FAILED', l: '下发失败' },
|
||||
{ v: '1', l: '已创建' }, { v: '2', l: '执行中' },
|
||||
{ v: 'ARRIVED', l: '到位待令' },
|
||||
{ v: '5', l: '已取消' }, { v: '9', l: '已完成' }
|
||||
]
|
||||
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || s
|
||||
const statusTag = (s) =>
|
||||
s === '9' ? 'success' : s === 'FAILED' || s === '5' ? 'info' : s === '2' ? 'warning' : s === '1' ? 'primary' : ''
|
||||
s === '9' ? 'success' : s === 'ARRIVED' ? 'danger' : s === 'FAILED' || s === '5' ? 'info' : s === '2' ? 'warning' : s === '1' ? 'primary' : ''
|
||||
const kindText = (k) => ({ GO_LOAD: '空车去程', TRANSPORT: '重载运输', EMPTY_RETURN: '空车回充', FREE: '自由调度' }[k] || k)
|
||||
|
||||
/* ===================== 到位待令确认(2026-11-03 三层安全机制) ===================== */
|
||||
// 到位即停:GO_LOAD 段→「确认装车并送货」;TRANSPORT 段→「卸货完成并放行」(放行后空车自动回充);
|
||||
// FREE 段→「开始下一段」/「结束回充」。自由调度每次「开始搬运」强制弹「请确保路径畅通无杂物」。
|
||||
const freeTarget = ref('')
|
||||
const freeSource = ref('')
|
||||
const confirmBusy = ref(false)
|
||||
async function confirmLoadGo(row) {
|
||||
let def = ''
|
||||
try {
|
||||
const mats = typeof row.materialsJson === 'string' ? JSON.parse(row.materialsJson) : row.materialsJson
|
||||
def = mats?.[0]?.TargetDock || ''
|
||||
} catch { /* ignore */ }
|
||||
try {
|
||||
const { value } = await ElMessageBox.prompt('请输入送货目标接驳台/点位(默认取叫料单目标)', '确认装车并送货', {
|
||||
inputValue: def, inputPlaceholder: '如 DOCK03 或 AGV-WAIT01', type: 'warning',
|
||||
inputValidator: (v) => !!v || '目标必填'
|
||||
})
|
||||
await confirmAgv(row, 'load_go', (value || '').trim())
|
||||
} catch { /* 取消 */ }
|
||||
}
|
||||
async function confirmAgv(row, action, nextDock) {
|
||||
const tips = {
|
||||
load_go: '确认已装车并送货?AGV 将背着托盘前往目标接驳台。',
|
||||
unload_release: '确认卸货完成并放行?托盘将落位当前接驳台,AGV 空车自动回充电位。',
|
||||
finish_return: '确认结束本任务并让 AGV 回充电位?'
|
||||
}
|
||||
const isFree = action !== 'load_go' && action !== 'unload_release'
|
||||
try {
|
||||
if (isFree) {
|
||||
await ElMessageBox.confirm('请确保路径畅通无杂物,确认后 AGV 出发。', '开始 AGV 搬运', { type: 'warning' })
|
||||
} else {
|
||||
await ElMessageBox.confirm(tips[action], '到位待令确认', { type: 'warning' })
|
||||
}
|
||||
} catch { return }
|
||||
confirmBusy.value = true
|
||||
try {
|
||||
await request.post('/agv/confirm', { taskNo: row.taskNo, action, nextDock: nextDock || '' })
|
||||
ElMessage.success('已确认')
|
||||
loadTasks()
|
||||
} catch (e) {
|
||||
ElMessage.error('确认失败:' + (e?.message || e))
|
||||
} finally { confirmBusy.value = false }
|
||||
}
|
||||
async function freeDispatch(target) {
|
||||
if (!target) { ElMessage.warning('请选择目标点位'); return }
|
||||
try {
|
||||
await ElMessageBox.confirm('请确保路径畅通无杂物,确认后 AGV 出发前往 ' + (pointLabel(target) || target) + '。', '开始 AGV 搬运', { type: 'warning' })
|
||||
} catch { return }
|
||||
confirmBusy.value = true
|
||||
try {
|
||||
await request.post('/agv/free-dispatch', { target, source: freeSource.value || '' })
|
||||
ElMessage.success('已派车')
|
||||
loadTasks()
|
||||
} catch (e) {
|
||||
ElMessage.error('派车失败:' + (e?.message || e))
|
||||
} finally { confirmBusy.value = false }
|
||||
}
|
||||
|
||||
async function loadTasks() {
|
||||
loadingTasks.value = true
|
||||
@@ -249,7 +324,24 @@ async function loadMode() {
|
||||
} catch { /* 忽略 */ }
|
||||
}
|
||||
|
||||
onMounted(() => { loadDocks(); loadTasks(); loadMode(); loadAgvPoints() })
|
||||
onMounted(() => { loadDocks(); loadTasks(); loadMode(); loadAgvPoints(); loadVehicles() })
|
||||
|
||||
// 车辆状态只读(海康 3.1.7,2026-11-03 拍板:纯只读展示,不干预调度)
|
||||
const vehicles = ref([])
|
||||
const loadingVehicles = ref(false)
|
||||
const vehicleUnavailable = ref(false)
|
||||
const vehicleReason = ref('')
|
||||
async function loadVehicles() {
|
||||
loadingVehicles.value = true
|
||||
try {
|
||||
const d = await request.get('/agv/vehicles')
|
||||
vehicles.value = d?.list || []
|
||||
vehicleUnavailable.value = !!d?.unavailable
|
||||
vehicleReason.value = d?.reason || ''
|
||||
} catch { vehicles.value = [] }
|
||||
loadingVehicles.value = false
|
||||
}
|
||||
const vehicleStateCn = (s) => ({ '4': '空闲', '2': '执行中', '7': '充电', '1': '任务完成', '5': '异常', '3': '异常', '6': '举升中' }[s] || ('状态' + s))
|
||||
|
||||
// 切 tab 重新加载对应数据(2026-10-19:lazy 页签切回不 reload,状态/叫料单会停留在旧数据)
|
||||
function onTabChange(name) {
|
||||
@@ -257,6 +349,7 @@ function onTabChange(name) {
|
||||
else if (name === 'tasks') loadTasks()
|
||||
else if (name === 'dispatch') loadMrs()
|
||||
else if (name === 'points') loadAgvPoints()
|
||||
else if (name === 'vehicles') loadVehicles()
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -289,6 +382,29 @@ function onTabChange(name) {
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- ②B 车辆状态(只读,海康 3.1.7;2026-11-03 拍板:调度完全交给 RCS,本页仅展示闲忙/充电/电量) -->
|
||||
<el-tab-pane label="车辆状态" name="vehicles" lazy>
|
||||
<div class="toolbar">
|
||||
<el-button type="primary" :loading="loadingVehicles" @click="loadVehicles">刷新车辆</el-button>
|
||||
<span class="tip">● 本页仅只读展示车辆状态,不改变任何调度(AGV 自己判定闲忙与优先级,RCS 内部完成)</span>
|
||||
</div>
|
||||
<el-alert v-if="vehicleUnavailable" type="info" :closable="false" show-icon class="mb8"
|
||||
:title="'车辆状态暂不可用:' + (vehicleReason || 'RCS 未配置或未对接')" />
|
||||
<div class="veh-grid">
|
||||
<div v-for="v in vehicles" :key="v.robotCode" class="veh-card"
|
||||
:class="{ idle: v.status === '4', busy: v.status === '2', charge: v.status === '7' }">
|
||||
<div class="veh-code">AGV {{ v.robotCode }}</div>
|
||||
<div class="veh-state">{{ vehicleStateCn(v.status) }}</div>
|
||||
<div class="veh-batt">
|
||||
<el-progress type="dashboard" :width="70" :percentage="Math.round(v.battery || 0)"
|
||||
:color="v.battery < 20 ? '#f56c6c' : '#67c23a'" />
|
||||
</div>
|
||||
<div class="veh-meta">电量 {{ Math.round(v.battery || 0) }}% · {{ v.podCode && v.podCode !== '0' ? '载货 ' + v.podCode : '空载' }}</div>
|
||||
</div>
|
||||
<el-empty v-if="!vehicles.length && !vehicleUnavailable && !loadingVehicles" description="暂无车辆数据" />
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- ② AGV 任务列表 -->
|
||||
<el-tab-pane label="AGV任务" name="tasks" lazy>
|
||||
<div class="toolbar">
|
||||
@@ -335,15 +451,26 @@ function onTabChange(name) {
|
||||
<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="110" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="150" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<template v-if="row.status === 'ARRIVED'">
|
||||
<el-button v-if="row.kind === 'GO_LOAD'" size="small" type="success" :loading="confirmBusy"
|
||||
@click="confirmLoadGo(row)">确认装车并送货</el-button>
|
||||
<el-button v-else-if="row.kind === 'TRANSPORT'" size="small" type="success" :loading="confirmBusy"
|
||||
@click="confirmAgv(row, 'unload_release')">卸货完成并放行</el-button>
|
||||
<template v-else>
|
||||
<el-button size="small" type="primary" :loading="confirmBusy"
|
||||
@click="confirmAgv(row, 'finish_return')">结束回充电位</el-button>
|
||||
<div style="color:#909399;font-size:11px">或到「自由调度」页选下一段</div>
|
||||
</template>
|
||||
</template>
|
||||
<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>
|
||||
<el-button v-if="canRetry(row.status)" size="small" type="warning" link @click="retryTask(row)">重试</el-button>
|
||||
<span v-if="!canCancel(row.status) && !canRetry(row.status)">-</span>
|
||||
<span v-if="row.status !== 'ARRIVED' && !canCancel(row.status) && !canRetry(row.status)">-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -353,7 +480,24 @@ function onTabChange(name) {
|
||||
@size-change="(s) => { taskPage.size = s; taskPage.current = 1; loadTasks() }" />
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- ③ 手动派车(补派/重试;主链路已由 MES 在仓库完成备料时自动派车) -->
|
||||
<!-- ②B 自由调度(2026-11-03 三层机制第三层):单点步进——每次派一段,到位停住待令,
|
||||
人工确认后再走下一段或结束回充;每段派车强制弹「请确保路径畅通无杂物」。 -->
|
||||
<el-tab-pane label="自由调度" name="free" lazy>
|
||||
<el-alert type="info" :closable="false" show-icon class="mb8"
|
||||
title="单点步进操作:选择一个点位让 AGV 过来(到位后停住,状态=到位待令)→ 装卸作业 → 再选下一段(本页派车或回充电位结束)。每次开始搬运都会提示“请确保路径畅通无杂物”。" />
|
||||
<div class="toolbar" style="margin-top:10px">
|
||||
<el-select v-model="freeTarget" style="width: 220px" placeholder="选择目标点位(让 AGV 前往)">
|
||||
<el-option v-for="d in pointOptions" :key="d" :label="pointLabel(d)" :value="d" />
|
||||
</el-select>
|
||||
<el-button type="primary" :loading="confirmBusy" @click="freeDispatch(freeTarget)">开始 AGV 搬运</el-button>
|
||||
<el-select v-model="freeSource" style="width: 220px; margin-left: 16px" placeholder="起点(可空=AGV 当前位置)" clearable>
|
||||
<el-option v-for="d in pointOptions" :key="'s'+d" :label="pointLabel(d)" :value="d" />
|
||||
</el-select>
|
||||
<span class="tip">空起点 = RCS 派最近空闲车前往目标</span>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- ③ 手动派车(补派/重试;主链路已由 MES 在仓库完成备料时自动派空车) -->
|
||||
<el-tab-pane label="手动派车" name="dispatch" lazy>
|
||||
<div class="toolbar">
|
||||
<el-select v-model="mrQuery.status" style="width: 150px" placeholder="叫料单状态" @change="loadMrs()">
|
||||
@@ -454,6 +598,15 @@ function onTabChange(name) {
|
||||
.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; }
|
||||
.mb8 { margin-bottom: 8px; }
|
||||
.veh-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); gap: 12px; }
|
||||
.veh-card { border: 1px solid #e4e7ed; border-radius: 8px; padding: 14px; text-align: center; }
|
||||
.veh-card.idle { border-left: 4px solid #67c23a; }
|
||||
.veh-card.busy { border-left: 4px solid #409eff; }
|
||||
.veh-card.charge { border-left: 4px solid #e6a23c; }
|
||||
.veh-code { font-size: 15px; font-weight: 700; }
|
||||
.veh-state { font-size: 13px; font-weight: 600; color: #409eff; margin: 4px 0 8px; }
|
||||
.veh-meta { font-size: 12px; color: #909399; margin-top: 6px; }
|
||||
.mono { font-family: Consolas, Monaco, monospace; }
|
||||
.disabled-text { color: #909399; }
|
||||
</style>
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<h3>损耗台账</h3>
|
||||
<el-alert type="info" :closable="false" show-icon
|
||||
title="退料时实际退回少于理论应退的差额=损耗(原因必填),先允许直接退库、后审核:主管在此批注回复。工单不记录损耗;台账可见「哪个人、哪个工位、损耗多少」。" />
|
||||
<div class="mt">
|
||||
<el-select v-model="statusFilter" clearable placeholder="状态" style="width:140px" @change="load">
|
||||
<el-option label="待批注" value="PENDING" />
|
||||
<el-option label="已批注" value="COMMENTED" />
|
||||
</el-select>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card class="mt">
|
||||
<el-table :data="rows" border v-loading="loading">
|
||||
<el-table-column prop="id" label="ID" width="60" align="center" />
|
||||
<el-table-column prop="stationNo" label="工位" width="70" align="center" />
|
||||
<el-table-column prop="materialCode" label="图号" width="120" />
|
||||
<el-table-column prop="materialName" label="名称" min-width="120" />
|
||||
<el-table-column label="理论应退" width="90" align="center"><template #default="{ row }">{{ row.theoryQty }}</template></el-table-column>
|
||||
<el-table-column label="实际退回" width="90" align="center"><template #default="{ row }">{{ row.actualQty }}</template></el-table-column>
|
||||
<el-table-column label="损耗量" width="90" align="center">
|
||||
<template #default="{ row }"><el-tag type="danger">{{ row.lossQty }}</el-tag></template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="reason" label="原因" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="returnNo" label="关联退库单" width="160" show-overflow-tooltip />
|
||||
<el-table-column prop="workOrderNo" label="工单" width="130" show-overflow-tooltip />
|
||||
<el-table-column prop="operator" label="退料人" width="90" />
|
||||
<el-table-column label="状态" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.status === 'COMMENTED' ? 'success' : 'warning'">{{ row.status === 'COMMENTED' ? '已批注' : '待批注' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="comment" label="主管批注" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="commenter" label="批注人" width="90" />
|
||||
<el-table-column label="操作" width="110" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button size="small" type="primary" @click="comment(row)">批注回复</el-button>
|
||||
</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'
|
||||
|
||||
const rows = ref([])
|
||||
const loading = ref(false)
|
||||
const statusFilter = ref('')
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await request.get('/losses', { params: { status: statusFilter.value || undefined, page: 1, pageSize: 50 } })
|
||||
rows.value = data?.list || []
|
||||
} finally { loading.value = false }
|
||||
}
|
||||
|
||||
async function comment(row) {
|
||||
let text = ''
|
||||
try {
|
||||
const r = await ElMessageBox.prompt('主管批注回复(必填)', '损耗批注', { type: 'warning', inputValue: row.comment || '' })
|
||||
text = (r.value || '').trim()
|
||||
} catch { return }
|
||||
if (!text) { ElMessage.warning('批注内容必填'); return }
|
||||
try {
|
||||
await request.post('/losses/comment', { id: row.id, comment: text })
|
||||
ElMessage.success('已批注')
|
||||
load()
|
||||
} catch (e) {
|
||||
ElMessage.error('批注失败:' + (e?.message || e))
|
||||
}
|
||||
}
|
||||
|
||||
load()
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.mt { margin-top: 12px; }
|
||||
</style>
|
||||
@@ -34,6 +34,24 @@
|
||||
<el-switch v-model="form.torqueNgAlert" />
|
||||
<div class="tip">开启(默认)后,拧紧扭矩不合格立即在预警中心产生报警;关闭则只记录不合格标记、不弹报警</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="拧紧枪数据输入">
|
||||
<el-radio-group v-model="form.torqueManualInput">
|
||||
<el-radio value="forbid">禁止手填(默认)</el-radio>
|
||||
<el-radio value="allow">允许手填</el-radio>
|
||||
</el-radio-group>
|
||||
<div class="tip">禁止手填(默认):扭矩必须真实采集,符合客户质量追溯要求;允许手填:拧紧枪离线/缺失时,工位终端开放手动录入扭矩输入框</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="多工单缓存策略">
|
||||
<el-radio-group v-model="form.multiOrderCachePolicy">
|
||||
<el-radio value="physical">物理优先(默认)</el-radio>
|
||||
<el-radio value="strict">严格隔离</el-radio>
|
||||
</el-radio-group>
|
||||
<div class="tip">物理优先(默认):目标接驳台/缓存位实际无托盘即可卸货;严格隔离:多工单物料禁止共位,目标位被其他工单占用时报错/另选点位</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="AGV 卸货超时报警(分钟)">
|
||||
<el-input-number v-model="form.agvUnloadTimeoutMinutes" :min="1" :max="1440" />
|
||||
<div class="tip">AGV 任务派发后超过该时长仍未「卸货完成」即落预警,通知人工干预(默认 5);AGV 只有把货卸到目标点位才算完成任务</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="看板刷新间隔(秒)">
|
||||
<el-input-number v-model="form.dashboardRefreshSeconds" :min="1" :max="10" />
|
||||
<div class="tip">看板大屏轮询兜底刷新间隔(1~10 秒,默认 5);SSE 实时通道可用时由事件驱动刷新,本值仅作兜底间隔</div>
|
||||
@@ -93,7 +111,7 @@ const loading = ref(false)
|
||||
const saving = ref(false)
|
||||
const testing = ref(false)
|
||||
const testMsg = ref('')
|
||||
const form = reactive({ wmsBaseURL: '', demandDays: 5, extrapWindow: 3, extrapCap: 365, logRetentionDays: 0, pipelineCache: 0, allowCrossDay: 1, allowBorrow: 1, torqueNgAlert: true, dashboardRefreshSeconds: 5, archiveRemindDays: 7, dashboardTitle: '', dashboardVoice: true })
|
||||
const form = reactive({ wmsBaseURL: '', demandDays: 5, extrapWindow: 3, extrapCap: 365, logRetentionDays: 0, pipelineCache: 0, allowCrossDay: 1, allowBorrow: 1, torqueNgAlert: true, dashboardRefreshSeconds: 5, archiveRemindDays: 7, dashboardTitle: '', dashboardVoice: true, torqueManualInput: 'forbid', multiOrderCachePolicy: 'physical', agvUnloadTimeoutMinutes: 5 })
|
||||
const info = ref({})
|
||||
|
||||
async function load() {
|
||||
@@ -113,7 +131,10 @@ async function load() {
|
||||
dashboardRefreshSeconds: data.dashboardRefreshSeconds ?? 5,
|
||||
archiveRemindDays: data.archiveRemindDays ?? 7,
|
||||
dashboardTitle: data.dashboardTitle || '',
|
||||
dashboardVoice: data.dashboardVoice ?? true
|
||||
dashboardVoice: data.dashboardVoice ?? true,
|
||||
torqueManualInput: data.torqueManualInput || 'forbid',
|
||||
multiOrderCachePolicy: data.multiOrderCachePolicy || 'physical',
|
||||
agvUnloadTimeoutMinutes: data.agvUnloadTimeoutMinutes ?? 5
|
||||
})
|
||||
info.value = data
|
||||
} finally {
|
||||
|
||||
@@ -0,0 +1,115 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<h3>补料管理(SHORTAGE)</h3>
|
||||
<el-alert type="info" :closable="false" show-icon
|
||||
title="补料 = 工位物料不够用申请加量(主管审批后调增该工位叫料池额度)。与借料(跨工位额度转移,零和)、数量不符补发(差异单驱动)是三回事,互不混淆。" />
|
||||
<el-form inline class="mt">
|
||||
<el-form-item label="工位号"><el-input-number v-model="form.stationNo" :min="1" :max="99" /></el-form-item>
|
||||
<el-form-item label="物料编码(图号)"><el-input v-model="form.materialCode" style="width:150px" /></el-form-item>
|
||||
<el-form-item label="物料名称"><el-input v-model="form.materialName" style="width:140px" /></el-form-item>
|
||||
<el-form-item label="单位"><el-input v-model="form.unit" style="width:80px" /></el-form-item>
|
||||
<el-form-item label="补料数量"><el-input-number v-model="form.qty" :min="1" /></el-form-item>
|
||||
<el-form-item label="补料原因(必填)"><el-input v-model="form.reason" style="width:220px" placeholder="如:损耗超标/用量超出预估" /></el-form-item>
|
||||
<el-button type="primary" :loading="creating" @click="create">提交补料申请</el-button>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt">
|
||||
<template #header>
|
||||
<div style="display:flex;align-items:center;gap:12px">
|
||||
<span>补料申请列表</span>
|
||||
<el-select v-model="statusFilter" clearable placeholder="状态" style="width:140px" @change="load">
|
||||
<el-option label="待审批" value="PENDING" />
|
||||
<el-option label="已通过" value="APPROVED" />
|
||||
<el-option label="已驳回" value="REJECTED" />
|
||||
</el-select>
|
||||
</div>
|
||||
</template>
|
||||
<el-table :data="rows" border v-loading="loading">
|
||||
<el-table-column prop="id" label="ID" width="60" align="center" />
|
||||
<el-table-column prop="stationNo" label="工位" width="70" align="center" />
|
||||
<el-table-column prop="materialCode" label="图号" width="120" />
|
||||
<el-table-column prop="materialName" label="名称" min-width="130" />
|
||||
<el-table-column prop="qty" label="补料量" width="80" align="center" />
|
||||
<el-table-column prop="unit" label="单位" width="60" align="center" />
|
||||
<el-table-column prop="reason" label="原因" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column label="状态" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.status === 'APPROVED' ? 'success' : row.status === 'REJECTED' ? 'info' : 'warning'">
|
||||
{{ { PENDING: '待审批', APPROVED: '已通过', REJECTED: '已驳回' }[row.status] }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="comment" label="主管批注" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="operator" label="申请人" width="90" />
|
||||
<el-table-column label="审批" width="170" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<template v-if="row.status === 'PENDING'">
|
||||
<el-button size="small" type="success" @click="review(row, true)">通过(加额度)</el-button>
|
||||
<el-button size="small" type="danger" @click="review(row, false)">驳回</el-button>
|
||||
</template>
|
||||
<span v-else style="color:#999">-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
|
||||
const rows = ref([])
|
||||
const loading = ref(false)
|
||||
const creating = ref(false)
|
||||
const statusFilter = ref('')
|
||||
const form = reactive({ stationNo: 1, materialCode: '', materialName: '', unit: '个', qty: 1, reason: '' })
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await request.get('/shortages', { params: { status: statusFilter.value || undefined, page: 1, pageSize: 50 } })
|
||||
rows.value = data?.list || []
|
||||
} finally { loading.value = false }
|
||||
}
|
||||
|
||||
async function create() {
|
||||
if (!form.materialCode || !form.reason) { ElMessage.warning('物料编码与补料原因必填'); return }
|
||||
creating.value = true
|
||||
try {
|
||||
await request.post('/shortages', { ...form })
|
||||
ElMessage.success('补料申请已提交,待主管审批(通过后自动调增叫料池额度)')
|
||||
form.reason = ''
|
||||
load()
|
||||
} catch (e) {
|
||||
ElMessage.error('提交失败:' + (e?.message || e))
|
||||
} finally { creating.value = false }
|
||||
}
|
||||
|
||||
async function review(row, approve) {
|
||||
let comment = ''
|
||||
try {
|
||||
const r = await ElMessageBox.prompt(
|
||||
approve ? '批注(选填)后通过:系统将把该工位叫料池可用额度调增 ' + row.qty : '请填写驳回原因(必填)',
|
||||
approve ? '通过补料申请' : '驳回补料申请', { type: 'warning', inputValue: '' })
|
||||
comment = (r.value || '').trim()
|
||||
} catch { return }
|
||||
if (!approve && !comment) { ElMessage.warning('驳回原因必填'); return }
|
||||
try {
|
||||
await request.post('/shortages/review', { id: row.id, approve, comment })
|
||||
ElMessage.success(approve ? '已通过,额度已调增' : '已驳回')
|
||||
load()
|
||||
} catch (e) {
|
||||
ElMessage.error('审批失败:' + (e?.message || e))
|
||||
}
|
||||
}
|
||||
|
||||
load()
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.mt { margin-top: 12px; }
|
||||
</style>
|
||||
@@ -19,8 +19,24 @@
|
||||
<el-form-item>
|
||||
<el-button type="success" :disabled="!sn" :loading="exporting" @click="exportTorque">导出拧紧数据</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="can('produce.workpiece:scrap')">
|
||||
<el-button type="danger" :disabled="!sn" @click="openScrap">报废/取走登记</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<!-- 工件报废/人工取走(2026-11-03 闭环补全):原因必填、留痕,与「暂存退库(半成品回库)」互斥 -->
|
||||
<el-dialog v-model="scrapVisible" title="工件报废 / 人工取走登记" width="460px" append-to-body>
|
||||
<el-alert type="warning" :closable="false" style="margin-bottom:12px"
|
||||
title="适用:工件被人工从产线取走(报废/丢失/磕碰损伤/人工处理)。登记后工件状态置「已报废」、永久退出产线,不计入在制;本工单需以「强制完工」收尾。注意:这不是「暂存退库」——半成品回库可重上线,报废不可恢复。" />
|
||||
<div style="margin-bottom:12px;color:#606266;font-size:13px">工件 SN:{{ scrapSn }}</div>
|
||||
<el-input v-model="scrapReason" type="textarea" :rows="3" maxlength="200" show-word-limit
|
||||
placeholder="报废/取走原因必填(如:磕碰损伤报废 / 人工取走维修 / 现场丢失)" />
|
||||
<template #footer>
|
||||
<el-button @click="scrapVisible = false">取消</el-button>
|
||||
<el-button type="danger" :disabled="!scrapReason.trim()" @click="doScrap">确认登记</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<el-card v-if="orderRows.length" shadow="never" style="margin-bottom:12px">
|
||||
<template #header>工单「{{ orderNo }}」下的工件共 {{ orderRows.length }} 件(点「追溯」查看单个工件)</template>
|
||||
<el-table :data="orderRows" border size="small" max-height="240">
|
||||
@@ -197,10 +213,30 @@ import { ref, computed } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
import { getToken } from '../utils/auth'
|
||||
import { can } from '../utils/perm'
|
||||
import { openPrintableHtml } from '../utils/print'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
import { helpTrace } from '../help'
|
||||
|
||||
// 工件报废/人工取走(2026-11-03 闭环补全):原因必填、留痕;SCRAPPED 唯一写入者。
|
||||
const scrapVisible = ref(false)
|
||||
const scrapSn = ref('')
|
||||
const scrapReason = ref('')
|
||||
function openScrap() {
|
||||
scrapSn.value = sn.value.trim()
|
||||
scrapReason.value = ''
|
||||
if (!scrapSn.value) return ElMessage.warning('请先输入要登记的工件 SN')
|
||||
scrapVisible.value = true
|
||||
}
|
||||
async function doScrap() {
|
||||
try {
|
||||
await request.post('/workpiece/scrap', { sn: scrapSn.value, reason: scrapReason.value.trim() })
|
||||
ElMessage.success('已登记报废/取走')
|
||||
scrapVisible.value = false
|
||||
search()
|
||||
} catch (e) { /* 拦截器已提示 */ }
|
||||
}
|
||||
|
||||
const sn = ref('')
|
||||
const orderNo = ref('')
|
||||
const operator = ref('')
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<h3>转产 · 按工单精确退料</h3>
|
||||
<el-alert
|
||||
type="info"
|
||||
:closable="false"
|
||||
show-icon
|
||||
title="工位故障转产流程(两步)"
|
||||
description="① 先在此按工单归集退料:系统列出该工位涉及的所有工单及理论应剩料,您核对实际剩余并勾选,按工单生成退库单(库管按工单分别确认收货)。② 再到「工单管理」暂停工单并改路线,系统自动把在制工件转移到新工位并重排备料。叫料池底层按工位×物料聚合不变,仅在退库单上记录工单归属。"
|
||||
/>
|
||||
<el-form inline class="mt">
|
||||
<el-form-item label="故障工位号">
|
||||
<el-input-number v-model="stationNo" :min="1" :max="99" />
|
||||
</el-form-item>
|
||||
<el-button type="primary" :loading="loading" @click="load">查询该工位涉及工单</el-button>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-empty v-if="!loading && items.length === 0" description="该工位当前无进行中/暂停工单涉及" />
|
||||
|
||||
<el-card v-for="it in items" :key="it.orderNo" class="mt">
|
||||
<template #header>
|
||||
<span class="wo-no">工单 {{ it.orderNo }}</span>
|
||||
<el-tag class="ml">剩余未完工 {{ it.remaining }} 台</el-tag>
|
||||
<el-tag type="info" class="ml">该工位在制 {{ it.workpieceCount }} 台</el-tag>
|
||||
</template>
|
||||
<el-table :data="it.items" border>
|
||||
<el-table-column label="选择" width="70" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-checkbox v-model="row._checked" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="物料" min-width="180">
|
||||
<template #default="{ row }">{{ row.materialName }} <span class="mc">{{ row.materialCode }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" prop="unit" width="70" />
|
||||
<el-table-column label="理论应剩" width="100" align="center">
|
||||
<template #default="{ row }"><el-tag type="warning">{{ row.theoryQty }}</el-tag></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实际剩余(可改)" width="160" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-input-number v-model="row._actual" :min="0" :max="row.theoryQty * 3" size="small" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="损耗原因(实际<理论必填)" min-width="160">
|
||||
<template #default="{ row }">
|
||||
<el-input v-if="row.theoryQty > row._actual" v-model="row._lossReason" size="small"
|
||||
placeholder="如:磕碰损伤/用量超标" />
|
||||
<span v-else class="tip">-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
|
||||
<el-card v-if="items.length" class="mt">
|
||||
<el-form inline>
|
||||
<el-form-item label="退料接驳台(必选)">
|
||||
<el-select v-model="returnDock" placeholder="选择从哪个接驳台退料" style="width: 240px">
|
||||
<el-option v-for="d in docks" :key="d.code" :label="d.label" :value="d.code" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-button type="success" :loading="submitting" @click="submit">生成退库单(按工单归集)</el-button>
|
||||
<span class="ml tip">将按勾选项生成多张退库单,每张绑定对应工单号与接驳台;实际退回少于理论应退须填损耗原因(主管后审核批注)。</span>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
|
||||
const stationNo = ref(6)
|
||||
const loading = ref(false)
|
||||
const submitting = ref(false)
|
||||
const items = ref([])
|
||||
const docks = ref([])
|
||||
const returnDock = ref('')
|
||||
|
||||
async function load() {
|
||||
if (!stationNo.value) {
|
||||
ElMessage.warning('请填写故障工位号')
|
||||
return
|
||||
}
|
||||
loading.value = true
|
||||
try {
|
||||
const resp = await request.get('/transfer/orders?stationNo=' + stationNo.value)
|
||||
const list = (resp && resp.items) || []
|
||||
docks.value = (resp && resp.docks) || []
|
||||
returnDock.value = docks.value[0]?.code || ''
|
||||
// 初始化每行勾选与实际剩余默认值
|
||||
for (const it of list) {
|
||||
for (const m of (it.items || [])) {
|
||||
m._checked = true
|
||||
m._actual = m.theoryQty
|
||||
m._lossReason = ''
|
||||
}
|
||||
}
|
||||
items.value = list
|
||||
} catch (e) {
|
||||
ElMessage.error('查询失败:' + (e?.message || e))
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function submit() {
|
||||
if (!returnDock.value) {
|
||||
ElMessage.warning('请选择退料接驳台(左/右)——AGV 将从该接驳台拉货')
|
||||
return
|
||||
}
|
||||
const payload = []
|
||||
for (const it of items.value) {
|
||||
for (const m of (it.items || [])) {
|
||||
if (m._checked && m._actual > 0) {
|
||||
payload.push({
|
||||
orderNo: it.orderNo,
|
||||
materialCode: m.materialCode,
|
||||
materialName: m.materialName,
|
||||
unit: m.unit,
|
||||
snMode: m.snMode,
|
||||
actualQty: m._actual,
|
||||
theoryQty: m.theoryQty,
|
||||
dock: returnDock.value,
|
||||
lossReason: m._lossReason || '',
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
const lossItem = payload.find((p) => p.theoryQty > p.actualQty)
|
||||
if (lossItem && !lossItem.lossReason) {
|
||||
ElMessage.warning('物料 ' + lossItem.materialCode + ' 实际退回少于理论应退,请填写损耗原因(可在表格行内补填后重试)')
|
||||
return
|
||||
}
|
||||
submitting.value = true
|
||||
try {
|
||||
await request.post('/transfer/returns', { stationNo: stationNo.value, items: payload })
|
||||
ElMessage.success('已按工单生成 ' + payload.length + ' 张退库单,请到 WMS 退库单页按工单确认收货')
|
||||
items.value = []
|
||||
} catch (e) {
|
||||
ElMessage.error('生成失败:' + (e?.message || e))
|
||||
} finally {
|
||||
submitting.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.mt { margin-top: 12px; }
|
||||
.ml { margin-left: 10px; }
|
||||
.wo-no { font-weight: 600; font-size: 15px; }
|
||||
.mc { color: #909399; font-size: 12px; margin-left: 6px; }
|
||||
.tip { color: #909399; font-size: 12px; }
|
||||
</style>
|
||||
@@ -9,6 +9,9 @@ const routes = [
|
||||
children: [
|
||||
{ path: '', redirect: '/work-order' },
|
||||
{ path: 'work-order', name: 'WorkOrder', component: () => import('../pages/WorkOrder.vue'), meta: { title: '工单管理' } },
|
||||
{ path: 'transfer-return', name: 'TransferReturn', component: () => import('../pages/TransferReturn.vue'), meta: { title: '转产退料' } },
|
||||
{ path: 'shortage', name: 'Shortage', component: () => import('../pages/Shortage.vue'), meta: { title: '补料管理' } },
|
||||
{ path: 'loss-ledger', name: 'LossLedger', component: () => import('../pages/LossLedger.vue'), meta: { title: '损耗台账' } },
|
||||
{ path: 'daily-plan', name: 'DailyPlan', component: () => import('../pages/DailyPlan.vue'), meta: { title: '日排产' } },
|
||||
{ path: 'producible-support', name: 'ProducibleSupport', component: () => import('../pages/ProducibleSupport.vue'), meta: { title: '排产支撑' } },
|
||||
{ path: 'material-request', name: 'MaterialRequest', component: () => import('../pages/MaterialRequest.vue'), meta: { title: '备料单' } },
|
||||
|
||||
Reference in New Issue
Block a user