工序需求时间 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

@@ -18,7 +18,7 @@
             <el-button type="primary" @click="feedingMaterialRollFun">{{ buttons.confirmButton }}</el-button>
           </el-col>
         </el-row>
-        <el-row >
+        <el-row>
           <el-col style="margin-top: -10px" :span="16">
             <el-form-item :label=labels.bomItemNo>
               <el-select v-model="pageData.bomItemNo" :disabled="selectFlag" style="width: 120px">
@@ -35,7 +35,7 @@
             <el-button type="primary" @click="closeDialog">{{ buttons.closeButton }}</el-button>
           </el-col>
         </el-row>
-        <el-row >
+        <el-row>
           <el-col style="margin-top: -10px" :span="24">
             <el-form-item :label='labels.rollNoQty'>
               <el-input v-model="pageData.rollQty" readonly
@@ -45,7 +45,7 @@
           </el-col>
 
         </el-row>
-        <el-row >
+        <el-row>
           <el-col style="margin-top: -10px" :span="24">
             <el-form-item :label='labels.depleteQty'>
               <el-input v-model="pageData.qtyConsumed" type="number" min="0"
@@ -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";
@@ -227,7 +228,7 @@ export default {
   methods: {
 
     //初始化页面的参数
-    init(scheduleData, operatorData,selectSfdcRollData) {
+    init(scheduleData, operatorData, selectSfdcRollData) {
       //初始化参数
       this.scheduleData = scheduleData;
       //初始化操作员对象
@@ -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行号*/
@@ -328,15 +335,15 @@ export default {
         return false;
       }
       //判断是否选中行号
-      if (!this.pageData.qtyConsumed ) {
+      if (!this.pageData.qtyConsumed) {
         this.$message.error(this.labels.pleaseQtyConsumed)
         return false;
       }
-      if (this.pageData.qtyConsumed <=0 ) {
+      if (this.pageData.qtyConsumed <= 0) {
         this.$message.error(this.labels.pleaseQtyConsumed2)
         return false;
       }
-      if (this.pageData.qtyConsumed > this.pageData.rollQty ) {
+      if (this.pageData.qtyConsumed > this.pageData.rollQty) {
         this.$message.error(this.labels.pleaseQtyConsumed3)
         return false;
       }
@@ -346,16 +353,16 @@ export default {
       //清空当前扫描卷属性值  防止重复点击确认
       this.pageData.scanRmRollNo = '';
       let dto = {
-          site:this.$store.state.user.site,
-          orderNo: this.pageData.orderNo,
-          itemNo: this.pageData.itemNo,
-          seqNo: this.pageData.seqNo,
-          userId: this.$store.state.user.name,
-          rollNo: this.pageData.rollNo,
-          rmRollNo:  this.pageData.rmRollNo,
-          bomItemNo: this.pageData.bomItemNo,
-          operatorId: this.pageData.operatorId,
-          qtyConsumed: this.pageData.qtyConsumed ,
+        site: this.$store.state.user.site,
+        orderNo: this.pageData.orderNo,
+        itemNo: this.pageData.itemNo,
+        seqNo: this.pageData.seqNo,
+        userId: this.$store.state.user.name,
+        rollNo: this.pageData.rollNo,
+        rmRollNo: this.pageData.rmRollNo,
+        bomItemNo: this.pageData.bomItemNo,
+        operatorId: this.pageData.operatorId,
+        qtyConsumed: this.pageData.qtyConsumed,
       }
       //调用方法执行上材料
       scannerMaterial(this.pageData).then(({data}) => {
@@ -368,6 +375,9 @@ export default {
           this.pageData.bomItemNo = -1;
           this.bomList = [];
           this.timeArray = [];
+          this.pageData.rollQty = '';
+          this.pageData.qtyConsumed = '';
+          this.closeDialog()
         }
       });
     },