From e4f64ab439c05b348363ca47d70f390ca09720b6 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 18 一月 2024 10:49:23 +0800
Subject: [PATCH] 修改机型序号

---
 jcdm-ui/src/views/main/om/productionOrde/index.vue |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 8b56e84..18d0e3f 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -117,18 +117,19 @@
 <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
-          type="warning"
+          type="success"
           plain
-          icon="el-icon-download"
+          icon="el-icon-wind-power"
           size="mini"
           @click="getProductionNotice"
+          v-hasPermi="['om:productionOrde:receive']"
         >鎺ユ敹</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
           type="primary"
           plain
-          icon="el-icon-createUpdate"
+          icon="el-icon-edit"
           size="mini"
           :disabled="single"
           @click="CreatehandleUpdate"
@@ -145,7 +146,7 @@
         </el-table-column>
         <el-table-column label="鐢熶骇璁㈠崟" width="160" align="center">
           <template slot-scope="scope">
-            <router-link :to="{path: '/main/workReport-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
+            <router-link :to="{path: '/main/orderScheduling-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
               <span>{{ scope.row.workOrderNo }}</span>
             </router-link>
           </template>
@@ -551,7 +552,8 @@
 
     getProductionNotice(){
       getProductionNotice(this.queryParams).then(response => {
-        this.$modal.msgSuccess("鎺ユ敹鎴愬姛");
+
+        this.$modal.msgSuccess(response.msg);
         this.queryParams = {}
         this.getList();
       });
@@ -731,6 +733,7 @@
         this.materialQueryParams.materialCode = response.data.productCode;
         listMaterial(this.materialQueryParams).then(response => {
           this.markNo = response.rows[0].mark
+          this.form.typeL = response.rows[0].typeL;
         });
         this.form = response.data;
         this.Createopen = true;
@@ -778,14 +781,20 @@
         model: this.form.typeZ,
         modelDate: this.form.dateTimeRule,
       }
+      if(startCode>999){
+        this.$message.error('璧峰缂栧彿瓒呭嚭鏈�澶ц寖鍥达紝璇疯緭鍏�1-999鐨勬暟瀛楋紒');
+        return;
+      }else if(startCode<1){
+        this.$message.error('璧峰缂栧彿瓒呭嚭鏈�灏忚寖鍥达紝璇疯緭鍏�1-999鐨勬暟瀛楋紒');
+        return;
+      }
       listModelNumber(queryParams).then(response => {
         if(response.rows.length === 0){
           this.saveBoxCode()
         }else {
           let maxNumValue = response.rows[0].maxnumValue;
           if(startCode<maxNumValue){
-            this.$message.error('鏂板缓鐨勪笉鑳芥瘮鏌ヨ鍑虹殑灏�');
-            return;
+            this.$message.error('绠变綋鏉$爜閲嶅锛岃閲嶆柊杈撳叆璧峰缂栧彿锛�');
           }else {
             this.saveBoxCode()
           }

--
Gitblit v1.9.3