feat(mes): 添加按产品查询工序列表功能

pull/871/MERGE
YunaiV 2026-03-15 20:43:44 +08:00
parent e4c0a881f0
commit 3d459b292f
3 changed files with 53 additions and 28 deletions

View File

@ -27,6 +27,11 @@ export const ProRouteProcessApi = {
return await request.get({ url: `/mes/pro/route-process/list-by-route?routeId=` + routeId })
},
// 按产品查询工序列表(自动查找关联的工艺路线)
getRouteProcessListByProduct: async (productId: number) => {
return await request.get({ url: `/mes/pro/route-process/list-by-product?productId=` + productId })
},
// 查询工艺路线工序详情
getRouteProcess: async (id: number) => {
return await request.get({ url: `/mes/pro/route-process/get?id=` + id })

View File

@ -1,5 +1,6 @@
<!-- MES 生产任务表单 -->
<!-- TODO @芋艿晚点在 review -->
<!-- TODO @AI融合到 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/pro/task/ProTaskList.vue参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/wm/productionissue/ProductionIssueLineList.vue -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form
@ -36,10 +37,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="工作站" prop="workstationId">
<MdWorkstationSelect
v-model="formData.workstationId"
:disabled="isDetail"
/>
<MdWorkstationSelect v-model="formData.workstationId" :disabled="isDetail" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -177,15 +175,19 @@ const isDetail = computed(() => formType.value === 'detail')
/** 自动计算结束时间startTime + duration * 8h */
const computeEndTime = () => {
if (formData.value.startTime && formData.value.duration) {
const start = typeof formData.value.startTime === 'number'
? formData.value.startTime
: new Date(formData.value.startTime).getTime()
const start =
typeof formData.value.startTime === 'number'
? formData.value.startTime
: new Date(formData.value.startTime).getTime()
formData.value.endTime = start + formData.value.duration * 8 * 3600 * 1000
}
}
//
watch(() => formData.value.startTime, () => computeEndTime())
watch(
() => formData.value.startTime,
() => computeEndTime()
)
/** 打开弹窗 */
const open = async (

View File

@ -1,12 +1,7 @@
<!-- MES 生产排产 - 工单排产对话框表单布局与 WorkOrderForm 保持一致全部 disabled -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
<el-form
ref="formRef"
:model="formData"
label-width="120px"
v-loading="formLoading"
>
<el-form ref="formRef" :model="formData" label-width="120px" v-loading="formLoading">
<el-row>
<el-col :span="12">
<el-form-item label="工单编码" prop="code">
@ -116,15 +111,16 @@
</el-row>
</el-form>
<!-- TODO @AI都展示不只 isSchedule -->
<!-- 工序步骤导航仅排产模式显示 -->
<el-steps
v-if="isSchedule && routeProcessList.length && formData.id"
:active="activeProcessStep"
finish-status="success"
align-center
simple
class="my-15px"
class="my-10px"
>
<!-- TODO @AIstyle 改成 unocss -->
<el-step
v-for="(rp, index) in routeProcessList"
:key="rp.processId"
@ -152,8 +148,16 @@
:process-list="routeProcessList"
/>
</el-card>
<!-- TODO @AI完成拿到 index.vue 这里不放 -->
<template #footer>
<!-- TODO @芋艿完成排产的逻辑需要后端提供对应接口 -->
<el-button
v-if="isSchedule && formData.status === MesProWorkOrderStatusEnum.CONFIRMED && formData.id"
type="success"
@click="handleFinish"
>
完成
</el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
@ -163,11 +167,14 @@
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { ProWorkOrderApi } from '@/api/mes/pro/workorder'
import { ProRouteProcessApi, ProRouteProcessVO } from '@/api/mes/pro/route/process'
import { ProRouteProductApi } from '@/api/mes/pro/route/product'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
import { MesProWorkOrderSourceTypeEnum, MesProWorkOrderTypeEnum } from '@/views/mes/utils/constants'
import {
MesProWorkOrderSourceTypeEnum,
MesProWorkOrderTypeEnum,
MesProWorkOrderStatusEnum
} from '@/views/mes/utils/constants'
import ProTaskList from './ProTaskList.vue'
defineOptions({ name: 'WorkOrderForm2' })
@ -206,8 +213,8 @@ const open = async (type: string, id: number) => {
//
formData.value = await ProWorkOrderApi.getWorkOrder(id)
// 线
if (type === 'schedule' && formData.value.productId) {
// 线
if (formData.value.productId) {
await loadRouteProcesses(formData.value.productId)
}
} finally {
@ -215,21 +222,32 @@ const open = async (type: string, id: number) => {
}
}
/** 加载工艺路线工序列表 */
/** 加载工艺路线工序列表(通过产品查找关联的工艺路线) */
const message = useMessage()
const loadRouteProcesses = async (productId: number) => {
try {
// 线"线"
const routeProducts = await ProRouteProductApi.getRouteProductListByRoute(0)
const matched = routeProducts?.find((rp: any) => rp.itemId === productId)
if (matched) {
currentRouteId.value = matched.routeId
const processes = await ProRouteProcessApi.getRouteProcessListByRoute(matched.routeId)
const processes = await ProRouteProcessApi.getRouteProcessListByProduct(productId)
if (processes && processes.length > 0) {
currentRouteId.value = processes[0].routeId
routeProcessList.value = processes.sort((a: any, b: any) => a.sort - b.sort)
} else {
message.warning('当前产品未配置工艺路线,请先在工艺路线中维护')
}
} catch (e) {
console.warn('加载工艺路线工序失败', e)
}
}
/** 完成排产(对齐 KTG 的 handleFinish */
const handleFinish = async () => {
try {
await message.confirm('是否完成工单排产?【完成后将不能更改】')
// TODO @
// await ProWorkOrderApi.updateWorkOrderStatus(formData.value.id, MesProWorkOrderStatusEnum.FINISHED)
message.success('排产完成')
dialogVisible.value = false
} catch {}
}
defineExpose({ open })
</script>