feat(mes): 添加定时同步可生产数量到WMS及BOM项相关标准字段
- 在main.go中添加定时任务每10分钟同步可生产数量到WMS系统 - 为BomItem实体添加relatedStandard字段及相关CRUD方法 - 为InspectionRecord实体添加reportNo、materialCode、materialName等字段 - 更新ent schema确保新字段的验证和默认值设置 - 添加必要的数据库迁移和字段映射逻辑
This commit is contained in:
@@ -10,12 +10,53 @@ const orderNo = ref('')
|
||||
const materialCode = ref('')
|
||||
const materialName = ref('')
|
||||
const stateFilter = ref('')
|
||||
const completeRange = ref([]) // 完成时间范围 [start, end]
|
||||
const loading = ref(false)
|
||||
const queried = ref(false)
|
||||
const rows = ref([])
|
||||
const total = ref(0)
|
||||
const page = reactive({ current: 1, size: 20 })
|
||||
|
||||
// 页签:备料台账 / 退料台账(并列)
|
||||
const activeTab = ref('prep')
|
||||
|
||||
// 退料台账:return_orders(RECEIVED) 按工单+物料聚合的读模型,与备料台账并列,不回写已出库量
|
||||
const retOrderNo = ref('')
|
||||
const retMaterialCode = ref('')
|
||||
const retMaterialName = ref('')
|
||||
const retLoading = ref(false)
|
||||
const retQueried = ref(false)
|
||||
const retRows = ref([])
|
||||
const retTotal = ref(0)
|
||||
const retPage = reactive({ current: 1, size: 20 })
|
||||
|
||||
async function loadReturn() {
|
||||
retLoading.value = true
|
||||
try {
|
||||
const data = await request.get('/return-order/ledger', {
|
||||
params: {
|
||||
orderNo: retOrderNo.value.trim() || undefined,
|
||||
materialCode: retMaterialCode.value.trim() || undefined,
|
||||
materialName: retMaterialName.value.trim() || undefined,
|
||||
page: retPage.current,
|
||||
pageSize: retPage.size
|
||||
}
|
||||
})
|
||||
retRows.value = data?.list || []
|
||||
retTotal.value = data?.total || 0
|
||||
retQueried.value = true
|
||||
} finally {
|
||||
retLoading.value = false
|
||||
}
|
||||
}
|
||||
function searchReturn() {
|
||||
retPage.current = 1
|
||||
loadReturn()
|
||||
}
|
||||
function onTabChange(name) {
|
||||
if (name === 'return' && !retQueried.value) loadReturn()
|
||||
}
|
||||
|
||||
function gapOf(row) {
|
||||
return Math.max((row.totalQty || 0) - (row.outQty || 0), 0)
|
||||
}
|
||||
@@ -29,6 +70,8 @@ async function load() {
|
||||
materialCode: materialCode.value.trim() || undefined,
|
||||
materialName: materialName.value.trim() || undefined,
|
||||
state: stateFilter.value || undefined,
|
||||
completeStart: completeRange.value?.[0] || undefined,
|
||||
completeEnd: completeRange.value?.[1] || undefined,
|
||||
page: page.current,
|
||||
pageSize: page.size
|
||||
}
|
||||
@@ -65,14 +108,16 @@ function statusView(row) {
|
||||
|
||||
<template>
|
||||
<div>
|
||||
<el-tabs v-model="activeTab" @tab-change="onTabChange">
|
||||
<el-tab-pane label="备料台账" name="prep">
|
||||
<el-card shadow="never" class="mb12">
|
||||
<el-form inline @submit.prevent="search">
|
||||
<el-form-item label="工单号">
|
||||
<el-input v-model="orderNo" placeholder="工单号(可空,查全部)" clearable
|
||||
style="width:200px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料编码">
|
||||
<el-input v-model="materialCode" placeholder="物料编码(可空)" clearable
|
||||
<el-form-item label="图号">
|
||||
<el-input v-model="materialCode" placeholder="图号(可空)" clearable
|
||||
style="width:160px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料名称">
|
||||
@@ -87,6 +132,11 @@ function statusView(row) {
|
||||
<el-option label="未到货" value="未到货" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="完成时间">
|
||||
<el-date-picker v-model="completeRange" type="daterange" value-format="YYYY-MM-DD"
|
||||
start-placeholder="开始" end-placeholder="结束" clearable
|
||||
style="width:240px" @change="search" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="loading" @click="search">查询</el-button>
|
||||
</el-form-item>
|
||||
@@ -100,7 +150,7 @@ function statusView(row) {
|
||||
<el-table :data="rows" border v-loading="loading" empty-text="暂无台账数据">
|
||||
<el-table-column prop="id" label="ID" width="64" align="center" />
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="150" />
|
||||
<el-table-column prop="materialCode" label="物料编码" min-width="140" />
|
||||
<el-table-column prop="materialCode" label="图号" min-width="140" />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="160">
|
||||
<template #default="{ row }">{{ row.materialName || '-' }}</template>
|
||||
</el-table-column>
|
||||
@@ -123,6 +173,9 @@ function statusView(row) {
|
||||
<el-table-column prop="remark" label="备注" min-width="140">
|
||||
<template #default="{ row }">{{ row.remark || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="完成时间" width="165" align="center">
|
||||
<template #default="{ row }">{{ row.completedAt ? fmtTime(row.completedAt) : '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" width="165" align="center">
|
||||
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
|
||||
</el-table-column>
|
||||
@@ -137,6 +190,62 @@ function statusView(row) {
|
||||
<el-card v-else shadow="never">
|
||||
<el-skeleton :rows="6" animated />
|
||||
</el-card>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="退料台账" name="return">
|
||||
<el-card shadow="never" class="mb12">
|
||||
<el-form inline @submit.prevent="searchReturn">
|
||||
<el-form-item label="工单号">
|
||||
<el-input v-model="retOrderNo" placeholder="工单号(可空,查全部)" clearable
|
||||
style="width:200px" @keyup.enter="searchReturn" />
|
||||
</el-form-item>
|
||||
<el-form-item label="图号">
|
||||
<el-input v-model="retMaterialCode" placeholder="图号(可空)" clearable
|
||||
style="width:160px" @keyup.enter="searchReturn" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料名称">
|
||||
<el-input v-model="retMaterialName" placeholder="物料名称(可空)" clearable
|
||||
style="width:160px" @keyup.enter="searchReturn" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="retLoading" @click="searchReturn">查询</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<el-card v-if="retQueried" shadow="never">
|
||||
<template #header>
|
||||
工单退料台账(共 {{ retTotal }} 条)· 数据源:已收货退库单聚合,独立于备料台账、不回写已出库量
|
||||
</template>
|
||||
<el-table :data="retRows" border v-loading="retLoading" empty-text="暂无退料数据">
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="150">
|
||||
<template #default="{ row }">{{ row.orderNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="materialCode" label="图号" min-width="140" />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="160">
|
||||
<template #default="{ row }">{{ row.materialName || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="spec" label="规格" min-width="120">
|
||||
<template #default="{ row }">{{ row.spec || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="returnedQty" label="已退数量" width="100" align="center" />
|
||||
<el-table-column prop="returnCount" label="退库笔数" width="100" align="center" />
|
||||
<el-table-column label="退库工位" width="140" align="center">
|
||||
<template #default="{ row }">{{ (row.stations && row.stations.length) ? row.stations.join('、') : '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="最近退库时间" width="165" align="center">
|
||||
<template #default="{ row }">{{ row.lastReceive ? fmtTime(row.lastReceive) : '-' }}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="pager">
|
||||
<el-pagination background layout="total, prev, pager, next" :total="retTotal"
|
||||
:current-page="retPage.current" :page-size="retPage.size"
|
||||
@current-change="(p) => { retPage.current = p; loadReturn() }" />
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card v-else shadow="never">
|
||||
<el-skeleton :rows="6" animated />
|
||||
</el-card>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
<PageHelp :data="helpLedger" page="Ledger" />
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user