feat: 两库对等物料管理及产品工号贯通全流程
- 新增 MES 本地物料表及双向同步接口,WMS 物料变更自动同步 - 全流程新增产品工号字段,贯通入库/库存/出库/检验环节 - 工单管理支持多工单混产,移除单工单互斥限制 - 新增批次号/SN 字段支持质量检验联动 WMS 库存处置 - 修复权限规则,仅内置管理员账号不允许修改删除 - 工位终端新增 SN 扫码自动切换所属工单功能
This commit is contained in:
@@ -12,12 +12,13 @@ export const helpProductType = {
|
||||
name: '编码',
|
||||
source: '系统自动生成 + 可手动修改。新建时会自动带出(格式 PROD-YYYYMMDD-序号),你可直接使用或改为自定义编码;编辑时保留已存值。一个产品编号可对应多个工单(同一型号今天做一批、明天做一批,工单号不同,产品编号相同)。',
|
||||
purpose: '产品唯一编码。它是 MES 内部识别该产品的标识,决定该产品的物料清单内容,也是工单、备料、拧紧、追溯的挂靠键。',
|
||||
fill: '建议用有意义的编码,如 METER-01。要点:①编码主数据以 WMS(库房) 为单一来源,本系统实时从 WMS 拉取物料/成品档案;WMS 不可达时降级为本地只读缓存;②成品完工后系统自动生成 SN 并回流 WMS 入库,无需人工对账;③如产品编号就是成品编码,则直接沿用该编码即可;④建好后不要随意改,否则下游工单/追溯的关联会断。'
|
||||
fill: '建议用有意义的编码,如 METER-01。要点:①两库对等(2026-09-29):本页读写 MES 本地物料副本并自动同步 WMS,WMS 宕机时新建/查询照常可用,推送失败自动重推;②成品完工后系统自动生成 SN 并回流 WMS 入库,无需人工对账;③如产品编号就是成品编码,则直接沿用该编码即可;④建好后不要随意改,否则下游工单/追溯的关联会断。'
|
||||
},
|
||||
{ name: '规格', source: '手工填写(必填)。与 WMS 物料档案必填口径一致。', purpose: '成品的规格型号,用于识别与打印', fill: '如:500×300×200' },
|
||||
{ name: '单位', source: '手工填写(必填)。与 WMS 物料档案必填口径一致。', purpose: '计量单位', fill: '如:台 / 套' },
|
||||
{ name: '类别', source: '手工填写。可选,无上游来源。', purpose: '产品所属大类,便于分类统计', fill: '如:计量表 / 开关柜;可空' },
|
||||
{ name: '启用', source: '开关选择。默认开启。', purpose: '启用后才允许在新建工单/备料的下拉里被选到', fill: '默认开启;暂时停产的可关闭(不删除,保留档案)' }
|
||||
{ name: '启用', source: '开关选择。默认开启。', purpose: '启用后才允许在新建工单/备料的下拉里被选到', fill: '默认开启;暂时停产的可关闭(不删除,保留档案)' },
|
||||
{ name: '停用', source: '行内「停用」按钮(原「删除」,两库均不物理删除)。', purpose: '停用后该型号退出新建下拉,并自动同步 WMS 同步停用;历史工单/库存/追溯不受影响', fill: '点「停用」二次确认即可;已停用的行按钮显示「已停用」' }
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -48,8 +48,9 @@
|
||||
<span v-else>全部</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="140" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="180" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="info" size="small" @click="openDetail(row)">详情</el-button>
|
||||
<el-button v-if="can('sys.account:edit')" link type="primary" size="small" :disabled="lockedUser(row)"
|
||||
@click="openEdit(row)">编辑</el-button>
|
||||
<el-button v-if="can('sys.account:delete')" link type="danger" size="small" :disabled="lockedUser(row)"
|
||||
@@ -66,10 +67,10 @@
|
||||
<el-dialog v-model="dialog.show" :title="dialog.id ? '编辑账号' : '新增账号'" width="520px" append-to-body destroy-on-close>
|
||||
<el-form label-width="100px">
|
||||
<el-form-item label="用户名" required>
|
||||
<el-input v-model="dialog.username" :disabled="dialog.id > 0 && lockedName(dialog.username)" placeholder="登录名(创建后不可改)" />
|
||||
<el-input v-model="dialog.username" autocomplete="off" name="acct-username" :disabled="dialog.id > 0 && lockedName(dialog.username)" placeholder="登录名(创建后不可改)" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="dialog.id ? '重置密码' : '初始密码'" required>
|
||||
<el-input v-model="dialog.password" type="password" show-password
|
||||
<el-input v-model="dialog.password" type="password" show-password autocomplete="new-password" name="acct-password"
|
||||
:placeholder="dialog.id ? '留空则不修改(至少6位,不能纯数字)' : '至少6位,不能纯数字'" />
|
||||
<el-alert v-if="pwdAllNum" type="warning" :closable="false" style="margin-top:6px"
|
||||
title="密码为纯数字,安全性较低,建议包含字母与数字组合" />
|
||||
@@ -94,7 +95,7 @@
|
||||
</el-form-item>
|
||||
<template v-if="dialog.canLoginWorkstation">
|
||||
<el-form-item label="终端密码">
|
||||
<el-input v-model="dialog.workstationPassword" type="password" show-password
|
||||
<el-input v-model="dialog.workstationPassword" type="password" show-password autocomplete="new-password" name="acct-wspassword"
|
||||
:placeholder="dialog.id ? '留空则沿用原终端密码' : '留空默认复用登录密码'" />
|
||||
</el-form-item>
|
||||
<el-form-item label="允许工位">
|
||||
@@ -109,6 +110,24 @@
|
||||
<el-button type="primary" :loading="saving" @click="save">保存</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-model="detail.show" :title="detail.title" width="520px" append-to-body>
|
||||
<el-descriptions :column="1" border size="small">
|
||||
<el-descriptions-item label="ID">{{ detail.row?.id }}</el-descriptions-item>
|
||||
<el-descriptions-item label="用户名">{{ detail.row?.username }}</el-descriptions-item>
|
||||
<el-descriptions-item label="姓名">{{ detail.row?.name || '-' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="角色">
|
||||
<el-tag :type="roleTag(detail.row || {})" size="small">{{ roleName(detail.row || {}) }}</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="状态">{{ detail.row?.status === 'ENABLED' ? '启用' : '停用' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="工位终端">{{ detail.row?.canLoginWorkstation ? '已开通' : '未开通' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="允许工位">{{ detail.row?.stations && detail.row.stations.length ? detail.row.stations.join('、') : '全部' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="最近登录">{{ detail.row?.lastLoginAt ? fmtTime(detail.row.lastLoginAt) : '从未登录' }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<template #footer>
|
||||
<el-button @click="detail.show = false">关闭</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
<PageHelp :data="helpAccount" page="AccountManage" />
|
||||
</template>
|
||||
@@ -136,9 +155,9 @@ const roleOfId = computed(() => {
|
||||
return m
|
||||
})
|
||||
|
||||
// 内置管理员(username=admin,或其角色为 SUPER_ADMIN)不可修改/删除
|
||||
const lockedUser = (row) =>
|
||||
row && (row.username === 'admin' || (roleOfId.value[row.roleId] || {}).code === 'SUPER_ADMIN')
|
||||
// 仅锁定内置管理员账号(username=admin);其余账号(含 SUPER_ADMIN 角色的用户)均可编辑/删除/改状态。
|
||||
// 2026-09-28 修正:原按角色码 SUPER_ADMIN 锁定的规则过宽,导致普通新建账号被误锁。
|
||||
const lockedUser = (row) => row && row.username === 'admin'
|
||||
const lockedName = (name) => name === 'admin'
|
||||
|
||||
function roleName(row) {
|
||||
@@ -183,7 +202,9 @@ function resetDialog() {
|
||||
}
|
||||
function openCreate() {
|
||||
resetDialog()
|
||||
dialog.roleId = roles.value[0]?.id || 0
|
||||
// 默认角色取第一个非 SUPER_ADMIN 角色,避免新建账号被默认赋予超级管理员(否则会被锁定且权限过大)
|
||||
const firstNormal = roles.value.find((r) => r.code !== 'SUPER_ADMIN')
|
||||
dialog.roleId = firstNormal ? firstNormal.id : roles.value[0]?.id || 0
|
||||
dialog.show = true
|
||||
}
|
||||
function openEdit(row) {
|
||||
@@ -199,6 +220,7 @@ function pwdErr(pwd) {
|
||||
}
|
||||
async function save() {
|
||||
if (!dialog.username.trim()) return ElMessage.warning('请输入用户名')
|
||||
if (!dialog.name.trim()) return ElMessage.warning('请输入姓名')
|
||||
if (!dialog.id && !dialog.password) return ElMessage.warning('请输入初始密码')
|
||||
const err = dialog.password ? pwdErr(dialog.password) : ''
|
||||
if (err) return ElMessage.warning(err)
|
||||
@@ -248,6 +270,14 @@ async function removeUser(row) {
|
||||
slice()
|
||||
}
|
||||
|
||||
/* ---------- 详情(只读查看账号信息) ---------- */
|
||||
const detail = reactive({ show: false, title: '', row: null })
|
||||
function openDetail(row) {
|
||||
detail.row = row
|
||||
detail.title = `账号详情 · ${row.username}`
|
||||
detail.show = true
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
await loadAll()
|
||||
slice()
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
<template>
|
||||
<el-card>
|
||||
<el-alert v-if="wmsOnline === false" type="warning" :closable="false" show-icon style="margin-bottom:10px"
|
||||
title="WMS 不可达:当前展示的是本地只读缓存,新增/编辑/删除需 WMS 恢复后操作(编码主数据以 WMS 为单一来源)" />
|
||||
<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.category" clearable placeholder="类别" style="width:120px" @keyup.enter="search" /></el-form-item>
|
||||
<el-form-item label="启用">
|
||||
<el-select v-model="filters.isActive" clearable style="width:100px">
|
||||
<el-option label="启用" value="true" />
|
||||
@@ -27,9 +24,6 @@
|
||||
<el-table-column label="类型" width="130">
|
||||
<template #default="{row}">{{ row.manageMode === 1 ? '结构件(批次)' : row.manageMode === 2 ? '电气件(SN)' : (row.manageMode === 3 ? '其他' : '-') }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="category" label="类别" width="110">
|
||||
<template #default="{row}">{{ row.category || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="isActive" label="启用" width="80">
|
||||
<template #default="{row}"><el-tag :type="row.isActive?'success':'info'">{{ row.isActive?'是':'否' }}</el-tag></template>
|
||||
</el-table-column>
|
||||
@@ -46,7 +40,7 @@
|
||||
<template #default="{row}">
|
||||
<el-button size="small" @click="openAttach(row)">附件</el-button>
|
||||
<el-button v-if="can('produce.product:edit')" size="small" @click="openEdit(row)">编辑</el-button>
|
||||
<el-button v-if="can('produce.product:delete')" size="small" type="danger" @click="del(row)">删除</el-button>
|
||||
<el-button v-if="can('produce.product:delete')" size="small" type="danger" @click="del(row)">{{ row.isActive === false ? '已停用' : '停用' }}</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -64,11 +58,11 @@
|
||||
<el-form-item label="单位"><el-input v-model="dialog.unit" placeholder="如 台/套" /></el-form-item>
|
||||
<el-form-item label="类型">
|
||||
<el-select v-model="dialog.manageMode" style="width:100%">
|
||||
<el-option :value="1" label="结构件(批次管理)" />
|
||||
<el-option :value="2" label="电气件(SN 管理)" />
|
||||
<el-option :value="1" label="结构件(批次)" />
|
||||
<el-option :value="2" label="电气件(SN)" />
|
||||
<el-option :value="3" label="其他" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="类别"><el-input v-model="dialog.category" /></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="附件(图纸 / 资料)" />
|
||||
@@ -96,15 +90,16 @@ import AttachmentPanel from '../components/AttachmentPanel.vue'
|
||||
import { helpProductType } from '../help'
|
||||
import { fmtTime } from '../utils/format'
|
||||
|
||||
// 数据源说明:物料档案已并入 WMS 物料主数据(item_type=3,品类=成品),
|
||||
// 本页经 MES 后端实时代理 WMS;WMS 不可达时降级为本地只读缓存(wmsOnline=false)。
|
||||
// 数据源说明(两库对等 2026-09-29):本页读写 MES 本地 materials 副本(item_type=3 成品),
|
||||
// 新增/编辑/停用先落本地再推 WMS(失败自动重推);查询全部走本地,WMS 宕机不受影响。
|
||||
// 说明:MES 旧版曾在此页提供「类别」自由文本输入,实则为 materials.description(说明)列的误标,
|
||||
// 已移除;说明列以 WMS 物料档案为准,流程卡「产品分类」仍从说明读取。
|
||||
const list = ref([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
const pageSize = ref(20)
|
||||
const wmsOnline = ref(true)
|
||||
const filters = reactive({ code: '', name: '', category: '', isActive: '', startDate: '', endDate: '' })
|
||||
const dialog = reactive({ show: false, id: 0, name: '', code: '', spec: '', unit: '', category: '', manageMode: 2, isActive: true })
|
||||
const filters = reactive({ code: '', name: '', isActive: '', startDate: '', endDate: '' })
|
||||
const dialog = reactive({ show: false, id: 0, name: '', code: '', spec: '', unit: '', manageMode: 2, isActive: true })
|
||||
const attachDrawer = reactive({ visible: false, code: '', name: '' })
|
||||
|
||||
function defaultRange() {
|
||||
@@ -117,7 +112,7 @@ function defaultRange() {
|
||||
}
|
||||
Object.assign(filters, defaultRange())
|
||||
|
||||
// 2026-09-08 禁止关键字混搜:编码/名称/类别各筛选框独立传参,后端各自模糊匹配
|
||||
// 2026-09-08 禁止关键字混搜:编码/名称各筛选框独立传参,后端各自模糊匹配
|
||||
function trim(s) { return (s || '').trim() }
|
||||
|
||||
async function load() {
|
||||
@@ -126,7 +121,6 @@ async function load() {
|
||||
pageSize: pageSize.value,
|
||||
code: trim(filters.code),
|
||||
name: trim(filters.name),
|
||||
category: trim(filters.category),
|
||||
isActive: filters.isActive,
|
||||
startDate: filters.startDate,
|
||||
endDate: filters.endDate
|
||||
@@ -134,21 +128,20 @@ async function load() {
|
||||
const data = await request.get('/product-types/page', { params })
|
||||
list.value = data.list || []
|
||||
total.value = data.total || 0
|
||||
wmsOnline.value = data.wmsOnline !== false
|
||||
}
|
||||
function search() { page.value = 1; load() }
|
||||
|
||||
async function openAdd() {
|
||||
Object.assign(dialog, { show: true, id: 0, name: '', code: '', spec: '', unit: '', category: '', isActive: true })
|
||||
Object.assign(dialog, { show: true, id: 0, name: '', code: '', spec: '', unit: '', isActive: true })
|
||||
}
|
||||
function openEdit(row) { Object.assign(dialog, { show: true, id: row.id, name: row.name, code: row.code, spec: row.spec || '', unit: row.unit || '', category: row.category, isActive: row.isActive }) }
|
||||
function openEdit(row) { Object.assign(dialog, { show: true, id: row.id, name: row.name, code: row.code, spec: row.spec || '', unit: row.unit || '', isActive: row.isActive }) }
|
||||
async function save() {
|
||||
// 必填口径:名称/规格/单位/图号(图号仅新建必填、编辑不可改;MES 图号不允许为空,与 WMS 成品可空自动生成不同)
|
||||
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('图号为必填项(创建后不可改)')
|
||||
const body = { name: trim(dialog.name), spec: trim(dialog.spec), unit: trim(dialog.unit), category: dialog.category, isActive: dialog.isActive }
|
||||
const body = { name: trim(dialog.name), spec: trim(dialog.spec), unit: trim(dialog.unit), 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 })
|
||||
ElMessage.success('保存成功')
|
||||
@@ -156,9 +149,10 @@ async function save() {
|
||||
load()
|
||||
}
|
||||
async function del(row) {
|
||||
await ElMessageBox.confirm('确认删除?已被工单/物料清单/库存引用的型号会被拒绝删除。', '提示', { type: 'warning' })
|
||||
// 两库对等定稿(2026-09-29 M5):物料档案一律不物理删除,「删除」=停用(isActive=false)并同步 WMS
|
||||
await ElMessageBox.confirm('确认停用该物料档案?停用后不再出现在新建下拉,历史工单/库存不受影响。', '停用确认', { type: 'warning' })
|
||||
await request.delete(`/product-types/${row.id}`)
|
||||
ElMessage.success('已删除')
|
||||
ElMessage.success('已停用')
|
||||
load()
|
||||
}
|
||||
function openAttach(row) { Object.assign(attachDrawer, { visible: true, code: row.code, name: row.name }) }
|
||||
@@ -169,7 +163,7 @@ async function exportXlsx() {
|
||||
filters.endDate = r.end
|
||||
}
|
||||
const params = {
|
||||
code: trim(filters.code), name: trim(filters.name), category: trim(filters.category),
|
||||
code: trim(filters.code), name: trim(filters.name),
|
||||
isActive: filters.isActive,
|
||||
startDate: filters.startDate, endDate: filters.endDate
|
||||
}
|
||||
|
||||
@@ -45,6 +45,9 @@
|
||||
<el-table-column prop="disposalRemark" label="处置说明" min-width="130" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.disposalRemark || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="batchSn" label="批次/SN" min-width="110" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.batchSn || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="operator" label="记录人" width="100" />
|
||||
<el-table-column label="记录日期" width="160">
|
||||
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
|
||||
@@ -89,6 +92,10 @@
|
||||
<el-form-item label="检验单号">
|
||||
<el-input v-model="dialog.inspectionNo" placeholder="请输入检验单号" />
|
||||
</el-form-item>
|
||||
<!-- 批次号/SN:判不合格联动 WMS 在库处置的定位字段(电气件填SN、结构件填批次,按物料档案类型提示) -->
|
||||
<el-form-item label="批次号/SN">
|
||||
<el-input v-model="dialog.batchSn" :placeholder="batchSnPlaceholder" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="附件">
|
||||
<el-upload action="#" :show-file-list="false" :http-request="doUpload" multiple>
|
||||
<el-button>选择文件上传</el-button>
|
||||
@@ -110,11 +117,19 @@
|
||||
<el-option label="退货" value="退货" />
|
||||
<el-option label="返修" value="返修" />
|
||||
<el-option label="退换" value="退换" />
|
||||
<el-option label="报废" value="报废" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 退货/退换处置必填退货运单号(WMS 联动置「待退」需要) -->
|
||||
<el-form-item v-if="dialog.disposalType === '退货' || dialog.disposalType === '退换'" label="退货运单号" required>
|
||||
<el-input v-model="dialog.returnTrackingNo" placeholder="退货/退换处置必填" />
|
||||
</el-form-item>
|
||||
<el-form-item label="处置说明">
|
||||
<el-input v-model="dialog.disposalRemark" type="textarea" :rows="2" placeholder="处置说明(可空)" />
|
||||
</el-form-item>
|
||||
<el-alert v-if="!dialog.batchSn" type="info" :closable="false" show-icon style="margin-bottom:12px">
|
||||
<template #title>填写批次号/SN 后保存,将自动联动 WMS 在库处置(置待退/隔离/报废);留空则仅在 MES 留痕。</template>
|
||||
</el-alert>
|
||||
</template>
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="dialog.remark" type="textarea" :rows="2" placeholder="检验描述 / 签字(可空)" />
|
||||
@@ -214,6 +229,7 @@ function onTabChange() { reload() }
|
||||
const dialog = reactive({
|
||||
show: false, category: 'QC_PROCESS', reportNo: '', materialCode: '', materialName: '',
|
||||
manufacturer: '', inspectionNo: '', result: 'OK', disposalType: '', disposalRemark: '',
|
||||
batchSn: '', returnTrackingNo: '',
|
||||
remark: '', attachments: []
|
||||
})
|
||||
const bomOptions = ref([])
|
||||
@@ -221,11 +237,20 @@ const bomLoading = ref(false)
|
||||
// WMS 物料档案全量缓存(/materials 代理接口,WMS 是物料主数据源);检索改为本地过滤
|
||||
const allMaterials = ref([])
|
||||
|
||||
// 批次号/SN 输入提示:按物料档案管理方式区分(电气件 manage_mode=2 填 SN,结构件填批次号)
|
||||
const batchSnPlaceholder = computed(() => {
|
||||
const m = allMaterials.value.find((x) => x.code === dialog.materialCode)
|
||||
if (m && m.manageMode === 2) return '电气件:请填 SN(联动 WMS 按序列号定位库存)'
|
||||
if (m && m.manageMode === 1) return '结构件:请填批次号(联动 WMS 按批次定位库存)'
|
||||
return '电气件填SN、结构件填批次(可空,用于联动 WMS 处置)'
|
||||
})
|
||||
|
||||
function openCreate() {
|
||||
Object.assign(dialog, {
|
||||
show: true, category: activeTab.value,
|
||||
reportNo: `RQ${Date.now()}`, materialCode: '', materialName: '',
|
||||
manufacturer: '', inspectionNo: '', result: 'OK', disposalType: '', disposalRemark: '',
|
||||
batchSn: '', returnTrackingNo: '',
|
||||
remark: '', attachments: []
|
||||
})
|
||||
bomOptions.value = []
|
||||
@@ -278,14 +303,24 @@ async function submit() {
|
||||
inspectionNo: dialog.inspectionNo,
|
||||
result: dialog.result,
|
||||
remark: dialog.remark,
|
||||
// 批次号/SN + 管理口径(SN=电气件按序列号定位 / BATCH=结构件按批次定位),
|
||||
// 判不合格时后端据此联动 WMS 在库处置
|
||||
batchSn: dialog.batchSn.trim(),
|
||||
batchSnMode: (allMaterials.value.find((x) => x.code === dialog.materialCode)?.manageMode === 2) ? 'SN' : 'BATCH',
|
||||
attachmentIds: dialog.attachments.map((a) => a.id).join(',')
|
||||
}
|
||||
if (dialog.result === 'NG') {
|
||||
if (!dialog.disposalType) return ElMessage.warning('请选择处置方式')
|
||||
if ((dialog.disposalType === '退货' || dialog.disposalType === '退换') && !dialog.returnTrackingNo.trim()) {
|
||||
return ElMessage.warning('退货/退换处置必须填写退货运单号')
|
||||
}
|
||||
body.disposalType = dialog.disposalType
|
||||
body.disposalRemark = dialog.disposalRemark
|
||||
body.returnTrackingNo = dialog.returnTrackingNo.trim()
|
||||
}
|
||||
await request.post('/inspections', body)
|
||||
ElMessage.success('检验记录已保存')
|
||||
// 保存成功信息由后端返回:正常「检验记录已保存」;WMS 联动失败时提示「库存联动失败: 原因」(留痕不丢)
|
||||
const res = await request.post('/inspections', body)
|
||||
ElMessage.success(res?.message || '检验记录已保存')
|
||||
dialog.show = false
|
||||
load()
|
||||
}
|
||||
|
||||
@@ -119,7 +119,7 @@
|
||||
<el-date-picker v-model="dialog.planStart" type="date" value-format="YYYY-MM-DD"
|
||||
placeholder="计划开始日期(选填)" style="width:100%" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工艺组合" required>
|
||||
<el-form-item label="工艺组合">
|
||||
<div style="width:100%">
|
||||
<el-checkbox-group v-model="selStations" class="combo-group">
|
||||
<template v-for="g in flowGroups" :key="g.key">
|
||||
@@ -135,7 +135,7 @@
|
||||
执行路线:{{ routeText }}
|
||||
<span class="combo-route-tip">(执行顺序=工位号升序,可跳过未选工位)</span>
|
||||
</div>
|
||||
<div class="combo-tip">仅显示已绑定启用工位的工艺;默认每个工艺的启用工位全选,至少选一道工艺;全不选某工艺则该工艺不进入组合。</div>
|
||||
<div class="combo-tip">仅显示已绑定启用工位的工艺;工艺组合可稍后配置,排产/开工前必须已有组合;默认每个工艺的启用工位全选,全不选某工艺则该工艺不进入组合。</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -148,7 +148,7 @@
|
||||
<!-- 自动排产(引导式,Item K) -->
|
||||
<el-dialog v-model="sched.show" :title="`自动排产 - ${sched.orderNo}`" width="640px">
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:14px"
|
||||
title="自动排产仅排「未开工数量 = 工单总数 − 已完工 − 在产未完工」,生成后状态为未启用(PENDING),需到「日排产」页面人工启用后生效。" />
|
||||
title="排产仅排「未开工数量 = 工单总数 − 已完工 − 在产未完工」:生成预览后可逐日调节数量(前松/中紧/后松等任意节奏),各日合计须与应排总数一致;确认后生成未启用(PENDING)排产,需到「日排产」页面人工启用后生效。" />
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:14px"
|
||||
:title="`项目开始:${fmtDateOnly(sched.planStart)} 结束:${fmtDateOnly(sched.dueDate)} 工单数量:${sched.quantity} 已完工:${sched.finishedNum}`" />
|
||||
<el-form :model="sched" label-width="100px">
|
||||
@@ -172,20 +172,38 @@
|
||||
<div class="sched-tip">可多段(如 6/23-26 + 6/28-29),区间并集去重排序</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="预览">
|
||||
<div class="sched-preview">
|
||||
<div>共 {{ previewDates.length }} 天:{{ previewDates.join('、') || '-' }}</div>
|
||||
<div v-if="sched.mode === 'AVG' && previewDates.length">平均分摊到 {{ previewDates.length }} 天(余数补前几天)</div>
|
||||
<div v-if="sched.mode === 'FIXED' && previewDates.length">每日 {{ sched.dailyQty }} 件 × {{ previewDates.length }} 天(超未开工数量将被拒)</div>
|
||||
<div v-if="sched.mode === 'FIXED' && previewDates.length" :class="{ 'sched-warn': previewTotal > sched.quantity }">
|
||||
本次计划总量 {{ previewTotal }},工单数量 {{ sched.quantity }}<span v-if="previewTotal > sched.quantity">(超出工单数量,保存将被拒绝)</span>
|
||||
<el-form-item label="排产预览">
|
||||
<div style="width:100%">
|
||||
<el-table v-if="sched.preview" :data="sched.preview.rows" border size="small" max-height="320">
|
||||
<el-table-column prop="date" label="日期" width="130" align="center" />
|
||||
<el-table-column label="计划数量" width="200" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-input-number v-if="row.editable" v-model="row.qty" :min="0" :step="1" size="small" style="width:150px" />
|
||||
<span v-else>{{ row.qty }}({{ row.existStatus === 'PROCESSING' ? '执行中' : '已完成' }})</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="说明" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag v-if="row.editable" type="primary" size="small">可调</el-tag>
|
||||
<el-tag v-else type="info" size="small">已执行中/已完成,锁定</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div v-if="sched.preview" class="sched-tip">
|
||||
可调合计 <b>{{ schedTotal }}</b> 件 / 应排总数 <b>{{ sched.preview.quota }}</b> 件
|
||||
<span v-if="schedTotal === sched.preview.quota" style="color:var(--el-color-success)">(一致,可确认)</span>
|
||||
<span v-else style="color:var(--el-color-danger)">(不一致,确认前需调平)</span>
|
||||
</div>
|
||||
<div v-else class="sched-tip">选好模式与日期区间后,点下方「生成预览」查看逐日计划数量并自行调节</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="sched.show=false">取消</el-button>
|
||||
<el-button v-if="can('produce.workorder:dailyplan')" type="primary" @click="submitAutoSchedule">确认排产</el-button>
|
||||
<el-button :loading="sched.previewing" @click="genPreview">生成预览</el-button>
|
||||
<el-button v-if="can('produce.workorder:dailyplan')" type="primary"
|
||||
:disabled="!sched.preview || schedTotal !== sched.preview.quota" :loading="sched.applying"
|
||||
@click="applySchedule">确认排产</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<!-- 工单单台用料汇总(只读:工单工艺组合 × 工艺物料清单 实时汇总,不落库) -->
|
||||
@@ -269,7 +287,7 @@ const flowGroups = computed(() => {
|
||||
if (map.has(f.id) && f.name) map.get(f.id).flowName = f.name
|
||||
})
|
||||
// 只显示「至少绑定了一个启用工位」的工艺;未绑定工位、或绑定的工位全部停用的工艺整组隐藏
|
||||
const arr = Array.from(map.values()).filter((g) => g.flowId > 0 && g.stations.some((s) => s.isActive))
|
||||
const arr = Array.from(map.values()).filter((g) => g.flowId > 0 && g.stations.some((s) => s.status === 'ENABLED'))
|
||||
arr.sort((a, b) => (a.flowName || '').localeCompare(b.flowName || '', 'zh'))
|
||||
return arr.map((g) => ({
|
||||
key: g.flowId,
|
||||
@@ -294,7 +312,7 @@ function defaultSelStations() {
|
||||
// 默认全选「可见工艺组」内的启用工位(被隐藏工艺组下的工位不参与组合)
|
||||
const visible = new Set(flowGroups.value.map((g) => g.flowId))
|
||||
return stations.value
|
||||
.filter((s) => s.flowId > 0 && visible.has(s.flowId) && s.isActive)
|
||||
.filter((s) => s.flowId > 0 && visible.has(s.flowId) && s.status === 'ENABLED')
|
||||
.map((s) => s.stationNo)
|
||||
.sort((a, b) => a - b)
|
||||
}
|
||||
@@ -362,7 +380,8 @@ function openEdit(row) {
|
||||
}
|
||||
async function save() {
|
||||
if (!dialog.dueDate) return ElMessage.warning('请选择完成日期(必填)')
|
||||
if (!flowCombination.value.length) return ElMessage.warning('请至少勾选一个工位形成工艺组合')
|
||||
// 建单不强制工艺组合(工单≠开工):排产/开工时由后端校验组合非空
|
||||
if (!flowCombination.value.length) ElMessage.warning('未选择工艺组合:排产/开工前须配置')
|
||||
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, contractNo: dialog.contractNo, projectNo: dialog.projectNo, productSerial: dialog.productSerial, quantity: dialog.quantity, dueDate: dialog.dueDate, planStart: dialog.planStart, flowCombination: flowCombination.value }
|
||||
if (dialog.id) await request.put('/work-orders', body)
|
||||
else await request.post('/work-orders', body)
|
||||
@@ -407,51 +426,53 @@ function moreAction(row, cmd) {
|
||||
else if (cmd === 'del') del(row)
|
||||
}
|
||||
|
||||
// ---- 自动排产(引导式,Item K)----
|
||||
const sched = reactive({ show: false, orderNo: '', mode: 'AVG', dailyQty: 1, segments: [{ range: null }], planStart: '', dueDate: '', quantity: 0, finishedNum: 0 })
|
||||
// ---- 自动排产(引导式,M9 定稿:预览逐日可调、总数据必须对上)----
|
||||
const sched = reactive({ show: false, orderNo: '', mode: 'AVG', dailyQty: 1, segments: [{ range: null }], planStart: '', dueDate: '', quantity: 0, finishedNum: 0, preview: null, previewing: false, applying: false })
|
||||
function openAutoSchedule(row) {
|
||||
Object.assign(sched, {
|
||||
show: true, orderNo: row.workOrderNo, mode: 'AVG', dailyQty: 1, segments: [{ range: null }],
|
||||
planStart: row.planStart || '', dueDate: row.dueDate || '', quantity: row.quantity || 0, finishedNum: row.finishedNum || 0
|
||||
planStart: row.planStart || '', dueDate: row.dueDate || '', quantity: row.quantity || 0, finishedNum: row.finishedNum || 0,
|
||||
preview: null, previewing: false, applying: false
|
||||
})
|
||||
}
|
||||
function addSegment() { sched.segments.push({ range: null }) }
|
||||
function removeSegment(i) { sched.segments.splice(i, 1) }
|
||||
// 客户端展开日期区间(与后端 expandDates 一致):并集去重升序,仅用于预览
|
||||
const previewDates = computed(() => {
|
||||
const seen = new Set()
|
||||
const out = []
|
||||
const p = (n) => String(n).padStart(2, '0')
|
||||
for (const seg of sched.segments) {
|
||||
const r = seg.range
|
||||
if (!r || r.length !== 2 || !r[0] || !r[1]) continue
|
||||
const start = new Date(r[0] + 'T00:00:00')
|
||||
const end = new Date(r[1] + 'T00:00:00')
|
||||
if (Number.isNaN(start.getTime()) || Number.isNaN(end.getTime()) || end < start) continue
|
||||
for (const d = new Date(start); d <= end; d.setDate(d.getDate() + 1)) {
|
||||
const ds = `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`
|
||||
if (!seen.has(ds)) { seen.add(ds); out.push(ds) }
|
||||
}
|
||||
}
|
||||
return out.sort()
|
||||
// 可调日合计(应排总数校验用:合计必须等于 quota 才能确认)
|
||||
const schedTotal = computed(() => {
|
||||
if (!sched.preview) return 0
|
||||
return sched.preview.rows.filter((r) => r.editable).reduce((a, r) => a + (r.qty || 0), 0)
|
||||
})
|
||||
// 本次排产计划总量(仅用于前端提示);AVG 模式后端按未开工数量自动均摊,此处不预估精确值
|
||||
const previewTotal = computed(() => {
|
||||
if (!previewDates.length) return 0
|
||||
if (sched.mode === 'FIXED') return sched.dailyQty * previewDates.length
|
||||
return 0
|
||||
})
|
||||
async function submitAutoSchedule() {
|
||||
// 生成预览(不落库):后端按模式给出初始逐日数量,已执行中/已完成的日期锁定展示
|
||||
async function genPreview() {
|
||||
const segments = sched.segments
|
||||
.filter((s) => s.range && s.range.length === 2 && s.range[0] && s.range[1])
|
||||
.map((s) => ({ start: s.range[0], end: s.range[1] }))
|
||||
if (!segments.length) return ElMessage.warning('请至少选择一个日期区间')
|
||||
if (sched.mode === 'FIXED' && sched.dailyQty <= 0) return ElMessage.warning('固定日产需填写每日产量(>0)')
|
||||
await request.post('/work-orders/auto-schedule', {
|
||||
orderNo: sched.orderNo, mode: sched.mode, dailyQty: sched.dailyQty, segments
|
||||
})
|
||||
ElMessage.success('自动排产已生成(待人工启用)')
|
||||
sched.show = false
|
||||
sched.previewing = true
|
||||
try {
|
||||
sched.preview = await request.post('/work-orders/auto-schedule/preview', {
|
||||
orderNo: sched.orderNo, mode: sched.mode, dailyQty: sched.dailyQty, segments
|
||||
})
|
||||
} finally {
|
||||
sched.previewing = false
|
||||
}
|
||||
}
|
||||
// 确认排产:Σ逐日数量必须等于应排总数(后端二次校验),生成 PENDING 待人工启用
|
||||
async function applySchedule() {
|
||||
if (!sched.preview) return
|
||||
const items = sched.preview.rows.filter((r) => r.editable).map((r) => ({ date: r.date, qty: r.qty || 0 }))
|
||||
if (items.reduce((a, it) => a + it.qty, 0) !== sched.preview.quota) {
|
||||
return ElMessage.warning('各日合计与应排总数不一致,请调平后再确认')
|
||||
}
|
||||
sched.applying = true
|
||||
try {
|
||||
await request.post('/work-orders/auto-schedule/apply', { orderNo: sched.orderNo, items })
|
||||
ElMessage.success('排产已确认(待人工启用)')
|
||||
sched.show = false
|
||||
} finally {
|
||||
sched.applying = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(async () => { load(); loadProducts(); loadComboData() })
|
||||
@@ -459,7 +480,6 @@ onMounted(async () => { load(); loadProducts(); loadComboData() })
|
||||
|
||||
<style scoped>
|
||||
.sched-tip { font-size: 12px; color: #909399; margin-top: 4px; }
|
||||
.sched-preview { font-size: 13px; color: #606266; line-height: 1.7; background: #f5f7fa; padding: 8px 12px; border-radius: 4px; width: 100%; }
|
||||
.combo-group { display: flex; flex-wrap: wrap; gap: 4px 12px; align-items: flex-start; width: 100%; }
|
||||
.combo-group-title { width: 100%; font-size: 12px; font-weight: 600; color: #303133; background: #f5f7fa; padding: 4px 8px; border-radius: 4px; margin-top: 4px; }
|
||||
.combo-group-title.combo-empty { color: #909399; font-weight: 500; }
|
||||
|
||||
Reference in New Issue
Block a user