增加工艺路线更新

src/api/mes/pro/workorder.js

@@ -70,6 +70,15 @@ export function updateWorkorder(data) {
   })
 }
 
+// 修改工艺路线
+export function updateWorkProcess(data) {
+  return request({
+    url: '/mes/pro/workorder/updateWorkProcess',
+    method: 'put',
+    data: data
+  })
+}
+
 // 关闭生产工单
 export function closeWorkorder(data) {
   return request({

src/components/productionSolution/index.vue

@@ -9,11 +9,6 @@
         <el-input v-model="queryParams.itemName" clearable @keyup.enter.native="handleQuery">
         </el-input>
       </el-form-item>
-      <el-form-item :label="$t('打样订单号')" prop="sapPrototypeMakeCode">
-        <el-input v-model="queryParams.sapPrototypeMakeCode" clearable
-          @keyup.enter.native="handleQuery">
-        </el-input>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
@@ -33,7 +28,6 @@
       <el-table-column :label="$t('成品物料编码')" align="center" prop="itemCode" />
       <el-table-column :label="$t('成品物料名称')" align="center" prop="itemName" />
       <el-table-column :label="$t('生产用途')" align="center" prop="usageName" />
-      <el-table-column :label="$t('打样订单')" align="center" prop="sapPrototypeMakeCode" />
       <el-table-column :label="$t('common.remark')" align="center" prop="remark" />
     </el-table>
 
@@ -73,6 +67,9 @@ import { listProductionSolutionProcess } from "@/api/mes/pro/productionSolutionP
 export default {
   name: "RoutesProcessSelectSingle",
   components: {},
+  props: {
+    itemCode: null,
+  },
   data() {
     return {
       showFlag: false,
@@ -122,6 +119,17 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    itemCode: {
+      handler(val) {
+        if (val) {
+          this.queryParams.itemCode = this.itemCode
+          this.getList()
+        }
+      }, 
+      immediate: true
+    }
+  },
   methods: {
     /** 查询工厂列表 */
     getList() {
@@ -178,23 +186,26 @@ export default {
 
     // 表单重置
     reset() {
-      this.form = {
-        productionSolutionId: null,
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        productionSolutionId: null, // 可以查简称与英文名
         productionSolutionCode: null,
         productionSolutionName: null,
+        statsu: "PREPARE",
         itemId: null,
         groupCounter: null,
-        routeId: null,
-        usageId: null,
         itemCode: null,
         itemName: null,
+        routeId: null,
+        usageId: null,
         remark: null,
         createBy: null,
         createTime: null,
         updateBy: null,
         updateTime: null,
       };
-      this.resetForm("form");
+      this.resetForm("queryForm");
     },
     //确定选中
     confirmSelect() {

src/i18n/lang/th_TH.json

@@ -2966,5 +2966,6 @@
 	"标签模板": "เทมเพลตแท็ก",
 	"请选择标签模板": "โปรดเลือกแม่แบบฉลาก",
 	"没有配置标签模版": "ไม่มีการกำหนดค่าลายฉลุฉลาก",
-	"是否允许超报": "是否允许超报"
+	"是否允许超报": "ไม่ว่าจะเป็นการอนุญาตให้มีการโอเวอร์พาร์",
+	"工艺路线更新": "การปรับปรุงเส้นทางกระบวนการ"
 }
\ No newline at end of file

src/i18n/lang/zh_CN.json

@@ -2966,5 +2966,6 @@
 	"标签模板": "标签模板",
 	"请选择标签模板": "请选择标签模板",
 	"没有配置标签模版": "没有配置标签模版",
-	"是否允许超报": "是否允许超报"
+	"是否允许超报": "是否允许超报",
+	"工艺路线更新": "工艺路线更新"
 }

src/views/mes/pro/workorder/indexApply.vue

@@ -114,6 +114,10 @@
         <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
           v-hasPermi="['mes:pro:workorder:edit']">{{$t('导入')}}</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain size="mini" :disabled="single"
+          @click="handleWorkProcess">{{$t('工艺路线更新')}}</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleMake"
           v-hasPermi="['mes:pro:workorder:make']">{{$t('生产补单')}}</el-button>
@@ -477,6 +481,11 @@
       <ArrangeInfo :group-code="groupCode" :addBtn="false"></ArrangeInfo>
     </el-dialog>
     <WorkorderRecordSelect ref="WorkorderRecordSelectRef" :data="currentData" />
+    <RoutesProcessSelect
+      ref="RoutesProcessSelectRef"
+      :itemCode="this.selectedRows[0] && this.selectedRows[0].productCode"
+      @onSelected="onRoutesProcessSelect"
+    />
     <div style="overflow: hidden;width: 0;height: 0;">
 
       <div id="productOrderDetail">
@@ -492,7 +501,7 @@
 <script>
 
 
-import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
+import RoutesProcessSelect from "@/components/productionSolution/index.vue";
 import WorkorderRecordSelect from "@/components/workorderRecordSelect/index.vue";
 import productOrderDetail from "./print/productOrderDetail.vue";
 import productOrderSpecification from "./print/productOrderSpecification.vue";
@@ -507,7 +516,8 @@ import {
   printInfo,
   doCheckToolNum,
   closeWorkorder,
-  syncData
+  syncData,
+  updateWorkProcess
 } from "@/api/mes/pro/workorder";
 import { addProtaskList } from "@/api/mes/pro/protask";
 
@@ -527,6 +537,8 @@ import ArrangeInfo from "@/views/mes/pro/arrange/info.vue";
 import CommandList from "./commandList.vue";
 import dayjs from 'dayjs';
 import print from 'vue-print-nb';
+import { listProductionSolutionProcess } from "@/api/mes/pro/productionSolutionProcess";
+
 export default {
   directives: { print },
   name: "Workorder",
@@ -699,6 +711,38 @@ export default {
     })
   },
   methods: {
+    async onRoutesProcessSelect(row) {
+      let form = {}
+      await getWorkorder(this.selectedRows[0].workorderId).then(response => {
+        form = response.data;
+      });
+      if (row != undefined && row != null) {
+        form.productionSolutionId = row.productionSolutionId;
+        form.productionSolutionCode = row.productionSolutionCode;
+        form.productCode = row.itemCode;
+        form.groupCounter = row.groupCounter;
+        form.groupKey = row.groupKey;
+        form.productName = row.itemName;
+        form.productId = row.itemId;
+        form.productionSolutionName = row.productionSolutionName;
+        const params = {
+          pageNum: 1,
+          pageSize: 1000,
+          productionSolutionId: row.productionSolutionId,
+        };
+        await listProductionSolutionProcess(params).then(({ rows }) => {
+          form.processList = rows.map((item) => {
+            item.processItemList = [];
+            item.toolList = [];
+            item.qcindexList = [];
+            return item;
+          });
+        });
+        await updateWorkorder(form).then(({ rows }) => {
+          this.getList()
+        });
+      }
+    },
     handleSyncData() {
       syncData().then((response) => {
         this.$modal.msgSuccess(response.msg);
@@ -1113,6 +1157,9 @@ export default {
         }
       });
     },
+    handleWorkProcess(){
+      this.$refs['RoutesProcessSelectRef'].showFlag = true
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal

src/views/mes/qc/report/index.vue

@@ -157,7 +157,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            :disabled="scope.row.abnormalStatus !== 'SUBMIT'"
+            :disabled="scope.row.abnormalStatus === 'SUBMIT' || scope.row.abnormalStatus === 'NOT'"
             @click="handleClose(scope.row)"
             v-hasPermi="['qc:report:remove']"
           >{{ $t('关闭') }}</el-button>