SunYF/bj_power
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(mes): 添加定时同步可生产数量到WMS及BOM项相关标准字段

Browse Source 
- 在main.go中添加定时任务每10分钟同步可生产数量到WMS系统
- 为BomItem实体添加relatedStandard字段及相关CRUD方法
- 为InspectionRecord实体添加reportNo、materialCode、materialName等字段
- 更新ent schema确保新字段的验证和默认值设置
- 添加必要的数据库迁移和字段映射逻辑
This commit is contained in:
SunYF
2026-09-17 12:49:07 +08:00
parent b4b274301d
commit 1cc93795ce
191 changed files with 24504 additions and 1250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bj_power_wms/frontend/src/pages/Semi.vue
+305 -77
View File
@@ -16,88 +16,146 @@ function openAttach(row) {
Object.assign(attachDrawer, { visible: true, sn: row.sn })
}
/* ---------- 半成品/成品入库（携带已完成工序，连续扫码） ---------- */
// 物料下拉由 MaterialSelect 组件按需远程搜索（最近 100 条）
onMounted(() => {
loadList()
})
/* ---------- 半成品/成品入库 ----------
* 客户诉求 问题记录 L222：半成品与成品入库要区分（category 2/3）；
* L218 成品入库 9 字段：SN/图号/归属/产品状态/相关标准/试验记录单号/记录员/记录日期/工单号。 */
const operator = getRealName()
const todayStr = new Date().toLocaleDateString('sv-SE')
const inForm = reactive({ materialCode: '', zoneCode: '', orderNo: '', completedProcess: '' })
const snInput = ref('')
const snList = ref([])
const inbounding = ref(false)
function addSnLines() {
for (let raw of String(snInput.value).split(/\s+/)) {
const sn = raw.trim()
if (sn && !snList.value.includes(sn)) snList.value.push(sn)
function newInForm() {
return {
materialCode: '', zoneCode: '', orderNo: '', completedProcess: '',
ownershipType: 'workorder', ownershipNo: '',
productStatus: '', relatedStandard: '', testRecordNo: '',
recordedBy: operator, recordedAt: todayStr
}
snInput.value = ''
}
// inForms[2]=半成品入库表单，inForms[3]=成品入库表单
const inForms = reactive({ 2: newInForm(), 3: newInForm() })
const snInputs = reactive({ 2: '', 3: '' })
const snLists = reactive({ 2: [], 3: [] })
const inbounding = reactive({ 2: false, 3: false })
function addSnLines(cat) {
for (let raw of String(snInputs[cat]).split(/\s+/)) {
const sn = raw.trim()
if (sn && !snLists[cat].includes(sn)) snLists[cat].push(sn)
}
snInputs[cat] = ''
}
function removeSn(i) {
snList.value.splice(i, 1)
function removeSn(cat, i) {
snLists[cat].splice(i, 1)
}
async function submitInbound() {
if (!inForm.materialCode) {
async function submitInbound(cat) {
const f = inForms[cat]
const label = cat === 3 ? '成品' : '半成品'
if (!f.materialCode) {
ElMessage.warning('请选择物料')
return
}
if (!snList.value.length) {
if (!snLists[cat].length) {
ElMessage.warning('请扫码录入 SN（回车追加）')
return
}
inbounding.value = true
if (cat === 3 && !f.productStatus) {
ElMessage.warning('成品入库请选择产品状态（已通过/部分通过/返修）')
return
}
inbounding[cat] = true
let ok = 0
try {
for (const sn of snList.value) {
const recordedAt = f.recordedAt ? Math.floor(new Date(f.recordedAt + 'T00:00:00').getTime() / 1000) : 0
for (const sn of snLists[cat]) {
try {
await request.post('/semi/inbound', {
sn,
materialCode: inForm.materialCode,
completedProcess: inForm.completedProcess.trim(),
zoneCode: inForm.zoneCode || undefined,
orderNo: inForm.orderNo.trim() || undefined,
operator
materialCode: f.materialCode,
completedProcess: f.completedProcess.trim(),
zoneCode: f.zoneCode || undefined,
orderNo: f.orderNo.trim() || undefined,
operator,
category: cat,
ownershipType: f.ownershipType,
ownershipNo: f.ownershipNo.trim() || undefined,
productStatus: f.productStatus || undefined,
relatedStandard: f.relatedStandard.trim() || undefined,
testRecordNo: f.testRecordNo.trim() || undefined,
recordedBy: f.recordedBy.trim() || undefined,
recordedAt: recordedAt || undefined
})
ok++
} catch { /* 单条失败不中断后续 */ }
}
ElMessage.success(`半成品入库完成：成功 ${ok} / ${snList.value.length} 条`)
snList.value = []
snInput.value = ''
ElMessage.success(`${label}入库完成：成功 ${ok} / ${snLists[cat].length} 条`)
snLists[cat] = []
snInputs[cat] = ''
loadList()
} finally {
inbounding.value = false
inbounding[cat] = false
}
}
/* ---------- 半成品出库（重上线） ---------- */
const outForm = reactive({ sn: '' })
const outbounding = ref(false)
/* ---------- 半成品/成品出库（扫SN带出 + 出库原因按钮，客户诉求 L224） ---------- */
const outReasons = ['包装', '继续生产', '检验试验', '其他']
// outForms[2]=半成品出库，outForms[3]=成品出库
const outForms = reactive({ 2: { sn: '', info: null, reason: '' }, 3: { sn: '', info: null, reason: '' } })
const outbounding = reactive({ 2: false, 3: false })
async function submitOutbound() {
const sn = outForm.sn.trim()
// 扫 SN 回车：带出该件信息（物料/已完成工序/工单/归属），再点原因按钮出库
async function scanSn(cat) {
const f = outForms[cat]
const sn = f.sn.trim()
if (!sn) return
f.info = null
f.reason = ''
try {
const data = await request.get('/semi/query', { params: { sn, category: cat, page: 1, pageSize: 5 } })
const hit = (data?.list || []).find((r) => r.sn === sn)
if (!hit) {
ElMessage.warning(`未找到该 SN 的${cat === 3 ? '成品' : '半成品'}记录`)
return
}
if (hit.status !== '在库') {
ElMessage.warning(`该 SN 当前状态为「${hit.status}」，不可出库`)
return
}
f.info = hit
} catch { /* request 已统一提示 */ }
}
async function submitOutbound(cat) {
const f = outForms[cat]
const label = cat === 3 ? '成品' : '半成品'
const sn = f.sn.trim()
if (!sn) {
ElMessage.warning('请输入 SN')
ElMessage.warning('请扫描或输入 SN')
return
}
outbounding.value = true
if (!f.reason) {
ElMessage.warning('请选择出库原因')
return
}
if (f.reason === '其他') {
ElMessage.warning('出库原因为「其他」时，请在备注式说明后重试（当前按所选原因提交）')
}
outbounding[cat] = true
try {
await request.post('/semi/outbound', { sn, operator })
ElMessage.success(`半成品出库成功：${sn}`)
outForm.sn = ''
await request.post('/semi/outbound', { sn, operator, reason: f.reason, category: cat })
ElMessage.success(`${label}出库成功：${sn}（${f.reason}）`)
f.sn = ''
f.info = null
f.reason = ''
await loadList()
} finally {
outbounding.value = false
outbounding[cat] = false
}
}
/* ---------- 半成品查询 ---------- */
const qForm = reactive({ materialCode: '', status: '' })
/* ---------- 半成品/成品查询（L230 加归属；L222 品类筛选） ---------- */
const qForm = reactive({ materialCode: '', status: '', sn: '', ownershipNo: '', category: '' })
const list = ref([])
const total = ref(0)
const loading = ref(false)
@@ -110,6 +168,9 @@ async function loadList() {
params: {
materialCode: qForm.materialCode.trim(),
status: qForm.status,
sn: qForm.sn.trim(),
ownershipNo: qForm.ownershipNo.trim(),
category: qForm.category || undefined,
page: page.current,
pageSize: page.size
}
@@ -125,73 +186,221 @@ function search() {
page.current = 1
loadList()
}
onMounted(() => {
loadList()
})
</script>
<template>
<el-card shadow="never">
<el-tabs>
<el-tab-pane label="半成品/成品入库">
<!-- ============ 半成品入库 ============ -->
<el-tab-pane label="半成品入库">
<el-form label-width="110px" style="max-width:680px">
<el-form-item label="物料">
<MaterialSelect v-model="inForm.materialCode" placeholder="选择物料编码" />
<MaterialSelect v-model="inForms[2].materialCode" placeholder="选择物料（图号/名称搜索）" />
</el-form-item>
<el-form-item label="已完成工序">
<el-input v-model="inForm.completedProcess" placeholder="如：1,3,5（可空）" clearable />
<el-input v-model="inForms[2].completedProcess" placeholder="如：1,3,5（可空）" clearable />
</el-form-item>
<el-form-item label="工单号">
<el-input v-model="inForm.orderNo" placeholder="来源工单号（可空）" clearable />
<el-input v-model="inForms[2].orderNo" placeholder="来源工单号（可空）" clearable />
</el-form-item>
<el-form-item label="归属">
<div style="display:flex;gap:8px;width:100%">
<el-select v-model="inForms[2].ownershipType" style="width:150px">
<el-option value="workorder" label="工单号" />
<el-option value="project" label="科技项目号" />
<el-option value="none" label="无" />
</el-select>
<el-input v-model="inForms[2].ownershipNo" placeholder="归属编号（可空）" clearable />
</div>
</el-form-item>
<el-form-item label="相关标准">
<el-input v-model="inForms[2].relatedStandard" placeholder="检验细则/试验方案号（可空）" clearable />
</el-form-item>
<el-form-item label="试验记录单号">
<el-input v-model="inForms[2].testRecordNo" placeholder="可空" clearable />
</el-form-item>
<el-form-item label="记录员">
<el-input v-model="inForms[2].recordedBy" placeholder="记录员" clearable />
</el-form-item>
<el-form-item label="记录日期">
<el-date-picker v-model="inForms[2].recordedAt" type="date" value-format="YYYY-MM-DD" style="width:100%" />
</el-form-item>
<el-form-item label="区域">
<el-input v-model="inForm.zoneCode" placeholder="库区（可空）" clearable />
<el-input v-model="inForms[2].zoneCode" placeholder="库区（可空）" clearable />
</el-form-item>
<el-form-item label="操作人">
<el-input :model-value="operator" disabled />
</el-form-item>
<el-form-item label="扫码录入">
<el-input v-model="snInput" type="textarea" :rows="3" autofocus
<el-input v-model="snInputs[2]" type="textarea" :rows="3" autofocus
placeholder="连续扫描 SN，每次回车追加（可一次多条，空白分隔）"
@keydown.enter.prevent="addSnLines" />
@keydown.enter.prevent="addSnLines(2)" />
</el-form-item>
</el-form>
<div style="margin-bottom:8px">待入库 SN：<b>{{ snList.length }}</b> 条</div>
<el-table :data="snList.map((v, i) => ({ i, v }))" size="small" border max-height="260"
<div style="margin-bottom:8px">待入库 SN：<b>{{ snLists[2].length }}</b> 条</div>
<el-table :data="snLists[2].map((v, i) => ({ i, v }))" size="small" border max-height="220"
empty-text="暂无 SN" style="max-width:760px">
<el-table-column type="index" label="#" width="56" align="center" />
<el-table-column prop="v" label="SN 序列号" min-width="220" />
<el-table-column label="操作" width="80" align="center">
<template #default="{ row }">
<el-button link type="danger" size="small" @click="removeSn(row.i)">移除</el-button>
<el-button link type="danger" size="small" @click="removeSn(2, row.i)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div style="margin-top:12px">
<el-button type="primary" :loading="inbounding" @click="submitInbound">提交入库</el-button>
<el-button @click="snList = []">清空</el-button>
<el-button type="primary" :loading="inbounding[2]" @click="submitInbound(2)">提交半成品入库</el-button>
<el-button @click="snLists[2] = []">清空</el-button>
</div>
</el-tab-pane>
<el-tab-pane label="半成品出库">
<el-form label-width="110px" style="max-width:560px" @submit.prevent="submitOutbound">
<el-form-item label="SN">
<el-input v-model="outForm.sn" placeholder="扫描或输入 SN，回车出库" clearable autofocus
@keyup.enter="submitOutbound" />
<!-- ============ 成品入库 ============ -->
<el-tab-pane label="成品入库">
<el-form label-width="110px" style="max-width:680px">
<el-form-item label="物料">
<MaterialSelect v-model="inForms[3].materialCode" placeholder="选择物料（图号/名称搜索）" />
</el-form-item>
<el-form-item label="产品状态">
<el-radio-group v-model="inForms[3].productStatus">
<el-radio-button value="已通过">已通过</el-radio-button>
<el-radio-button value="部分通过">部分通过</el-radio-button>
<el-radio-button value="返修">返修</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="工单号">
<el-input v-model="inForms[3].orderNo" placeholder="来源工单号（可空）" clearable />
</el-form-item>
<el-form-item label="归属">
<div style="display:flex;gap:8px;width:100%">
<el-select v-model="inForms[3].ownershipType" style="width:150px">
<el-option value="workorder" label="工单号" />
<el-option value="project" label="科技项目号" />
<el-option value="none" label="无" />
</el-select>
<el-input v-model="inForms[3].ownershipNo" placeholder="归属编号（可空）" clearable />
</div>
</el-form-item>
<el-form-item label="相关标准">
<el-input v-model="inForms[3].relatedStandard" placeholder="检验细则/试验方案号（可空）" clearable />
</el-form-item>
<el-form-item label="试验记录单号">
<el-input v-model="inForms[3].testRecordNo" placeholder="可空" clearable />
</el-form-item>
<el-form-item label="记录员">
<el-input v-model="inForms[3].recordedBy" placeholder="记录员" clearable />
</el-form-item>
<el-form-item label="记录日期">
<el-date-picker v-model="inForms[3].recordedAt" type="date" value-format="YYYY-MM-DD" style="width:100%" />
</el-form-item>
<el-form-item label="区域">
<el-input v-model="inForms[3].zoneCode" placeholder="库区（可空）" clearable />
</el-form-item>
<el-form-item label="操作人">
<el-input :model-value="operator" disabled />
</el-form-item>
<el-form-item label="扫码录入">
<el-input v-model="snInputs[3]" type="textarea" :rows="3"
placeholder="连续扫描 SN，每次回车追加（可一次多条，空白分隔）"
@keydown.enter.prevent="addSnLines(3)" />
</el-form-item>
</el-form>
<div style="margin-bottom:8px">待入库 SN：<b>{{ snLists[3].length }}</b> 条</div>
<el-table :data="snLists[3].map((v, i) => ({ i, v }))" size="small" border max-height="220"
empty-text="暂无 SN" style="max-width:760px">
<el-table-column type="index" label="#" width="56" align="center" />
<el-table-column prop="v" label="SN 序列号" min-width="220" />
<el-table-column label="操作" width="80" align="center">
<template #default="{ row }">
<el-button link type="danger" size="small" @click="removeSn(3, row.i)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div style="margin-top:12px">
<el-button type="primary" :loading="inbounding[3]" @click="submitInbound(3)">提交成品入库</el-button>
<el-button @click="snLists[3] = []">清空</el-button>
</div>
</el-tab-pane>
<!-- ============ 半成品出库 ============ -->
<el-tab-pane label="半成品出库">
<el-form label-width="110px" style="max-width:680px" @submit.prevent>
<el-form-item label="SN">
<el-input v-model="outForms[2].sn" placeholder="扫描或输入 SN，回车带出信息" clearable autofocus
@keyup.enter="scanSn(2)" />
</el-form-item>
</el-form>
<el-alert v-if="outForms[2].info" type="info" :closable="false" style="max-width:680px;margin-bottom:12px">
<div>图号：<b>{{ outForms[2].info.materialCode || '-' }}</b>　名称：{{ outForms[2].info.materialName || '-' }}</div>
<div>已完成工序：{{ outForms[2].info.completedProcess || '-' }}　工单号：{{ outForms[2].info.orderNo || '-' }}　归属：{{ outForms[2].info.ownershipNo || '-' }}</div>
</el-alert>
<el-form label-width="110px" style="max-width:680px">
<el-form-item label="出库原因">
<el-radio-group v-model="outForms[2].reason">
<el-radio-button v-for="r in outReasons" :key="r" :value="r">{{ r }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="操作人">
<el-input :model-value="operator" disabled style="max-width:300px" />
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="outbounding" @click="submitOutbound">出库（重上线）</el-button>
<el-button type="primary" :loading="outbounding[2]" :disabled="!outForms[2].info"
@click="submitOutbound(2)">半成品出库</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
<!-- ============ 成品出库 ============ -->
<el-tab-pane label="成品出库">
<el-form label-width="110px" style="max-width:680px" @submit.prevent>
<el-form-item label="SN">
<el-input v-model="outForms[3].sn" placeholder="扫描或输入 SN，回车带出信息" clearable
@keyup.enter="scanSn(3)" />
</el-form-item>
</el-form>
<el-alert v-if="outForms[3].info" type="info" :closable="false" style="max-width:680px;margin-bottom:12px">
<div>图号：<b>{{ outForms[3].info.materialCode || '-' }}</b>　名称：{{ outForms[3].info.materialName || '-' }}　产品状态：{{ outForms[3].info.productStatus || '-' }}</div>
<div>工单号：{{ outForms[3].info.orderNo || '-' }}　归属：{{ outForms[3].info.ownershipNo || '-' }}　试验记录单号：{{ outForms[3].info.testRecordNo || '-' }}</div>
</el-alert>
<el-form label-width="110px" style="max-width:680px">
<el-form-item label="出库原因">
<el-radio-group v-model="outForms[3].reason">
<el-radio-button v-for="r in outReasons" :key="r" :value="r">{{ r }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="操作人">
<el-input :model-value="operator" disabled style="max-width:300px" />
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="outbounding[3]" :disabled="!outForms[3].info"
@click="submitOutbound(3)">成品出库</el-button>
</el-form-item>
</el-form>
</el-tab-pane>
<!-- ============ 查询 ============ -->
<el-tab-pane label="半成品/成品查询">
<el-form inline @submit.prevent="search">
<el-form-item label="物料编码">
<el-input v-model="qForm.materialCode" placeholder="物料编码" clearable style="width:200px" />
<el-form-item label="品类">
<el-select v-model="qForm.category" clearable placeholder="全部" style="width:110px">
<el-option :value="2" label="半成品" />
<el-option :value="3" label="成品" />
</el-select>
</el-form-item>
<el-form-item label="SN">
<el-input v-model="qForm.sn" placeholder="SN（模糊）" clearable style="width:160px" />
</el-form-item>
<el-form-item label="图号">
<el-input v-model="qForm.materialCode" placeholder="图号" clearable style="width:160px" />
</el-form-item>
<el-form-item label="归属单号">
<el-input v-model="qForm.ownershipNo" placeholder="工单号/科技项目号" clearable style="width:160px" />
</el-form-item>
<el-form-item label="状态">
<el-select v-model="qForm.status" clearable placeholder="请选择状态" style="width:120px">
<el-select v-model="qForm.status" clearable placeholder="请选择状态" style="width:110px">
<el-option value="在库" label="在库" />
<el-option value="出库" label="出库" />
</el-select>
@@ -201,27 +410,46 @@ function search() {
</el-form-item>
</el-form>
<el-table :data="list" border size="small" v-loading="loading" empty-text="暂无记录">
<el-table-column prop="id" label="ID" width="70" align="center" />
<el-table-column prop="sn" label="SN" min-width="200" />
<el-table-column prop="materialCode" label="物料编码" min-width="140" />
<el-table-column prop="completedProcess" label="已完成工序" min-width="120">
<el-table-column prop="id" label="ID" width="64" align="center" />
<el-table-column label="品类" width="80" align="center">
<template #default="{ row }">
<el-tag :type="row.category === 3 ? 'warning' : 'primary'" size="small">
{{ row.category === 3 ? '成品' : '半成品' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="sn" label="SN" min-width="170" />
<el-table-column prop="materialCode" label="图号" min-width="130" />
<el-table-column prop="materialName" label="名称" min-width="120">
<template #default="{ row }">{{ row.materialName || '-' }}</template>
</el-table-column>
<el-table-column prop="completedProcess" label="已完成工序" min-width="100">
<template #default="{ row }">{{ row.completedProcess || '-' }}</template>
</el-table-column>
<el-table-column prop="zoneCode" label="区域" width="90" align="center">
<el-table-column prop="ownershipNo" label="归属单号" min-width="120">
<template #default="{ row }">{{ row.ownershipNo || '-' }}</template>
</el-table-column>
<el-table-column prop="productStatus" label="产品状态" width="90" align="center">
<template #default="{ row }">{{ row.productStatus || '-' }}</template>
</el-table-column>
<el-table-column prop="zoneCode" label="区域" width="80" align="center">
<template #default="{ row }">{{ row.zoneCode || '-' }}</template>
</el-table-column>
<el-table-column prop="status" label="状态" width="90" align="center">
<el-table-column prop="status" label="状态" width="80" align="center">
<template #default="{ row }">
<el-tag :type="row.status === '在库' ? 'success' : 'info'" size="small">{{ row.status }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="orderNo" label="工单号" min-width="140">
<el-table-column prop="outboundReason" label="出库原因" width="90" align="center">
<template #default="{ row }">{{ row.outboundReason || '-' }}</template>
</el-table-column>
<el-table-column prop="orderNo" label="工单号" min-width="120">
<template #default="{ row }">{{ row.orderNo || '-' }}</template>
</el-table-column>
<el-table-column label="创建时间" width="160" align="center">
<el-table-column label="创建时间" width="150" align="center">
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
</el-table-column>
<el-table-column label="操作" width="90" align="center" fixed="right">
<el-table-column label="操作" width="80" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="success" size="small" @click="openAttach(row)">附件</el-button>
</template>
@@ -237,7 +465,7 @@ function search() {
</el-card>
<!-- 半成品/成品附件抽屉（bizType=semi，bizId=SN）：入库资料 / 试验记录单 -->
<el-drawer v-model="attachDrawer.visible" :title="`半成品附件：${attachDrawer.sn}`" size="620px">
<el-drawer v-model="attachDrawer.visible" :title="`半成品/成品附件：${attachDrawer.sn}`" size="620px">
<AttachmentPanel biz-type="semi" :biz-id="attachDrawer.sn" title="附件（入库资料 / 试验记录）" />
</el-drawer>
<PageHelp :data="helpSemi" page="Semi" />
@@ -245,4 +473,4 @@ function search() {
<style scoped>
.pager { display: flex; justify-content: flex-end; margin-top: 10px; }
</style>
</style>