feat: 来料检处置项实体与复检、日排产达成对比、PLC/WMS 传输日志
- WMS 新增「检验处置项」实体(schema + ent 生成码),配套检验记录实体调整与复检接口,完善来料检/不良退货/入库检验前端 - MES 日排产:新增达成率统计与计划对比逻辑,调整日排产前端与流程卡/工序流 - 日志与传输:MES 新增 PLC 日志与 WMS 客户端传输日志,WMS 新增 MES 客户端传输日志 - MES 其他:扫码、工单/工件、AGV 客户端与告警、产品导入等逻辑完善及前端调整 - 工位终端:上线面板/作业面板、工件 handler 与 MES 客户端调整 - 配置与文档:更新 mes-api.yaml、三端构建产物与问题记录文档
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
<el-form-item label="执行状态">
|
||||
<el-select v-model="query.status" style="width:170px" placeholder="请选择状态" @change="load">
|
||||
<el-option label="全部" value="all" />
|
||||
<el-option label="未完成(排除已完成/已取消)" value="active" />
|
||||
<el-option label="未完成" value="active" />
|
||||
<el-option label="未启用" value="PENDING" />
|
||||
<el-option label="已启用" value="CONFIRMED" />
|
||||
<el-option label="执行中" value="PROCESSING" />
|
||||
@@ -58,6 +58,7 @@
|
||||
<el-button type="primary" @click="load">查询</el-button>
|
||||
<el-button @click="resetFilters">重置</el-button>
|
||||
<el-button @click="openCompare">对比</el-button>
|
||||
<el-button @click="openAttain">计划vs实际</el-button>
|
||||
<el-button v-if="can('produce.workorder:dailyplan')" type="success" @click="openAdd()">新建排产</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -303,6 +304,31 @@
|
||||
计划合计:<b>{{ compare.summary.planTotal ?? 0 }}</b> 完成合计:<b>{{ compare.summary.doneTotal ?? 0 }}</b> 差异合计:<b>{{ compare.summary.diffTotal ?? 0 }}</b> 工单数:<b>{{ compare.summary.orderCount ?? 0 }}</b>
|
||||
</div>
|
||||
</el-drawer>
|
||||
<!-- 计划vs实际(2026-11-16 死结6:完工流水汇聚,不建新表) -->
|
||||
<el-drawer v-model="attain.show" title="计划 vs 实际(按完工流水汇聚)" size="62%">
|
||||
<div style="margin-bottom:12px;display:flex;align-items:center;gap:12px;flex-wrap:wrap">
|
||||
<el-date-picker v-model="attain.range" type="daterange" value-format="YYYY-MM-DD" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:260px" @change="loadAttain" />
|
||||
<el-button type="primary" @click="loadAttain">查询</el-button>
|
||||
<el-button @click="exportAttain">导出</el-button>
|
||||
<span style="color:#909399;font-size:12px">实际完成=完工流水(与生产流程卡同源)按天聚合;负差异=欠产</span>
|
||||
</div>
|
||||
<el-table :data="attain.items" border size="small" v-loading="attain.loading" empty-text="该日期范围暂无数据">
|
||||
<el-table-column prop="date" label="日期" width="120" />
|
||||
<el-table-column prop="orderNo" label="工单号(产品工号)" min-width="150" />
|
||||
<el-table-column prop="planQty" label="计划数量" width="100" />
|
||||
<el-table-column prop="doneQty" label="实际完成" width="100" />
|
||||
<el-table-column prop="diff" label="差异" width="90">
|
||||
<template #default="{ row }">
|
||||
<span :style="row.diff < 0 ? 'color:#f56c6c' : row.diff > 0 ? 'color:#67c23a' : ''">{{ row.diff }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="明细" width="90">
|
||||
<template #default="{ row }">
|
||||
<el-button size="small" link type="primary" @click="goAttainDetail(row)">看流程卡</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-drawer>
|
||||
</el-card>
|
||||
<PageHelp :data="helpDailyPlan" page="DailyPlan" />
|
||||
</template>
|
||||
@@ -316,6 +342,7 @@
|
||||
|
||||
<script setup>
|
||||
import { reactive, ref, computed, onMounted } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
import { can } from '../utils/perm'
|
||||
@@ -336,8 +363,8 @@ function addDays(n) {
|
||||
const query = reactive({
|
||||
orderNos: [],
|
||||
dateRange: [todayStr(), addDays(30)],
|
||||
// 2026-11-10:默认「全部」,不再默认排除已完成/已取消(用户看不懂 active 语义)
|
||||
status: 'all',
|
||||
// 2026-11-16 用户定案:执行状态默认「未完成」;「未完成」=排除已完成/已取消的组合筛选(非状态值)
|
||||
status: 'active',
|
||||
product: '',
|
||||
operator: '',
|
||||
docks: [],
|
||||
@@ -348,7 +375,7 @@ const query = reactive({
|
||||
})
|
||||
function resetFilters() {
|
||||
Object.assign(query, {
|
||||
orderNos: [], dateRange: [todayStr(), addDays(30)], status: 'all',
|
||||
orderNos: [], dateRange: [todayStr(), addDays(30)], status: 'active',
|
||||
product: '', operator: '', docks: [], qtyMin: null, qtyMax: null, showHistory: false, sort: 'asc'
|
||||
})
|
||||
load()
|
||||
@@ -757,6 +784,72 @@ async function exportCompare() {
|
||||
ElMessage.error('导出差异失败')
|
||||
}
|
||||
}
|
||||
// ---------- 计划 vs 实际(2026-11-16 死结6:完工流水汇聚,不建新表)----------
|
||||
const attain = reactive({ show: false, loading: false, items: [], range: [] })
|
||||
const router = useRouter()
|
||||
function attainRange() {
|
||||
const r = attain.range
|
||||
return {
|
||||
start: r && r[0] ? r[0] : compareRange().start,
|
||||
end: r && r[1] ? r[1] : compareRange().end
|
||||
}
|
||||
}
|
||||
async function openAttain() {
|
||||
attain.show = true
|
||||
if (!attain.range || !attain.range[0]) attain.range = [compareRange().start, compareRange().end]
|
||||
await loadAttain()
|
||||
}
|
||||
async function loadAttain() {
|
||||
const { start, end } = attainRange()
|
||||
attain.loading = true
|
||||
try {
|
||||
const data = await request.get('/daily-plans/attainment', { params: { start, end } })
|
||||
attain.items = Array.isArray(data) ? data : []
|
||||
} catch {
|
||||
attain.items = []
|
||||
} finally {
|
||||
attain.loading = false
|
||||
}
|
||||
}
|
||||
// 明细:跳生产流程卡并自动带入工单号查询(用户拍板:要看明细就跳流程卡,不在此页堆明细)
|
||||
function goAttainDetail(row) {
|
||||
attain.show = false
|
||||
router.push({ name: 'ProcessCard', query: { orderNo: row.orderNo } })
|
||||
}
|
||||
// 导出:后端直出 xlsx(同 exportCompare 方式)
|
||||
async function exportAttain() {
|
||||
const { start, end } = attainRange()
|
||||
const params = new URLSearchParams()
|
||||
params.set('start', start)
|
||||
params.set('end', end)
|
||||
try {
|
||||
const resp = await fetch('/api/v1/daily-plans/attainment/export?' + params.toString(), {
|
||||
headers: { Authorization: 'Bearer ' + getToken() }
|
||||
})
|
||||
if (!resp.ok) { ElMessage.error('导出失败'); return }
|
||||
const blob = await resp.blob()
|
||||
const disp = resp.headers.get('Content-Disposition') || ''
|
||||
let filename = '计划vs实际.xlsx'
|
||||
const key = "filename*=UTF-8''"
|
||||
const i = disp.indexOf(key)
|
||||
if (i >= 0) {
|
||||
let v = disp.slice(i + key.length)
|
||||
const semi = v.indexOf(';')
|
||||
if (semi >= 0) v = v.slice(0, semi)
|
||||
v = v.trim()
|
||||
if (v.charAt(0) === '"' && v.charAt(v.length - 1) === '"') v = v.slice(1, -1)
|
||||
try { filename = decodeURIComponent(v) } catch { filename = v }
|
||||
}
|
||||
const url = URL.createObjectURL(blob)
|
||||
const a = document.createElement('a')
|
||||
a.href = url
|
||||
a.download = filename
|
||||
a.click()
|
||||
URL.revokeObjectURL(url)
|
||||
} catch {
|
||||
ElMessage.error('导出失败')
|
||||
}
|
||||
}
|
||||
onMounted(async () => {
|
||||
searchWorkOrders('') // 首屏只拉最近 50 条供下拉,其余走远程搜索
|
||||
productTypes.value = (await request.get('/product-types')) || []
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
<el-card class="block">
|
||||
<template #header><span>在途指令(PLC 当前未清零的路径指令)</span></template>
|
||||
<el-alert type="info" :closable="false" class="tip">
|
||||
仅显示 PLC 中仍记录为「在途」(MW 非 0)的路径指令,解析为「源 → 目标」。若该指令已实际卡住、PLC 未自动清零,可手动「强制清零」。正常自动线不应出现长期在途。传感器位无需也不可人工改动(PLC 会覆盖)。
|
||||
仅显示 PLC 中仍记录为「在途」(MW 非 0)的路径指令,解析为「源 → 目标」。若该指令已实际卡住、PLC 未自动清零,可手动「强制清零」(只把这一条指令字写 0,不会影响 PLC 程序运行,也不会改动 MES 数据)。正常自动线不应出现长期在途。传感器位无需也不可人工改动(PLC 会覆盖)。
|
||||
</el-alert>
|
||||
<el-table v-if="inTransit.length" :data="inTransit" border size="small" max-height="320">
|
||||
<el-table-column label="在途指令" min-width="200">
|
||||
@@ -97,7 +97,7 @@
|
||||
<!-- 强制清零确认弹窗 -->
|
||||
<el-dialog v-model="clearDialog.visible" title="强制清零在途指令" width="480px" :close-on-click-modal="false">
|
||||
<el-alert type="error" :closable="false" class="tip">
|
||||
将清除 PLC 中该指令的记录。仅在指令卡住(PLC 未清零)时使用。若 PLC 仍在执行该指令,强制清零会导致状态不一致。
|
||||
将把 PLC 内存里这条路径指令字写 0(只动这一个握手字,不会影响 PLC 程序运行,也不会改动 MES 数据库)。仅在指令真卡住(PLC 未自动清零)时使用;若托盘还在搬运中就清零,上位机会误判任务完成并可能重复下发,造成动作冲突。请先到现场确认工件位置。
|
||||
</el-alert>
|
||||
<div class="clear-body">
|
||||
当前指令:<b>{{ transitLabel(clearDialog.row) }}</b>
|
||||
|
||||
@@ -275,12 +275,15 @@
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, computed, onMounted } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
import { openPrintableHtml, openMergedPrintWindow } from '../utils/print'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
import { helpProcessCard } from '../help'
|
||||
|
||||
const route = useRoute()
|
||||
|
||||
// ===== 流程卡列表(单页主视图) =====
|
||||
const listLoading = ref(false)
|
||||
const listQuery = reactive({ orderNo: '', productCode: '', keyword: '' })
|
||||
@@ -660,6 +663,9 @@ function buildSnCsv(c) {
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// 2026-11-16 日排产「计划vs实际」明细跳转:支持 ?orderNo= 预填产品工号并自动查询
|
||||
const qn = route.query.orderNo
|
||||
if (qn) listQuery.orderNo = String(qn)
|
||||
loadList()
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<template>
|
||||
<el-card>
|
||||
<el-form inline>
|
||||
<el-form-item label="图号"><el-input v-model="filters.code" clearable placeholder="图号(不区分大小写)" style="width:160px" @keyup.enter="search" /></el-form-item>
|
||||
<el-form-item label="名称"><el-input v-model="filters.name" clearable placeholder="名称(不区分大小写)" style="width:160px" @keyup.enter="search" /></el-form-item>
|
||||
<el-form-item label="规格"><el-input v-model="filters.spec" clearable placeholder="规格(不区分大小写)" style="width:160px" @keyup.enter="search" /></el-form-item>
|
||||
<el-form-item label="启用">
|
||||
@@ -11,6 +10,7 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 2026-11-13 拍板:成品档案不需要「类型 / 序列号」维度,查询与列表均不展示;后端按成品逻辑默认。 -->
|
||||
<!-- 2026-11-16 用户定案:成品档案界面不再出现图号/物料编码(筛选、列表、表单、说明一律不显示);编码由后端自动生成。 -->
|
||||
<el-form-item label="起始时间"><el-date-picker v-model="filters.startDate" type="date" value-format="YYYY-MM-DD" style="width:140px" /></el-form-item>
|
||||
<el-form-item label="结束时间"><el-date-picker v-model="filters.endDate" type="date" value-format="YYYY-MM-DD" style="width:140px" /></el-form-item>
|
||||
<el-form-item>
|
||||
@@ -18,7 +18,9 @@
|
||||
<el-button @click="resetFilters">重置</el-button>
|
||||
<el-button v-if="can('produce.product:add')" type="primary" plain @click="openAdd">新增成品档案</el-button>
|
||||
<!-- 2026-11-10 按 WMS 同样式:导入按钮与悬浮气泡分开——按钮点击直接选文件上传;
|
||||
说明走按钮旁 hover 悬浮气泡(WMS BaseData.vue:1095-1128 同款:字段说明 + 常见错误 + 下载模板)。 -->
|
||||
说明走按钮旁 hover 悬浮气泡(WMS BaseData.vue 同款:字段说明 + 常见错误 + 下载模板)。
|
||||
2026-11-16 拍板:模板删除「图号」「物料编码」两列(编码自动生成/统一为空),
|
||||
本端导入仅限成品,原材料在 WMS 物料档案维护。 -->
|
||||
<el-button v-if="can('produce.product:add')" type="warning" :loading="importing" @click="triggerImport">导入</el-button>
|
||||
<el-button @click="exportXlsx">导出</el-button>
|
||||
<el-popover v-if="can('produce.product:add')" placement="bottom-start" :width="680" trigger="hover">
|
||||
@@ -26,28 +28,24 @@
|
||||
<el-icon style="margin-left:6px;cursor:pointer;color:#909399;font-size:17px;vertical-align:middle"><InfoFilled /></el-icon>
|
||||
</template>
|
||||
<div style="max-height:62vh;overflow:auto">
|
||||
<div style="font-weight:600;margin-bottom:6px">一、字段说明(成品档案模板 9 列;Excel 首行表头按名称识别,请勿改动表头文字)</div>
|
||||
<div style="font-weight:600;margin-bottom:6px">一、字段说明(成品档案模板 7 列;Excel 首行表头按名称识别,请勿改动表头文字)</div>
|
||||
<table style="width:100%;border-collapse:collapse;font-size:12px" border>
|
||||
<thead><tr style="background:#f5f7fa"><th>列</th><th>字段</th><th>必填</th><th>格式</th><th>说明</th></tr></thead>
|
||||
<tbody>
|
||||
<tr><td style="text-align:center">1</td><td>图号</td><td style="text-align:center">是</td><td>字符串,唯一</td><td>物料唯一标识(两库同步业务键);成品可留空自动生成 PROD-YYYYMMDD-流水,原材料必填</td></tr>
|
||||
<tr><td style="text-align:center">2</td><td>物料编码</td><td style="text-align:center">否</td><td>字符串</td><td>普通档案字段(如 WL-0001),不参与业务与必填校验</td></tr>
|
||||
<tr><td style="text-align:center">3</td><td>名称</td><td style="text-align:center">是</td><td>字符串</td><td>物料名称</td></tr>
|
||||
<tr><td style="text-align:center">4</td><td>规格</td><td style="text-align:center">是</td><td>字符串</td><td>规格型号</td></tr>
|
||||
<tr><td style="text-align:center">5</td><td>单位</td><td style="text-align:center">是</td><td>字符串</td><td>如「个」「件」「套」</td></tr>
|
||||
|
||||
<tr><td style="text-align:center">6</td><td>类别</td><td style="text-align:center">否</td><td>成品/原材料</td><td>默认成品(MES 口径;WMS 侧叫「物料类别」,留空默认原材料)</td></tr>
|
||||
<tr><td style="text-align:center">7</td><td>序列号</td><td style="text-align:center">否</td><td>是/否</td><td>成品强制是,原材料可选(WMS 导入忽略本列,按类型自动派生)</td></tr>
|
||||
<tr><td style="text-align:center">8</td><td>启用</td><td style="text-align:center">否</td><td>是/否</td><td>默认是(WMS 导入忽略本列,默认启用)</td></tr>
|
||||
<tr><td style="text-align:center">9</td><td>说明</td><td style="text-align:center">否</td><td>字符串</td><td>备注</td></tr>
|
||||
<tr><td style="text-align:center">1</td><td>名称</td><td style="text-align:center">是</td><td>字符串</td><td>物料名称</td></tr>
|
||||
<tr><td style="text-align:center">2</td><td>规格</td><td style="text-align:center">是</td><td>字符串</td><td>规格型号</td></tr>
|
||||
<tr><td style="text-align:center">3</td><td>单位</td><td style="text-align:center">是</td><td>字符串</td><td>如「个」「件」「套」</td></tr>
|
||||
<tr><td style="text-align:center">4</td><td>类别</td><td style="text-align:center">否</td><td>成品</td><td>只能填「成品」;原材料请在 WMS 物料档案维护(不在本端导入)</td></tr>
|
||||
<tr><td style="text-align:center">5</td><td>序列号</td><td style="text-align:center">否</td><td>—</td><td>成品强制「是」,无需填写</td></tr>
|
||||
<tr><td style="text-align:center">6</td><td>启用</td><td style="text-align:center">否</td><td>是/否</td><td>默认是</td></tr>
|
||||
<tr><td style="text-align:center">7</td><td>说明</td><td style="text-align:center">否</td><td>字符串</td><td>备注</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div style="font-size:12px;color:#909399;margin-top:4px">下载模板含 2 行示例数据(导入前请删除)与「填写说明」页逐列说明。</div>
|
||||
<div style="font-size:12px;color:#909399;margin-top:4px">成品编码(图号)由系统自动生成(PROD-年月日-流水,递增且唯一),物料编码统一为空,均无需填写。下载模板含 1 行示例数据(导入前请删除)与「填写说明」页逐列说明。</div>
|
||||
<div style="font-weight:600;margin:10px 0 4px">二、常见错误</div>
|
||||
<div style="font-size:12px;color:#606266;line-height:1.9">
|
||||
· 图号重复:系统中已存在相同图号,该行被拒绝<br/>
|
||||
· 类别填了「原材料」:MES 成品导入仅限成品,请在 WMS 物料档案维护原材料<br/>
|
||||
· 物料类型不出现在模板中:系统一律按成品逻辑默认(类型=其他、序列号=是)<br/>
|
||||
· 类别不在枚举内:只能填「成品」或「原材料」<br/>
|
||||
· 名称/规格/单位为空:必填列不可为空;任一行出错则整批回退,一行不写<br/>
|
||||
· WMS 不可达:本端导入先逐行写 WMS,WMS 失败整批取消
|
||||
</div>
|
||||
@@ -60,8 +58,7 @@
|
||||
</el-form>
|
||||
<el-table :data="list" border size="small">
|
||||
<el-table-column prop="id" label="ID" width="60" />
|
||||
<el-table-column prop="code" label="图号" min-width="140" />
|
||||
<!-- 2026-11-13:成品档案视图适配——物料编码不展示(与物料档案共用一张表,但业务层面显示不一样) -->
|
||||
<!-- 2026-11-16 用户定案:列表不再显示图号列(编码仅作系统内部唯一键与附件挂靠) -->
|
||||
<el-table-column prop="name" label="名称" min-width="120" />
|
||||
<el-table-column prop="spec" label="规格" min-width="120">
|
||||
<template #default="{row}">{{ row.spec || '-' }}</template>
|
||||
@@ -103,32 +100,13 @@
|
||||
|
||||
<el-dialog v-model="dialog.show" :title="dialog.id?'编辑成品档案':'新增成品档案'" width="460px">
|
||||
<el-form :model="dialog" label-width="80px">
|
||||
<el-alert type="info" :closable="false" title="成品档案:图号(唯一码)由系统自动生成,类型与序列号由系统固定,无需填写;成品没有物料编码。" style="margin-bottom:10px" />
|
||||
<el-form-item label="图号" required v-if="false">
|
||||
<el-input v-model="dialog.code" :disabled="!!dialog.id" placeholder="图号,如 DX-100(创建后不可改)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料编码" v-if="false"><el-input v-model="dialog.materialCode" placeholder="选填,物料编码" clearable /></el-form-item>
|
||||
<el-alert type="info" :closable="false" title="成品档案:编码与类型、序列号均由系统自动设定,无需填写。" style="margin-bottom:10px" />
|
||||
<el-form-item label="名称"><el-input v-model="dialog.name" /></el-form-item>
|
||||
<el-form-item label="规格"><el-input v-model="dialog.spec" placeholder="如 500×300×200" /></el-form-item>
|
||||
<el-form-item label="单位"><el-input v-model="dialog.unit" placeholder="如 台/套" /></el-form-item>
|
||||
<el-form-item label="说明">
|
||||
<el-input v-model="dialog.description" type="textarea" :rows="2" placeholder="说明(可空)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="类型" required v-if="false">
|
||||
<el-select v-model="dialog.manageMode" style="width:100%" placeholder="请选择类型" @change="onTypeChange">
|
||||
<el-option :value="0" label="请选择" disabled />
|
||||
<el-option :value="1" label="结构件" />
|
||||
<el-option :value="2" label="电气件" />
|
||||
<el-option :value="3" label="其他" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="序列号" required v-if="false">
|
||||
<el-radio-group v-model="dialog.snMode">
|
||||
<el-radio :label="1">是</el-radio>
|
||||
<el-radio :label="2">否</el-radio>
|
||||
</el-radio-group>
|
||||
<span style="margin-left:8px;color:#909399;font-size:12px">是=逐件录序列号,否=按数量(不录序列号)</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="启用"><el-switch v-model="dialog.isActive" /></el-form-item>
|
||||
</el-form>
|
||||
<AttachmentPanel v-if="dialog.id" biz-type="material" :biz-id="dialog.code" title="附件(图纸 / 资料)" />
|
||||
@@ -166,16 +144,13 @@ const list = ref([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
const pageSize = ref(20)
|
||||
const filters = reactive({ code: '', name: '', spec: '', isActive: '', manageMode: '', snMode: '', startDate: '', endDate: '' })
|
||||
// 类型(manageMode)与是否逐件SN管理(snMode)解耦(2026-09-30):
|
||||
// snMode 必选(0=未选择不可保存);选类型自动带默认(电气件→序列号=是,结构件/其他→序列号=否),可手改
|
||||
const dialog = reactive({ show: false, id: 0, name: '', code: '', materialCode: '', spec: '', unit: '', manageMode: 3, snMode: 1, description: '', isActive: true })
|
||||
const filters = reactive({ name: '', spec: '', isActive: '', startDate: '', endDate: '' })
|
||||
// 2026-11-16 用户定案:界面不再出现图号/物料编码/类型/序列号,全部由后端注入或自动生成
|
||||
//(类型=3 其他、序列号=是、编码留空由 genProductTypeCode 生成 PROD-YYYYMMDD-流水、物料编码强制空串)。
|
||||
// dialog.code 仅保留用于附件挂靠(biz-id=编码)。
|
||||
const dialog = reactive({ show: false, id: 0, name: '', code: '', spec: '', unit: '', description: '', isActive: true })
|
||||
const attachDrawer = reactive({ visible: false, code: '', name: '' })
|
||||
|
||||
function onTypeChange(v) {
|
||||
dialog.snMode = v === 2 ? 1 : 2
|
||||
}
|
||||
|
||||
function defaultRange() {
|
||||
const d = new Date()
|
||||
const p = (n) => String(n).padStart(2, '0')
|
||||
@@ -186,18 +161,15 @@ function defaultRange() {
|
||||
}
|
||||
Object.assign(filters, defaultRange())
|
||||
|
||||
// 2026-09-08 禁止关键字混搜:编码/名称各筛选框独立传参,后端各自模糊匹配
|
||||
// 禁止关键字混搜:名称/规格各筛选框独立传参,后端各自模糊匹配
|
||||
function trim(s) { return (s || '').trim() }
|
||||
|
||||
async function load() {
|
||||
const params = {
|
||||
page: page.value,
|
||||
pageSize: pageSize.value,
|
||||
code: trim(filters.code),
|
||||
name: trim(filters.name),
|
||||
spec: trim(filters.spec),
|
||||
manageMode: filters.manageMode,
|
||||
snMode: filters.snMode,
|
||||
isActive: filters.isActive,
|
||||
startDate: filters.startDate,
|
||||
endDate: filters.endDate
|
||||
@@ -224,34 +196,32 @@ async function retrySync(row) {
|
||||
}
|
||||
|
||||
function resetFilters() {
|
||||
Object.assign(filters, { code: '', name: '', spec: '', isActive: '', manageMode: '', snMode: '' }, defaultRange())
|
||||
Object.assign(filters, { name: '', spec: '', isActive: '' }, defaultRange())
|
||||
page.value = 1
|
||||
load()
|
||||
}
|
||||
|
||||
async function openAdd() {
|
||||
Object.assign(dialog, { show: true, id: 0, name: '', code: '', materialCode: '', spec: '', unit: '', manageMode: 3, snMode: 1, description: '', isActive: true })
|
||||
Object.assign(dialog, { show: true, id: 0, name: '', code: '', spec: '', unit: '', description: '', isActive: true })
|
||||
}
|
||||
function openEdit(row) {
|
||||
Object.assign(dialog, {
|
||||
show: true, id: row.id, name: row.name, code: row.code, materialCode: row.materialCode || '', spec: row.spec || '', unit: row.unit || '',
|
||||
manageMode: row.manageMode ?? 0, snMode: row.snMode ?? 0, description: row.description || '', isActive: row.isActive
|
||||
show: true, id: row.id, name: row.name, code: row.code, spec: row.spec || '', unit: row.unit || '',
|
||||
description: row.description || '', isActive: row.isActive
|
||||
})
|
||||
}
|
||||
async function save() {
|
||||
// 必填口径:名称/规格/单位/图号(图号仅新建必填、编辑不可改;MES 图号不允许为空,与 WMS 成品可空自动生成不同)+ 类型 + 序列号(序列号=是/否)
|
||||
// 必填口径(2026-11-16 用户定案):仅名称/规格/单位必填;编码由后端留空自动生成(logic/product.go:117-123),
|
||||
// 类型/序列号由后端按成品注入默认值(logic/product.go:108-113);物料编码强制空字符串(不参与两库互推,product_import.go:307)。
|
||||
if (!trim(dialog.name)) return ElMessage.warning('名称为必填项')
|
||||
if (!trim(dialog.spec)) return ElMessage.warning('规格型号为必填项')
|
||||
if (!trim(dialog.unit)) return ElMessage.warning('单位为必填项')
|
||||
if (!dialog.id && !trim(dialog.code)) return ElMessage.warning('图号为必填项(创建后不可改)')
|
||||
if (![1, 2, 3].includes(dialog.manageMode)) return ElMessage.warning('请选择类型')
|
||||
if (dialog.snMode !== 1 && dialog.snMode !== 2) return ElMessage.warning('请选择序列号(是=逐件录序列号 / 否=按数量(不录序列号))')
|
||||
const body = {
|
||||
name: trim(dialog.name), spec: trim(dialog.spec), unit: trim(dialog.unit), description: dialog.description,
|
||||
materialCode: dialog.materialCode, manageMode: dialog.manageMode, snMode: dialog.snMode, isActive: dialog.isActive
|
||||
materialCode: '', manageMode: 3, snMode: 1, isActive: dialog.isActive
|
||||
}
|
||||
if (dialog.id) await request.put('/product-types', { id: dialog.id, ...body })
|
||||
else await request.post('/product-types', { code: trim(dialog.code), ...body })
|
||||
else await request.post('/product-types', body)
|
||||
ElMessage.success('保存成功')
|
||||
dialog.show = false
|
||||
load()
|
||||
@@ -346,7 +316,7 @@ async function exportXlsx() {
|
||||
filters.endDate = r.end
|
||||
}
|
||||
const params = {
|
||||
code: trim(filters.code), name: trim(filters.name),
|
||||
name: trim(filters.name),
|
||||
spec: trim(filters.spec),
|
||||
isActive: filters.isActive,
|
||||
startDate: filters.startDate, endDate: filters.endDate
|
||||
|
||||
Reference in New Issue
Block a user