工序需求时间 2023年1月11日 sxm

src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue

@@ -276,10 +276,10 @@
           this.$message.warning('效率不能为空!')
           return
         }
-        if (!this.selectRow.timeRequired) {
-          this.$message.warning('需求时间不能为空!')
-          return
-        }
+        // if (!this.selectRow.timeRequired) {
+        //   this.$message.warning('需求时间不能为空!')
+        //   return
+        // }
         if (!this.selectRow.planFinishTime) {
           this.$message.warning('计划完工时间不能为空!')
           return
@@ -291,8 +291,8 @@
           this.$message.warning('计划开工时间不能早于计划完工时间!')
           return
         }
-        if (this.selectRow.timeRequired<=0){
-          this.$message.warning('需求随时间不能小于0!')
+        if (this.selectRow.timeRequired<0){
+          this.$message.warning('需求时间不能小于0!')
           return
         }
         if (this.selectRow.crewsize<1) {

src/views/modules/yieldReport/com_malformed_material.vue

@@ -66,6 +66,7 @@ import {
   scannerMaterial
 } from "@/api/yieldReport/com_produce_material.js";
 
+import {infoRollno} from "@/api/crollinfo/crollinfo.js";
 import {
   searchFunctionButtonList,
 } from "@/api/sysLanguage.js";
@@ -237,7 +238,7 @@ export default {
       this.pageData.itemNo = scheduleData.itemNo;
       this.pageData.seqNo = scheduleData.seqNo;
       this.pageData.rollNo = selectSfdcRollData.rollNo;
-      this.pageData.rollQty = selectSfdcRollData.rollQty;
+     // this.pageData.rollQty = selectSfdcRollData.rollQty;
       this.pageData.scanRmRollNo = '';
       this.pageData.rmRollNo = '';
       this.pageData.bomItemNo = '';
@@ -291,6 +292,12 @@ export default {
       }
       //处理扫描材料卷号
       this.refreshSomItemNos();
+      // 查询卷信息
+      infoRollno({site: this.pageData.site, rollno: this.pageData.scanRmRollNo}).then(({data}) => {
+        if (data.code == 0){
+          this.pageData.rollQty = data.cRollinfo.rollqty
+        }
+      })
     },
 
     /*获取BOM行号*/
@@ -368,6 +375,9 @@ export default {
           this.pageData.bomItemNo = -1;
           this.bomList = [];
           this.timeArray = [];
+          this.pageData.rollQty = '';
+          this.pageData.qtyConsumed = '';
+          this.closeDialog()
         }
       });
     },