feat: 大屏多订单改为同屏并列展示,物料申请新增跨工位借料来源并移除工单完成日期
This commit is contained in:
@@ -56,6 +56,8 @@
|
||||
</div>
|
||||
<el-alert v-if="crossDayWarn" type="warning" :closable="false" show-icon style="margin-bottom:10px"
|
||||
title="叫料池含非今日排产的料(跨日叫料):工位端预警提示;仓库可正常发,也可按「非当日」驳回。" />
|
||||
<el-alert v-if="hasBorrow" type="warning" :closable="false" show-icon style="margin-bottom:10px"
|
||||
title="部分物料将【跨工位借料】发出:本工位不足的部分会从同工序其他工位的剩余额度借出(由您手动分配,借出工位可用量相应扣减)。请确认无误后再提交。" />
|
||||
|
||||
<el-table :data="pool" border size="large" class="call-table" v-loading="poolLoading" empty-text="本工位暂无叫料池(排产未启用或工艺无物料)">
|
||||
<el-table-column label="图号" prop="materialCode" min-width="120" />
|
||||
@@ -73,15 +75,38 @@
|
||||
<el-table-column label="占用中" width="90" align="center">
|
||||
<template #default="{row}">{{ fmtQty(row.reservedQty) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="可用" width="90" align="center">
|
||||
<el-table-column label="可用/可借" width="120" align="center">
|
||||
<template #default="{row}">
|
||||
<span :class="row.availQty > 0 ? 'ok' : 'ng'" style="font-weight:700">{{ fmtQty(row.availQty) }}</span>
|
||||
<el-tag v-if="row.crossDay" type="warning" size="small" style="margin-left:6px">非当日</el-tag>
|
||||
<div v-if="Number(row.borrowAvail) > 0" style="font-size:12px;color:#909399;margin-top:2px">可借 {{ fmtQty(row.borrowAvail) }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="叫料量" width="130" align="center">
|
||||
<el-table-column label="叫料量 / 借料" width="320" align="center">
|
||||
<template #default="{row}">
|
||||
<el-input-number v-model="row.callQty" size="large" :min="0" :max="row.availQty" :precision="0" controls-position="right" />
|
||||
<el-input-number v-model="row.callQty" size="large" :min="0" :max="Number(row.availQty)" :precision="0" controls-position="right" />
|
||||
<!-- 严格收口:仅当本工位可用额度为 0(完全没料)才出现「无料」提示与借料入口;availQty>0 绝不出现 -->
|
||||
<div v-if="Number(row.availQty) === 0" class="borrow-area">
|
||||
<el-alert type="error" :closable="false" show-icon
|
||||
style="margin:4px 0" title="本工位该物料可用量为 0(无料),需借料才能完成叫料" />
|
||||
<template v-if="(row.borrowSources || []).length">
|
||||
<div style="font-size:12px;color:#e6a23c;margin:2px 0">借料须手动分配(不默认、不替您决定):</div>
|
||||
<el-button v-if="!row.borrowOpen" size="small" type="warning" @click="row.borrowOpen = true">去借料</el-button>
|
||||
<div v-else>
|
||||
<div v-for="src in row.borrowSources" :key="src.stationNo"
|
||||
style="display:flex;align-items:center;justify-content:space-between;gap:8px;margin:2px 0">
|
||||
<span style="font-size:12px">工位{{ src.stationNo }}(可借 {{ fmtQty(src.avail) }})</span>
|
||||
<el-input-number v-model="row.borrow[src.stationNo]" :min="0" :max="src.avail" :precision="0" size="small" controls-position="right" />
|
||||
</div>
|
||||
<div style="font-size:12px;color:#909399;margin-top:2px">
|
||||
本工位自取 {{ fmtQty(row.callQty) }} + 已借 {{ fmtQty(borrowSum(row)) }} = 请求合计 {{ fmtQty(Number(row.callQty) + borrowSum(row)) }}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<div v-else style="font-size:12px;color:#f56c6c;margin-top:2px">
|
||||
同工序其他工位无可用余量,无法借料。
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="目标接驳台" width="150" align="center">
|
||||
@@ -95,7 +120,7 @@
|
||||
|
||||
<div class="call-foot">
|
||||
<el-button type="primary" size="large" class="big-btn" :loading="calling" :disabled="!canCall" @click="doCall">提交叫料</el-button>
|
||||
<span class="block-tip" v-if="!canCall">填「叫料量」并选「目标接驳台」后可提交(量不能超过可用)</span>
|
||||
<span class="block-tip" v-if="!canCall">填「叫料量」并选「目标接驳台」后可提交(量不超过本工位可用+同工序可借)</span>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -166,6 +191,9 @@ const poolLoading = ref(false)
|
||||
const calling = ref(false)
|
||||
const dockOptions = ref([])
|
||||
const crossDayWarn = computed(() => pool.value.some((r) => r.crossDay))
|
||||
const hasBorrow = computed(() =>
|
||||
pool.value.some((r) => borrowSum(r) > 0)
|
||||
)
|
||||
const canCall = computed(() =>
|
||||
pool.value.some((r) => Number(r.callQty) > 0 && r.dock)
|
||||
)
|
||||
@@ -175,6 +203,12 @@ function fmtQty(v) {
|
||||
return Number.isInteger(n) ? String(n) : n.toFixed(2)
|
||||
}
|
||||
|
||||
// 借料辅助:借料分配合计(来自各候选工位的手动分配量)
|
||||
function borrowSum(row) {
|
||||
const b = row.borrow || {}
|
||||
return Object.values(b).reduce((s, v) => s + (Number(v) || 0), 0)
|
||||
}
|
||||
|
||||
async function loadPool() {
|
||||
poolLoading.value = true
|
||||
try {
|
||||
@@ -184,6 +218,8 @@ async function loadPool() {
|
||||
pool.value = list.map((r) => ({
|
||||
...r,
|
||||
callQty: 0,
|
||||
borrow: {},
|
||||
borrowOpen: false,
|
||||
dock: stationDock.value || ''
|
||||
}))
|
||||
} catch {
|
||||
@@ -208,17 +244,34 @@ async function loadDocks() {
|
||||
|
||||
// 提交叫料:按行拆单(每行=物料+量+接驳台=一单)
|
||||
async function doCall() {
|
||||
// 借料:叫料量 = 本工位自取 + 借料(借料不默认、不替人决定,由各候选工位手动填);总量上限由各 input 的 max 兜底
|
||||
const items = pool.value
|
||||
.filter((r) => Number(r.callQty) > 0 && r.dock)
|
||||
.map((r) => ({ materialCode: r.materialCode, qty: Number(r.callQty), dock: r.dock }))
|
||||
.filter((r) => (Number(r.callQty) > 0 || borrowSum(r) > 0) && r.dock)
|
||||
.map((r) => {
|
||||
const borrow = {}
|
||||
for (const [k, v] of Object.entries(r.borrow || {})) {
|
||||
if (Number(v) > 0) borrow[k] = Number(v)
|
||||
}
|
||||
const qty = Number(r.callQty) + borrowSum(r)
|
||||
const item = { materialCode: r.materialCode, qty, dock: r.dock }
|
||||
if (Object.keys(borrow).length) item.borrow = borrow
|
||||
return item
|
||||
})
|
||||
if (!items.length) {
|
||||
ElMessage.warning('请填写叫料量并选择目标接驳台')
|
||||
ElMessage.warning('请填写本工位叫料量(或借料量)并选择目标接驳台')
|
||||
return
|
||||
}
|
||||
const over = pool.value.find((r) => Number(r.callQty) > Number(r.availQty))
|
||||
if (over) {
|
||||
ElMessage.warning(`「${over.materialName || over.materialCode}」叫料量超过可用量(${fmtQty(over.availQty)})`)
|
||||
return
|
||||
// 跨工位借料:明确确认(提示清楚即可,避免误操作,也免改排产)
|
||||
if (hasBorrow.value) {
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
'您将进行【跨工位借料】:超出本工位可用量的部分会从同工序其他工位的剩余额度借出,借出工位的可用量会相应扣减(无需改排产)。确认提交?',
|
||||
'跨工位借料确认',
|
||||
{ type: 'warning', confirmButtonText: '确认借料并提交' }
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
}
|
||||
calling.value = true
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user