From 3d459b292f8f97046be7988ac00079eaac336441 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 15 Mar 2026 20:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=89=E4=BA=A7=E5=93=81=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/pro/route/process/index.ts    |  5 ++
 src/views/mes/pro/task/ProTaskForm.vue    | 18 +++----
 src/views/mes/pro/task/WorkOrderForm2.vue | 58 +++++++++++++++--------
 3 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/src/api/mes/pro/route/process/index.ts b/src/api/mes/pro/route/process/index.ts
index 38da9dc9b..b878f3a72 100644
--- a/src/api/mes/pro/route/process/index.ts
+++ b/src/api/mes/pro/route/process/index.ts
@@ -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 })
diff --git a/src/views/mes/pro/task/ProTaskForm.vue b/src/views/mes/pro/task/ProTaskForm.vue
index 0f933044b..091a99b26 100644
--- a/src/views/mes/pro/task/ProTaskForm.vue
+++ b/src/views/mes/pro/task/ProTaskForm.vue
@@ -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 (
diff --git a/src/views/mes/pro/task/WorkOrderForm2.vue b/src/views/mes/pro/task/WorkOrderForm2.vue
index 820168f69..56534a1f8 100644
--- a/src/views/mes/pro/task/WorkOrderForm2.vue
+++ b/src/views/mes/pro/task/WorkOrderForm2.vue
@@ -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 @AI：style 改成 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>