Files
bj_power/bj_power_wms/frontend/src/components/InboundEntry.vue
T
SunYF af554cea75 feat: 同步失败台账双向可重试 + 拧紧枪按工位配置 + 虚拟工位体系 + 去Redis与文档口径对齐
- 同步失败台账:MES/WMS 双端新增台账与页面,跨系统通知失败落台账、人工重试或标记已处理,不自动重传;重试前先判对端终态;叫料、配送、出库回写失败提示指向台账;补幂等建表脚本与菜单权限。
- 拧紧枪:新增按工位配置页,展示控制器地址与三把枪通道号(仅供查看,不参与采集校验);「允许手填」由全局开关改为每工位开关,关闭时校验该工位已配控制器;终端启动/登录上报配置并按本工位拉取,扭矩手填框按本工位置灰;补全局值迁移到各工位的脚本。
- 工位体系:终端未配置工位号时登录页可选(含虚拟工位),固定工位模式保留;虚拟/线下位不叫料、不退料、不作转产目标,未采集绑定放行并说明原因;叫料期望接驳台改为选填。
- AGV与出库:补「出库单已送达」回写;空车回充、接驳台传感器失联、配送状态更新失败均落预警或留痕并提示人工核对;人工出库不引入送达状态;出库单支持目标工位/接驳台并扩展导出列。
- 基础设施:看板缓存由Redis改为MES进程内实现,文档与启动脚本同步去Redis;扫码监听支持多地址、端口被占自动降级;PLC对账与工位报警在MES不可达时降级放行并留日志。
- 文档与帮助:案例与部署手册按实测订正(工位绑定、菜单名称、补料由班组长代提、菜单覆盖对照、虚拟工位);迁移脚本改为本地即时执行并登记7个已执行脚本;三端页面帮助改为「业务/操作/影响范围/后果」四要素。
- 测试:新增独立Go模块,按三个业务场景做真实HTTP与真实写库的流水测试,含运行报告。
2026-11-09 18:58:47 +08:00

390 lines
18 KiB
Vue
Raw Blame History

