feat: 两库对等物料管理及产品工号贯通全流程
- 新增 MES 本地物料表及双向同步接口,WMS 物料变更自动同步 - 全流程新增产品工号字段,贯通入库/库存/出库/检验环节 - 工单管理支持多工单混产,移除单工单互斥限制 - 新增批次号/SN 字段支持质量检验联动 WMS 库存处置 - 修复权限规则,仅内置管理员账号不允许修改删除 - 工位终端新增 SN 扫码自动切换所属工单功能
This commit is contained in:
@@ -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