From e1291c7ad385a4c40cc3920591299b996d61afc3 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 20 Jan 2025 09:16:27 +0800
Subject: [PATCH] =?UTF-8?q?change(mes):=20=E4=BF=AE=E6=94=B9=E6=B4=BE?=
 =?UTF-8?q?=E5=B7=A5=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9Eapi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/planInfo/index.ts               |  25 ++
 src/views/mes/orderInfo/editProductPlan.vue | 317 +++++++++++++-------
 2 files changed, 226 insertions(+), 116 deletions(-)

diff --git a/src/api/mes/planInfo/index.ts b/src/api/mes/planInfo/index.ts
index 042395c..f4158d0 100644
--- a/src/api/mes/planInfo/index.ts
+++ b/src/api/mes/planInfo/index.ts
@@ -75,3 +75,28 @@ export function getPlanInfoList (query) {
         params: query
     });
 };
+
+// 获取工艺路线的所有工艺步骤
+export function getBaseRouteProcesses(query) {
+  return request({
+    url: '/mes/planInfo/getBaseRouteProcesses' ,
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取派工编号
+export function getDispatchCode() {
+  return request({
+    url: '/mes/planInfo/getDispatchCode',
+    method: 'get'
+  })
+}
+// 查询生产派工列表
+export function selectProductPlans(query) {
+  return request({
+    url: '/mes/planInfo/selectProductPlans',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/mes/orderInfo/editProductPlan.vue b/src/views/mes/orderInfo/editProductPlan.vue
index fc8d629..57174d4 100644
--- a/src/views/mes/orderInfo/editProductPlan.vue
+++ b/src/views/mes/orderInfo/editProductPlan.vue
@@ -22,7 +22,7 @@
             <el-form-item label="成品名称：">{{ form.materialName }}</el-form-item>
             <el-form-item label="计划结束时间：">{{ form.planEndTime }}</el-form-item>
             <el-form-item label="任务状态：">
-              <template slot-scope="scope">
+              <template #default="scope">
               </template>
             </el-form-item>
 
@@ -35,7 +35,7 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button icon="el-icon-plus" size="mini" type="primary" @click="handleAddMesProductPlan"
+            <el-button icon="el-icon-plus" size="small" type="primary" @click="handleAddMesProductPlan"
                        v-if="form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!=ORDER_STATUS.RECALLED && form.orderStatus!=ORDER_STATUS.DELETED">
               新增
             </el-button>
@@ -58,7 +58,7 @@
             label="删除"
             type=""
           >
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-button type="danger" icon="el-icon-delete" @click="handleDeleteMesProductPlan(scope)"
                          v-if="scope.row.firstFlag != null && scope.row.firstFlag === '1'
                          && form.orderStatus!==ORDER_STATUS.FINISHED && form.orderStatus!==ORDER_STATUS.RECALLED && form.orderStatus!==ORDER_STATUS.DELETED"></el-button>
@@ -70,7 +70,7 @@
 <!--            type=""-->
 <!--            label="添加"-->
 <!--          >-->
-<!--            <template slot-scope="scope" v-if="">-->
+<!--            <template #default="scope" v-if="">-->
 <!--              <el-button type="primary" icon="el-icon-plus" @click="addProcessUser(scope)"-->
 <!--                         v-if="(scope.row.children != null && scope.row.children !== undefined)-->
 <!--                          && scope.row.processType!== PROCESS_TYPE.AUTO && scope.row.displayFlag !== DISPLAY_FLAG.NO"-->
@@ -84,32 +84,32 @@
           <el-table-column
             width="50"
           >
-            <!--        <template slot-scope="scope">-->
+            <!--        <template #default="scope">-->
             <!--          <el-button type="primary" icon="el-icon-plus" @click="add(scope)"></el-button>-->
             <!--        </template>-->
           </el-table-column>
 
 
           <el-table-column align="center" label="派工单号" prop="dispatchCode" width="230">
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-input v-model="scope.row.dispatchCode" :disabled="true"
                         v-if="scope.row.children != null && scope.row.children !== undefined"/>
             </template>
           </el-table-column>
           <el-table-column align="center" label="工序" prop="processName" width="140">
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-input v-model="scope.row.processName" :disabled="true"
                         v-if="scope.row.children != null && scope.row.children !== undefined"/>
             </template>
           </el-table-column>
           <el-table-column align="center" label="步骤" prop="processOrder">
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-input v-model="scope.row.processOrder" :disabled="true"
                         v-if="scope.row.children != null && scope.row.children !== undefined"/>
             </template>
           </el-table-column>
           <el-table-column align="center" label="派工数量" prop="dispatchAmount" width="100">
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-input v-model="scope.row.dispatchAmount" :disabled="scope.row.oldRowFlag"
                         v-if="scope.row.children != null && scope.row.children !== undefined
                         && scope.row.firstFlag != null && scope.row.firstFlag === '1'"
@@ -117,8 +117,8 @@
             </template>
           </el-table-column>
 
-          <el-table-column align="center" label="用户" prop="userId" width="140">
-            <template slot-scope="scope">
+<!--          <el-table-column align="center" label="用户" prop="userId" width="140">
+            <template #default="scope">
               <el-select v-model="scope.row.userId" placeholder="请选择用户"
                          v-if="scope.row.children == null || scope.row.children === undefined"
                          :disabled="scope.row.planId != null && scope.row.planId !== undefined && scope.row.planId !== ''"
@@ -132,17 +132,35 @@
               </el-select>
 
             </template>
+          </el-table-column>-->
+
+          <el-table-column align="center" label="工位" prop="releaseId" width="140">
+            <template #default="scope">
+              <el-select v-model="scope.row.releaseId" placeholder="请选择"
+                         v-if="scope.row.children == null || scope.row.children === undefined"
+                         :disabled="scope.row.planId != null && scope.row.planId !== undefined && scope.row.planId !== ''"
+              >
+                <el-option
+                  v-for="item in processStations[scope.row.processId]"
+                  :key="item.stationId"
+                  :label="item.stationName"
+                  :value="item.stationId"
+                ></el-option>
+              </el-select>
+            </template>
           </el-table-column>
 
+
+
           <el-table-column align="center" label="派工标准工时(小时)" prop="productionTime" width="180">
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-input-number style="width:150px;" :min="0" v-model="scope.row.productionTime"
                                :disabled="(scope.row.processType === PROCESS_TYPE.MANUAL && scope.row.children != null && scope.row.children !== undefined)
                                 || scope.row.planStatus=== PLAN_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"/>
             </template>
           </el-table-column>
           <el-table-column align="center" label="计划开始时间" prop="planBeginTime" width="230">
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-date-picker v-model="scope.row.planBeginTime" style="width:200px;"
                               :disabled="(scope.row.processType === PROCESS_TYPE.MANUAL && scope.row.children != null && scope.row.children !== undefined)
                               || scope.row.planStatus=== PLAN_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"
@@ -153,7 +171,7 @@
             </template>
           </el-table-column>
           <el-table-column align="center" label="计划完成时间" prop="planEndTime" width="230">
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-date-picker v-model="scope.row.planEndTime" style="width:200px;"
                               :disabled="(scope.row.processType === PROCESS_TYPE.MANUAL && scope.row.children != null && scope.row.children !== undefined)
                               || scope.row.planStatus=== PLAN_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.FINISHED || form.orderStatus===ORDER_STATUS.RECALLED || form.orderStatus===ORDER_STATUS.DELETED"
@@ -164,7 +182,7 @@
           </el-table-column>
 
           <el-table-column align="center" label="状态" prop="planStatus" width="150">
-            <template slot-scope="scope">
+            <template #default="scope">
               {{scope.row.planStatus}}
 
             </template>
@@ -172,10 +190,10 @@
 
 
           <el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="100">
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-button
                 icon="el-icon-search"
-                size="mini"
+                size="small"
                 type="primary"
                 @click="handleDrawing(scope.row)"
                 v-if=" scope.row.userId != null"
@@ -183,7 +201,7 @@
               </el-button>
               <el-button
                 icon="el-icon-search"
-                size="mini"
+                size="small"
                 type="success"
                 @click="handleSop(scope.row)"
                 v-if=" scope.row.userId != null"
@@ -192,7 +210,7 @@
 
               <el-button
                 icon="el-icon-lock"
-                size="mini"
+                size="small"
                 type="primary"
                 @click="handleApplyRawOutstock(scope.row)"
                 v-if="scope.row.processType === PROCESS_TYPE.AUTO && scope.row.planId!=null && scope.row.planId!==''
@@ -204,7 +222,7 @@
 
               <el-button
                 icon="el-icon-delete"
-                size="mini"
+                size="small"
                 type="danger"
                 @click="handleDeleteDispatchUser(scope.row)"
                 v-if="(scope.row.children == null || false)  "
@@ -415,6 +433,15 @@
 // import {getBomAttachInfo, listMaterialBom} from "@/api/mes/materialBom";
 // import {listMaterialinfo} from "@/api/mes/materialinfo";
 
+import { getOrderInfo } from "@/api/mes/orderInfo";
+import { getBaseRouteProcesses, getDispatchCode,} from '@/api/mes/planInfo';
+import { getProdBaseProcessUserList } from '@/api/mes/prodBaseProcessUser';
+import { getPlanInfo, getPlanInfoList, updatePlanInfo, addPlanInfo, delPlanInfo, listPlanInfo,selectProductPlans } from '@/api/mes/planInfo'
+import { getStationInfoList } from '@/api/mes/baseStationInfo';
+import { getProdLineList } from '@/api/mes/baseProdLineInfo';
+import { getBaseRouteList } from '@/api/mes/baseRoute';
+import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
+
 let id = 0
 let deepSearch = (arr, target) => {
   let results = []
@@ -594,6 +621,8 @@ export default {
         SOP: "2",//附件类别:SOP
       },
       processUsers: [],
+      processStations:[],
+
       //物料BOMList
       attachInfoList: [],
       //选中的BOMList
@@ -608,19 +637,22 @@ export default {
     }
   },
   created() {
-    // const productOrderId = this.$route.params && this.$route.params.productOrderId;
-    // if (productOrderId) {
-    //   // 获取表详细信息
-    //   getProductOrder(productOrderId).then(res => {
-    //     this.form = res.data;
-    //     this.getProcessUsers(productOrderId);
-    //   });
-    // }
-    //
-    //
-    // this.getConfigValues();
+    this.fetchOrderInfo();
   },
   methods: {
+    async fetchOrderInfo() {
+      const productOrderId = this.$route.params.productOrderId;
+      console.log("productOrderId", productOrderId);
+      if (productOrderId) {
+        try {
+          const response = await getOrderInfo(productOrderId);
+          this.form = response.data;
+          this.getProcessJoin(productOrderId);
+        } catch (error) {
+          console.error("Failed to fetch order info:", error);
+        }
+      }
+    },
     getConfigValues(){
       //图纸支持格式
       getConfigKey("mes.drawing.allowedExtension").then(res => {
@@ -649,8 +681,8 @@ export default {
 
     },
 
-    getProcessUsers(productOrderId) {
-      getProcessUsers(this.form.dispatchId).then(res => {
+/*    getProcessUsers(productOrderId) {
+      getProdBaseProcessUserList(this.form.dispatchId).then(res => {
         res.data.forEach(processUser => {
           if (!this.processUsers[processUser.processId]) {
             this.processUsers[processUser.processId] = [];
@@ -667,6 +699,36 @@ export default {
           // })
         })
       });
+    },*/
+    async getProcessJoin(productOrderId) {
+      const routeId = this.form.dispatchId;
+      const processId = this.form.processId;
+      try {
+        const res = await getProdBaseProcessUserList({ routeId });
+        res.data.forEach(processUser => {
+          if (!this.processUsers[processUser.processId]) {
+            this.processUsers[processUser.processId] = [];
+          }
+          this.processUsers[processUser.processId].push(processUser);
+        });
+        console.log("this.processUsers", this.processUsers);
+
+
+        const station = await getStationInfoList({ processId });
+        console.log("getStationInfoList", station);
+        station.data.forEach(processStation => {
+          if (!this.processStations[processStation.processId]){
+            this.processStations[processStation.processId] = [];
+          }
+          this.processStations[processStation.processId].push(processStation);
+        });
+
+        const productPlansResponse = await selectProductPlans({ productOrderId: productOrderId });
+        this.groupProductPlans(productPlansResponse.data);
+
+      } catch (error) {
+        console.error("Failed to fetch process users or product plans:", error);
+      }
     },
 
     groupProductPlans(productPlans) {
@@ -708,7 +770,7 @@ export default {
           groupedProductPlan.id = this.id;
           this.id = this.id + 1;
           groupedProductPlan.productionTime = parseFloat((groupedProductPlan.productionTime / 60 / 60).toFixed(1));
-          obj.sopId = groupedProductPlan.sopId;
+/*          obj.sopId = groupedProductPlan.sopId;*/
           obj.attachId = groupedProductPlan.attachId;
           obj.productionTime = parseFloat((groupedProductPlan.processProductionTime / 60 / 60).toFixed(1));
 
@@ -721,10 +783,10 @@ export default {
             obj.lastProcessId = groupedProductPlan.lastProcessId;
             obj.processType = groupedProductPlan.processType;
             obj.processOrder = groupedProductPlan.processOrder;
-            obj.displayFlag = groupedProductPlan.displayFlag;
+/*            obj.displayFlag = groupedProductPlan.displayFlag;*/
             obj.finalProcessFlag = groupedProductPlan.finalProcessFlag;
             obj.attachId = groupedProductPlan.attachId;
-            obj.sopId = groupedProductPlan.sopId;
+/*            obj.sopId = groupedProductPlan.sopId;*/
 
             obj.planBeginTime = this.form.planBeginTime;
             obj.planEndTime = this.form.planEndTime;
@@ -763,7 +825,7 @@ export default {
 
     },
 
-    getId(arr) {
+    async getId(arr) {
       arr.forEach(element => {
         this.id = this.id + 1;
         if (Array.isArray(element.children)) {
@@ -1047,94 +1109,88 @@ export default {
 
 
     /** 生产计划添加按钮操作 */
-    handleAddMesProductPlan() {
+    async handleAddMesProductPlan() {
       let dispatchCode = "";
-      getDispatchCode().then(res => {
-        dispatchCode = res.msg;
-        getBaseRouteProcesses({routeId: this.form.dispatchId}).then(res => {
-          // if (res.data.length === 0) {
-          //   this.$modal.msgError("工艺路线未维护工位信息！");
-          // }
-          let lastProcessId = null;
-          let i = 0;
-          res.data.forEach((e, index) => {
-            let obj = {};
-            if (i === 0) {
-              obj.firstFlag = "1";//设置第一条标识，代表只能此派工单号只有第一条记录上有删除按钮，删除时同意删除此派工单号的派工，第一条有派工数量即可
-              i++;
-            }
-            obj.id = this.id
-            this.id = this.id + 1;
-            obj.dispatchCode = dispatchCode;
-            obj.processId = e.processId;
-            obj.processName = e.processName;
-            obj.processType = e.processType;
-            obj.processOrder = e.processOrder;
-            obj.finalProcessFlag = e.finalProcessFlag;
-            obj.productionTime = e.productionTime ? parseFloat((e.productionTime / 60 / 60).toFixed(1)) : 0;
+      dispatchCode = await getDispatchCode().then(res => res.msg);
+      console.log("dispatchCode", dispatchCode);
 
-            obj.planBeginTime = this.form.planBeginTime;
-            obj.planEndTime = this.form.planEndTime;
-            obj.planStatus = '1';
-            // obj.dispatchAmount = this.form.planAmount - this.form.dispatchAmount;
-            obj.dispatchFlag = null;
+      const baseRouteProcesses = await getBaseRouteProcesses({ routeId: this.form.dispatchId });
+      let lastProcessId = null;
+      let i = 0;
 
-            if (this.form.saleType === this.SALE_TYPE.INTERNAL) {
-              obj.materialId = this.form.produceMaterialId;
-            } else {
-              obj.materialId = this.form.materialId;
-            }
+      for (const e of baseRouteProcesses.data) {
+        let obj = {};
+        if (i === 0) {
+          obj.firstFlag = "1"; // 设置第一条标识
+          i++;
+        }
+        obj.id = this.id;
+        this.id = this.id + 1;
+        obj.dispatchCode = dispatchCode;
+        obj.processId = e.processId;
+        obj.processName = e.processName;
+        obj.processType = e.processType;
+        obj.processOrder = e.processOrder;
+        obj.productionTime = e.productionTime ? parseFloat((e.productionTime / 60 / 60).toFixed(1)) : 0;
 
-            obj.materialBomId = this.form.materialBomId;
-            obj.productOrderId = this.form.productOrderId;
-            obj.saleOrderId = this.form.saleOrderId;
-            obj.saleorderCode = this.form.saleorderCode;
+        obj.planBeginTime = this.form.planBeginTime;
+        obj.planEndTime = this.form.planEndTime;
+        obj.planStatus = '1';
 
-            obj.newFlag = "1";//代表新增
-            obj.addFlag = "1";
+        if (this.form.saleType === this.SALE_TYPE.INTERNAL) {
+          obj.materialId = this.form.produceMaterialId;
+        } else {
+          obj.materialId = this.form.materialId;
+        }
 
-            // e.mesBaseProcessUserList.forEach((mesBaseProcessUser, index) => {
-            //   mesBaseProcessUser.id = this.id + 1;
-            //   mesBaseProcessUser.dispatchFlag = null;
-            //   mesBaseProcessUser.planBeginTime = null;
-            //   mesBaseProcessUser.planEndTime = null;
-            //   this.id = this.id + 1;
-            // });
+        obj.materialBomId = this.form.materialBomId;
+        obj.productOrderId = this.form.productOrderId;
+        obj.saleOrderId = this.form.saleOrderId;
+        obj.saleorderCode = this.form.saleorderCode;
 
-            if (e.processType === this.PROCESS_TYPE.AUTO) {
-              obj.children = [];
-            } else {
-              obj.children = [{
-                id: this.id,
-                dispatchCode: obj.dispatchCode,
-                processId: obj.processId,
-                materialBomId: obj.materialBomId,
-                planStatus: this.PLAN_STATUS.DISPATCHED,
-                productionTime: obj.productionTime,
-                userId: null
-              }]
-            }
+        obj.newFlag = "1"; // 代表新增
+        obj.addFlag = "1";
 
+        if (e.processType === this.PROCESS_TYPE.AUTO) {
+          obj.children = [];
+        } else {
+          obj.children = [{
+            id: this.id,
+            dispatchCode: obj.dispatchCode,
+            processId: obj.processId,
+            materialBomId: obj.materialBomId,
+            planStatus: this.PLAN_STATUS.DISPATCHED,
+            productionTime: obj.productionTime,
+            userId: null
+          }]
+        }
 
-            this.id += 1;
+        this.id += 1;
 
-            // 上一工序ID
-            if (lastProcessId == null) {
-              obj.lastProcessId = 0;
-            } else if (lastProcessId === obj.processId) {
-              obj.lastProcessId = this.mesProductPlanList[index - 1].lastProcessId;
-            } else {
-              obj.lastProcessId = lastProcessId;
-            }
-            lastProcessId = e.processId;
-            // 新添加列标识 false=新添加，true=历史行
-            obj.oldRowFlag = false;
-            this.mesProductPlanList.push(obj);
-          })
+        // 获取当前 processId 对应的工位信息
+        const stationResponse = await getStationInfoList({ processId: e.processId });
+        if (stationResponse.data && stationResponse.data.length > 0) {
+          this.processStations[e.processId] = stationResponse.data.map(station => ({
+            stationId: station.stationId,
+            stationName: station.stationName
+          }));
+        }
 
-          this.getId(this.mesProductPlanList)
-        })
-      })
+        // 上一工序ID
+        if (lastProcessId == null) {
+          obj.lastProcessId = 0;
+        } else if (lastProcessId === obj.processId) {
+          obj.lastProcessId = this.mesProductPlanList[this.mesProductPlanList.length - 1].lastProcessId;
+        } else {
+          obj.lastProcessId = lastProcessId;
+        }
+        lastProcessId = e.processId;
+        obj.oldRowFlag = false;
+        this.mesProductPlanList.push(obj);
+      }
+
+      this.getId(this.mesProductPlanList);
+      console.log(this.mesProductPlanList);
     },
 
 
@@ -1537,12 +1593,41 @@ export default {
 
   },
 
+  dispatchTypeList:[],
+  async dispatchTypeFunction  () {
+
+    const dispatchTypeRes = await proxy?.getConfigKey('sys.orderInfo.dispatchType');
+    initFormData.dispatchType = dispatchTypeRes.data;
+    if (dispatchTypeRes.data === '1'){
+      dispatchTypeName.value = "产线";
+      const res = await getProdLineList(null);
+      dispatchTypeList.value = res.data.map(item => ({
+        id: item.prodLineId,
+        name: item.prodLineName
+      }));
+    } else if (dispatchTypeRes.data === '2'){
+      dispatchTypeName.value = "工艺路线";
+      const res = await getBaseRouteList(null);
+      dispatchTypeList.value = res.data.map(item => ({
+        id: item.routeId,
+        name: item.routeName
+      }));
+    } else if (dispatchTypeRes.data === '3'){
+      dispatchTypeName.value = "工序";
+      const res = await getProcessInfoList(null);
+      dispatchTypeList.value = res.data.map(item => ({
+        id: item.processId,
+        name: item.processName
+      }));
+    }
+  },
 
 
-  mounted() {
-  }
 }
 ;
+onMounted(() => {
+  dispatchTypeFunction();  //派工类型(1产线 2工艺路线 3工序)
+});
 </script>
 
 <style scoped>