This file contains invisible Unicode characters
This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
<script setup>
// InboundEntry 通用入库表单(入库管理三个类型页签复用)。
// 页签只对应物料档案「类型」(1结构件/2电气件/3其他,后端防呆一致才放行);
// 录入方式(批次数量 vs SN 逐件扫码)由所选物料的「序列号」(sn_mode)决定:
// 是(1)=序列号=是(按 SN 记账) → SN 扫码录入;否(2)=序列号=否(按批次记账) → 批次号+数量(2026-09-30 类型与序列号(sn_mode)解耦)。
defineOptions({ name: 'InboundEntry' })
import { computed, onMounted, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import axios from 'axios'
import request from '../utils/request'
import { getRealName, getToken } from '../utils/auth'
import MaterialSelect from './MaterialSelect.vue'
const props = defineProps({
manageMode: { type: Number, required: true } // 1结构件 / 2电气件 / 3其他
})
const emit = defineEmits(['submitted'])
const operator = getRealName()
const isOther = computed(() => props.manageMode === 3)
/* ---------- 产品工号软校验(B1):失焦异步查 MES 工单存在性,红字提示、不阻断保存 ---------- */
const workNoState = ref('') // ''=未校验 / ok / miss=查不到 / net=接口异常
let workNoSeq = 0
async function checkWorkNo() {
const v = form.productWorkNo.trim()
if (!v) { workNoState.value = ''; return }
const seq = ++workNoSeq
try {
const res = await axios.get('/api/workorder/exists', {
params: { orderNo: v },
headers: { Authorization: `Bearer ${getToken()}` },
validateStatus: () => true
})
if (seq !== workNoSeq) return // 已发起更新的校验,丢弃旧结果
workNoState.value = res.status === 200 ? 'ok' : (res.status === 404 ? 'miss' : 'net')
} catch {
if (seq === workNoSeq) workNoState.value = 'net'
}
}
/* ---------- 表单 ---------- */
const formRef = ref()
const submitting = ref(false)
const lastInboundNo = ref('')
const form = reactive({
inboundNo: '', materialCode: '', batchNo: '', quantity: 1,
zoneCode: '', shelfNo: '', layerNo: '', positionNo: '',
ownershipType: '', ownershipNo: '', productWorkNo: '',
productionDate: '', supplier: '', remark: '', inspectionNo: ''
})
const rules = {
materialCode: [{ required: true, message: '请选择物料', trigger: 'change' }],
zoneCode: [{ required: true, message: '请选择入库区域', trigger: 'change' }],
shelfNo: [{ validator: (r, v, cb) => {
if (!form.shelfNo || !form.layerNo || !form.positionNo) cb(new Error('货架/层/位置必填,不允许只填区域不填货架'))
else cb()
}, trigger: 'change' }],
inspectionNo: [{ required: true, message: '请填写检测单号', trigger: 'blur' }],
ownershipType: [{ required: true, message: '请选择归属类型', trigger: 'change' }],
ownershipNo: [{ validator: (r, v, cb) => { if ((form.ownershipType === 'workorder' || form.ownershipType === 'project') && !String(v || '').trim()) cb(new Error('请填写归属编号')); else cb() }, trigger: 'blur' }]
}
const material = ref(null) // 选中物料对象(含 snMode/spec)
const isSn = computed(() => Number(material.value?.snMode) === 1)
function onMaterialChange(item) {
material.value = item || null
}
/* ---------- 入库表单附件:提交前暂存,提交成功拿到入库单号后再挂到该单 ---------- */
const staged = ref([])
async function uploadStaged(inboundNo) {
const files = staged.value || []
if (!files.length || !inboundNo) return 0
let okCount = 0
for (const f of files) {
const raw = f.raw
if (!raw) continue
const fd = new FormData()
fd.append('file', raw)
fd.append('bizType', 'inbound')
fd.append('bizId', inboundNo)
try { await request.post('/attachments/upload', fd); okCount++ } catch { /* 忽略单个失败 */ }
}
staged.value = []
return okCount
}
/* ---------- 区域/库位字典(每个页签独立缓存,展开下拉时强制刷新取最新货位) ---------- */
const zones = ref([])
async function loadZones(force = false) {
if (!force && zones.value.length) return
const zs = await request.get('/zone/picker')
zones.value = Array.isArray(zs) ? zs : zs?.list || []
}
const zoneOptions = computed(() => {
const map = new Map()
zones.value.forEach(z => {
if (!z.zoneCode) return
if (!map.has(z.zoneCode)) map.set(z.zoneCode, { zoneCode: z.zoneCode, zoneName: z.zoneName || '' })
})
return [...map.values()]
})
function zoneShelves(zoneCode) {
const set = new Set()
zones.value.forEach(z => { if (z.zoneCode === zoneCode && z.shelfNo) set.add(z.shelfNo) })
return [...set].sort()
}
function zoneLayers(zoneCode, shelfNo) {
const set = new Set()
zones.value.forEach(z => { if (z.zoneCode === zoneCode && z.shelfNo === shelfNo && z.layerNo) set.add(z.layerNo) })
return [...set].sort()
}
function zonePositions(zoneCode, shelfNo, layerNo) {
const set = new Set()
zones.value.forEach(z => { if (z.zoneCode === zoneCode && z.shelfNo === shelfNo && z.layerNo === layerNo && z.positionNo) set.add(z.positionNo) })
return [...set].sort()
}
function onZoneChange() {
form.shelfNo = ''; form.layerNo = ''; form.positionNo = ''
if (form.materialCode) suggestVacant()
}
function onShelfChange() { form.layerNo = ''; form.positionNo = '' }
function onLayerChange() { form.positionNo = '' }
function onOwnershipChange() {
if (!form.ownershipType) form.ownershipNo = ''
}
// 选物料后自动带入最近一次入库库位;无历史则推荐同区空位(与原入库页口径一致)
watch(() => form.materialCode, (v) => { if (v) fillLastLocation() })
async function fillLastLocation() {
if (!form.materialCode) return
let filled = false
try {
const loc = await request.get('/inbound/last-location', { params: { materialCode: form.materialCode } })
if (loc && loc.zoneCode) {
form.zoneCode = loc.zoneCode
form.shelfNo = loc.shelfNo || ''
form.layerNo = loc.layerNo || ''
form.positionNo = loc.positionNo || ''
filled = true
}
} catch { /* 查询失败不影响主流程 */ }
if (!filled) await suggestVacant()
}
async function suggestVacant(notifyEmpty = false) {
try {
const v = await request.get('/zone/vacant', { params: { zoneCode: form.zoneCode || '', limit: 1 } })
const hit = Array.isArray(v) ? v[0] : null
if (!hit) {
if (notifyEmpty) ElMessage.info('当前区域暂无可推荐空位,请先在「基础数据 → 区域库位」中维护位置节点')
return false
}
form.zoneCode = hit.zoneCode
form.shelfNo = hit.shelfNo || ''
form.layerNo = hit.layerNo || ''
form.positionNo = hit.positionNo || ''
return true
} catch {
return false
}
}
/* ---------- SN 录入(序列号=是(按 SN 记账):isSn=true 时显示) ---------- */
const snInput = ref('')
const snList = ref([])
// 支持多种分隔符:中英文逗号、中英文句号、分号、顿号、空格、回车、制表符等
const SN_SEP = /[,,.。;;、\s]+/
function addSnLines() {
const lines = String(snInput.value).split(SN_SEP)
for (let raw of lines) {
const sn = raw.trim()
if (!sn) continue
if (snList.value.includes(sn)) continue
snList.value.push(sn)
}
snInput.value = ''
}
function removeSn(index) {
snList.value.splice(index, 1)
}
/* ---------- 提交 ---------- */
async function submit() {
const res = await formRef.value.validate().then(() => null).catch((f) => f)
if (res) {
const first = Object.values(res || {})[0]?.[0]?.message
ElMessage.warning(first || '请检查必填项后再提交')
return
}
if (isOther.value && material.value && !String(material.value.spec || '').trim()) {
ElMessage.warning('该其他类物料未填写规格型号,请先到物料档案补全')
return
}
if (isSn.value && !snList.value.length) {
ElMessage.warning('该物料为序列号=是(按 SN 记账),请先扫码录入序列号')
return
}
if (!isSn.value && (!form.quantity || form.quantity <= 0)) {
ElMessage.warning('数量必须大于 0')
return
}
const confirmMsg = isSn.value
? '确认入库:物料 ' + form.materialCode + '|SN ' + snList.value.length + ' 件|区域 ' + form.zoneCode + '?'
: '确认入库:物料 ' + form.materialCode + '|批次 ' + form.batchNo + '|数量 ' + form.quantity + '|区域 ' + form.zoneCode + '?'
try {
await ElMessageBox.confirm(confirmMsg, '入库提交确认', { type: 'warning' })
} catch { return }
submitting.value = true
try {
const payload = {
inboundNo: form.inboundNo.trim(),
inboundType: isOther.value ? 'other' : 'purchase',
manageMode: props.manageMode, // 后端防呆:与物料档案类型不一致时拒绝
materialCode: form.materialCode,
zoneCode: form.zoneCode,
shelfNo: form.shelfNo.trim(),
layerNo: form.layerNo.trim(),
positionNo: form.positionNo.trim(),
ownershipType: form.ownershipType,
ownershipNo: form.ownershipNo.trim(),
productWorkNo: form.productWorkNo.trim(),
remark: form.remark.trim(),
inspectionNo: form.inspectionNo.trim(),
operator
}
if (isSn.value) {
payload.snList = [...snList.value]
} else {
payload.batchNo = form.batchNo.trim()
payload.quantity = form.quantity
payload.productionDate = form.productionDate
payload.supplier = form.supplier.trim()
}
const data = await request.post('/inbound/create', payload)
lastInboundNo.value = data?.inboundNo || ''
const qtyText = isSn.value ? `序列号共 ${snList.value.length} 条` : `数量 ${data?.quantity ?? form.quantity}`
ElMessage.success(`入库成功:入库单号 ${lastInboundNo.value},${qtyText}`)
const att = await uploadStaged(lastInboundNo.value)
if (att) ElMessage.success(`已挂载 ${att} 个附件`)
if (isSn.value) {
snList.value = []
snInput.value = ''
} else {
form.batchNo = ''
form.quantity = 1
}
emit('submitted')
} finally {
submitting.value = false
}
}
onMounted(() => loadZones())
</script>
<template>
<el-card shadow="never">
<div style="margin-bottom:10px;color:#909399;font-size:12px">
录入方式由所选物料的「序列号」决定:<b>序列号=是(按序列号记账)</b>=逐件扫码;<b>序列号=否(按批次记账)</b>=批次号+数量。
<template v-if="isOther">其他入库用于辅料/螺栓/工装/试验设备等,<b>规格型号强制</b>(在物料档案维护)。</template>
</div>
<el-alert v-if="form.materialCode && !material" type="warning" :closable="false" style="max-width:620px;margin-bottom:10px"
title="未获取到物料档案信息,请重新选择物料" />
<el-form ref="formRef" :model="form" :rules="rules" label-width="110px" style="max-width:620px">
<el-form-item label="物料" prop="materialCode">
<el-tooltip content="请选择物料;若列表中找不到所需物料,请先到「物料档案」新增" placement="top" :append-to-body="true">
<div style="width:100%">
<MaterialSelect v-model="form.materialCode" :manage-mode="manageMode"
:placeholder="isOther ? '选择其他类物料(辅料/工装/试验设备)' : '选择物料'"
@item-change="onMaterialChange" />
</div>
</el-tooltip>
<div v-if="material" style="color:#909399;font-size:12px;margin-top:2px">
序列号:<el-tag size="small" :type="isSn ? 'warning' : 'success'">{{ isSn ? '是' : '否' }}</el-tag>
</div>
</el-form-item>
<el-form-item v-if="isOther" label="规格型号">
<el-input :model-value="material?.spec || ''" placeholder="自动带出物料档案规格" disabled />
</el-form-item>
<!-- 序列号=否(按批次记账,sn_mode=否):批次号 + 数量;生产日期仅结构件页签展示,供应商结构件/其他展示 -->
<template v-if="!isSn">
<!-- 批次号改为系统内部编号(留空自动生成),录入界面不再出现(C1) -->
<el-form-item label="数量" required>
<el-input-number v-model="form.quantity" :min="1" :step="1" step-strictly style="width:100%" />
</el-form-item>
<el-form-item v-if="manageMode === 1" label="生产日期">
<el-date-picker v-model="form.productionDate" type="date" value-format="YYYY-MM-DD"
placeholder="选择生产日期" style="width:100%" />
</el-form-item>
<el-form-item v-if="manageMode !== 2" label="供应商">
<el-input v-model="form.supplier" placeholder="供应商名称(可空)" clearable />
</el-form-item>
</template>
<el-form-item label="区域" prop="zoneCode">
<el-select v-model="form.zoneCode" placeholder="请选择入库区域(必填)" clearable style="width:100%"
@change="onZoneChange" @visible-change="(v) => v && loadZones(true)">
<el-option v-for="z in zoneOptions" :key="z.zoneCode" :value="z.zoneCode"
:label="`${z.zoneCode} ${z.zoneName || ''}`" />
</el-select>
</el-form-item>
<el-form-item label="库位" prop="shelfNo">
<div style="display:flex;gap:6px;flex-wrap:wrap;align-items:center">
<el-select v-model="form.shelfNo" placeholder="货架" clearable style="width:120px" @change="onShelfChange">
<el-option v-for="s in zoneShelves(form.zoneCode)" :key="s" :label="s + ' 架'" :value="s" />
</el-select>
<el-select v-model="form.layerNo" placeholder="层" clearable style="width:100px" :disabled="!form.shelfNo" @change="onLayerChange">
<el-option v-for="l in zoneLayers(form.zoneCode, form.shelfNo)" :key="l" :label="l + ' 层'" :value="l" />
</el-select>
<el-select v-model="form.positionNo" placeholder="位置" clearable style="width:170px" :disabled="!form.shelfNo">
<el-option v-for="p in zonePositions(form.zoneCode, form.shelfNo, form.layerNo)" :key="p" :label="`${p}(${form.zoneCode}-${form.shelfNo}-${form.layerNo}-${p})`" :value="p" />
</el-select>
</div>
<div style="color:#909399;font-size:12px;margin-top:2px">选择物料后自动带入该物料最近一次入库库位,可手动修改;货架/层/位置均必填</div>
</el-form-item>
<el-form-item label="归属" prop="ownershipType">
<el-select v-model="form.ownershipType" placeholder="请选择" style="width:160px;margin-right:8px" @change="onOwnershipChange">
<el-option label="合同号" value="workorder" />
<el-option label="科技项目号" value="project" />
<el-option label="其他" value="other" />
</el-select>
<el-form-item label-width="0" prop="ownershipNo" style="margin-bottom:0">
<el-input v-if="form.ownershipType" v-model="form.ownershipNo"
placeholder="请填写归属编号" clearable style="width:260px" />
</el-form-item>
</el-form-item>
<el-form-item label="产品工号">
<div style="width:100%">
<el-input v-model="form.productWorkNo" placeholder="手填(可空)" clearable style="width:260px"
@blur="checkWorkNo" @clear="checkWorkNo" />
<div v-if="workNoState === 'miss'" style="color:#f56c6c;font-size:12px;line-height:1.6">未找到对应的工单,请确认产品工号是否正确</div>
<div v-else-if="workNoState === 'net'" style="color:#f56c6c;font-size:12px;line-height:1.6">网络异常,未能校验工单号,请稍后确认</div>
</div>
</el-form-item>
<el-form-item label="入库单号">
<el-input v-model="form.inboundNo" placeholder="留空自动生成(如 IB20260921-001)" clearable />
</el-form-item>
<el-form-item label="检测单号" prop="inspectionNo">
<el-input v-model="form.inspectionNo" placeholder="入库检报告单号(必填)" clearable />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="备注(可空)" clearable />
</el-form-item>
<el-form-item label="附件">
<el-upload v-model:file-list="staged" :auto-upload="false" multiple :limit="10"
accept=".pdf,.png,.jpg,.jpeg,.gif,.xlsx,.xls,.doc,.docx,.dwg,.dxf,.zip,.txt,.csv">
<el-button plain>选择附件</el-button>
<template #tip>
<div style="color:#909399;font-size:12px">提交成功后自动挂到该入库单,可在「入库记录」查看</div>
</template>
</el-upload>
</el-form-item>
<el-form-item v-if="!isSn">
<el-button type="primary" :loading="submitting" @click="submit">提交入库</el-button>
</el-form-item>
</el-form>
<el-alert v-if="lastInboundNo" type="success" :closable="false"
:title="`最近入库单号:${lastInboundNo}`" style="max-width:620px" />
<!-- SN 录入区 + 已录入清单(序列号=是(按 SN 记账):扫码区与已录入计数上下相邻,不隔其他内容) -->
<template v-if="isSn">
<el-card shadow="never" style="max-width:620px;margin-bottom:12px">
<div style="font-weight:600;margin-bottom:6px">序列号扫码录入</div>
<el-input v-model="snInput" type="textarea" :rows="4"
placeholder="扫入或粘贴序列号,可用 逗号/分号/顿号/空格/回车 分隔,一次可录入多条" />
<el-button type="primary" plain style="margin-top:6px" :disabled="!snInput.trim()"
@click="addSnLines">录入到列表</el-button>
<span style="margin-left:8px;color:#909399;font-size:12px">点【录入到列表】加入下方清单,回车只是换行</span>
</el-card>
<div style="margin:8px 0">已录入 <b>{{ snList.length }}</b> 条序列号</div>
<el-table :data="snList.map((v, i) => ({ i, v }))" size="small" border max-height="320" empty-text="暂无序列号" style="max-width:620px">
<el-table-column type="index" label="#" width="56" align="center" />
<el-table-column prop="v" label="序列号" min-width="220" />
<el-table-column label="操作" width="90" align="center">
<template #default="{ row }">
<el-button link type="danger" size="small" @click="removeSn(row.i)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div style="margin-top:12px">
<el-button type="primary" :loading="submitting" @click="submit">提交入库</el-button>
<el-button @click="snList = []">清空列表</el-button>
</div>
</template>
</el-card>
</template>