feat(mes): 添加定时同步可生产数量到WMS及BOM项相关标准字段
- 在main.go中添加定时任务每10分钟同步可生产数量到WMS系统 - 为BomItem实体添加relatedStandard字段及相关CRUD方法 - 为InspectionRecord实体添加reportNo、materialCode、materialName等字段 - 更新ent schema确保新字段的验证和默认值设置 - 添加必要的数据库迁移和字段映射逻辑
This commit is contained in:
@@ -17,6 +17,10 @@
|
||||
<el-form-item label="工程编号">
|
||||
<el-input v-model="query.projectNo" placeholder="模糊查询" clearable style="width:160px" @keyup.enter="load" />
|
||||
</el-form-item>
|
||||
<el-form-item label="完成日期">
|
||||
<el-date-picker v-model="query.dueRange" type="daterange" value-format="YYYY-MM-DD"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期" style="width:250px" @change="load" />
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-select v-model="query.status" clearable placeholder="请选择状态" style="width:150px">
|
||||
<el-option v-for="s in statusOptions" :key="s.v" :label="s.l" :value="s.v" />
|
||||
@@ -44,12 +48,23 @@
|
||||
<el-table-column prop="status" label="状态" width="100">
|
||||
<template #default="{ row }">{{ statusText(row.status) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="340" fixed="right">
|
||||
<el-table-column prop="createdBy" label="创建人" width="100">
|
||||
<template #default="{ row }">{{ row.createdBy || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建日期" width="160">
|
||||
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="完成日期" width="110">
|
||||
<template #default="{ row }">{{ fmtDateOnly(row.dueDate) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="420" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<template v-if="row.status === 'CREATED'">
|
||||
<el-button v-if="can('produce.workorder:edit')" size="small" type="primary" plain @click="openSeq(row)">工位组合</el-button>
|
||||
<el-button v-if="can('produce.workorder:edit')" size="small" type="warning" @click="openEdit(row)">编辑</el-button>
|
||||
</template>
|
||||
<el-button v-if="can('produce.workorder:dailyplan') && !['DONE','CANCELLED'].includes(row.status)"
|
||||
size="small" type="success" plain @click="openAutoSchedule(row)">自动排产</el-button>
|
||||
<el-dropdown
|
||||
v-if="can('produce.workorder:edit') && statusActions(row.status).length"
|
||||
trigger="click" @command="(cmd) => changeStatus(row, cmd)">
|
||||
@@ -81,6 +96,10 @@
|
||||
<el-form-item label="工程编号"><el-input v-model="dialog.projectNo" placeholder="工程编号下挂各产品序号" /></el-form-item>
|
||||
<el-form-item label="产品序号"><el-input v-model="dialog.productSerial" placeholder="本产品在该工程下的序号" /></el-form-item>
|
||||
<el-form-item label="数量"><el-input-number v-model="dialog.quantity" :min="1" /></el-form-item>
|
||||
<el-form-item label="完成日期" required>
|
||||
<el-date-picker v-model="dialog.dueDate" type="date" value-format="YYYY-MM-DD"
|
||||
placeholder="请选择完成日期(必填)" style="width:100%" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工位组合">
|
||||
<ProcessSeqPicker :model-value="dialog.processSeq" @update:model-value="dialog.processSeq = $event" />
|
||||
</el-form-item>
|
||||
@@ -109,15 +128,55 @@
|
||||
<el-button v-if="can('produce.workorder:edit')" type="primary" @click="saveSeq">保存</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 自动排产(引导式,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),需到「日排产」页面人工启用后生效。" />
|
||||
<el-form :model="sched" label-width="100px">
|
||||
<el-form-item label="排产模式">
|
||||
<el-radio-group v-model="sched.mode">
|
||||
<el-radio value="AVG">平均分摊</el-radio>
|
||||
<el-radio value="FIXED">固定日产</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="sched.mode === 'FIXED'" label="每日产量">
|
||||
<el-input-number v-model="sched.dailyQty" :min="1" />
|
||||
</el-form-item>
|
||||
<el-form-item label="日期区间">
|
||||
<div style="width:100%">
|
||||
<div v-for="(seg, i) in sched.segments" :key="i" style="display:flex;gap:8px;margin-bottom:8px;align-items:center">
|
||||
<el-date-picker v-model="seg.range" type="daterange" value-format="YYYY-MM-DD"
|
||||
start-placeholder="开始" end-placeholder="结束" style="width:280px" />
|
||||
<el-button v-if="sched.segments.length > 1" type="danger" plain size="small" @click="removeSegment(i)">删除</el-button>
|
||||
</div>
|
||||
<el-button size="small" @click="addSegment">+ 添加区间</el-button>
|
||||
<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>
|
||||
</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>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
<PageHelp :data="helpWorkOrder" page="WorkOrder" />
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, onMounted } from 'vue'
|
||||
import { ref, reactive, computed, onMounted } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
import { can } from '../utils/perm'
|
||||
import { fmtDateOnly, fmtTime } from '../utils/format'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
import ProcessSeqPicker from '../components/ProcessSeqPicker.vue'
|
||||
import { helpWorkOrder } from '../help'
|
||||
@@ -169,29 +228,36 @@ function seqText(s) {
|
||||
return codes.map((c) => `工位${c}`).join('、')
|
||||
}
|
||||
|
||||
const query = reactive({ orderNo: '', productCode: '', productName: '', contractNo: '', projectNo: '', status: '' })
|
||||
const query = reactive({ orderNo: '', productCode: '', productName: '', contractNo: '', projectNo: '', status: '', dueRange: null })
|
||||
const list = ref([])
|
||||
const productTypes = ref([])
|
||||
|
||||
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, processSeq: '', status: 'CREATED' })
|
||||
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', processSeq: '', status: 'CREATED' })
|
||||
const seq = reactive({ show: false, id: 0, orderNo: '', productCode: '', productName: '', processSeq: '' })
|
||||
const stationNos = ref([])
|
||||
|
||||
async function load() {
|
||||
const data = await request.get('/work-orders', { params: query })
|
||||
const [dueFrom, dueTo] = query.dueRange || []
|
||||
const params = {
|
||||
orderNo: query.orderNo, productCode: query.productCode, productName: query.productName,
|
||||
contractNo: query.contractNo, projectNo: query.projectNo, status: query.status,
|
||||
dueFrom: dueFrom || '', dueTo: dueTo || ''
|
||||
}
|
||||
const data = await request.get('/work-orders', { params })
|
||||
list.value = data || []
|
||||
}
|
||||
async function loadProducts() {
|
||||
productTypes.value = (await request.get('/product-types')) || []
|
||||
}
|
||||
function openCreate() {
|
||||
Object.assign(dialog, { show: true, id: 0, workOrderNo: `WO${Date.now()}`, productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, processSeq: '', status: 'CREATED' })
|
||||
Object.assign(dialog, { show: true, id: 0, workOrderNo: `WO${Date.now()}`, productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', processSeq: '', status: 'CREATED' })
|
||||
}
|
||||
function openEdit(row) {
|
||||
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, contractNo: row.contractNo || '', projectNo: row.projectNo || '', productSerial: row.productSerial || '', quantity: row.quantity, processSeq: row.processSeq || '', status: row.status })
|
||||
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, contractNo: row.contractNo || '', projectNo: row.projectNo || '', productSerial: row.productSerial || '', quantity: row.quantity, dueDate: row.dueDate ? String(row.dueDate).slice(0, 10) : '', processSeq: row.processSeq || '', status: row.status })
|
||||
}
|
||||
async function save() {
|
||||
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, processSeq: dialog.processSeq }
|
||||
if (!dialog.dueDate) return 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, processSeq: dialog.processSeq }
|
||||
if (dialog.id) await request.put('/work-orders', body)
|
||||
else await request.post('/work-orders', body)
|
||||
ElMessage.success('保存成功')
|
||||
@@ -249,5 +315,48 @@ async function del(row) {
|
||||
load()
|
||||
}
|
||||
|
||||
// ---- 自动排产(引导式,Item K)----
|
||||
const sched = reactive({ show: false, orderNo: '', mode: 'AVG', dailyQty: 1, segments: [{ range: null }] })
|
||||
function openAutoSchedule(row) {
|
||||
Object.assign(sched, { show: true, orderNo: row.workOrderNo, mode: 'AVG', dailyQty: 1, segments: [{ range: null }] })
|
||||
}
|
||||
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()
|
||||
})
|
||||
async function submitAutoSchedule() {
|
||||
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
|
||||
}
|
||||
|
||||
onMounted(async () => { load(); loadProducts(); stationNos.value = await loadStationNos() })
|
||||
</script>
|
||||
|
||||
<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%; }
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user