BUG修改

src/api/schedule/order_schedule_fqc.js

@@ -27,4 +27,9 @@ export const moveDownSchedule = data => createAPI('scheduling/moveDownSchedule',
 //获取当前人员的日历编码和描述
 export const getCalendarMapByResourceId = data => createAPI('scheduling/getCalendarMapByResourceId', 'POST', data)
 
+//获取工单的排产信息
+export const getShopOrderByCon = data => createAPI('scheduling/getShopOrderByCon', 'POST', data)
+
+
+
 

src/views/modules/schedule/order_schedule_fqc.vue

@@ -374,6 +374,7 @@ import {
   moveUpSchedule,
   moveDownSchedule,
   getCalendarMapByResourceId,/*获取人员的班次*/
+  getShopOrderByCon,/*刷新工单数据使用*/
 } from '@/api/schedule/order_schedule_fqc.js'
 
 export default {
@@ -1437,6 +1438,16 @@ export default {
       })
     },
 
+    /*刷新当前的页面的显示数据*/
+    refreshShopOrderByCon(){
+      getShopOrderByCon(this.pageData).then(({data}) => {
+        //刷新排产的数量
+        this.pageData.qtyRequired = data.row.lotSize;
+        this.pageData.qtyScheduled = data.row.qtyScheduled;
+        this.pageData.qtyToSchedule = data.row.qtyToSchedule;
+      });
+    },
+
     /*获取FQC操作员信息*/
     getOperatorList() {
       getOperatorListWithFqc(this.searchData).then(({data}) => {
@@ -1489,13 +1500,15 @@ export default {
         this.pageData.workCenterDesc = '全检';
         this.pageData.partNo = row.partNo;
         this.pageData.partDesc = row.partDesc;
-        this.pageData.qtyRequired = row.lotSize;
-        this.pageData.qtyScheduled = row.qtyScheduled;
-        this.pageData.qtyToSchedule = row.qtyToSchedule;
+        //this.pageData.qtyRequired = row.lotSize;
+        //this.pageData.qtyScheduled = row.qtyScheduled;
+        //this.pageData.qtyToSchedule = row.qtyToSchedule;
         //设置页签
         this.activeTable = 'scheduling';
         //刷新页签的参数
         this.getOperatorList();
+        //刷新页面的数据
+        this.refreshShopOrderByCon();
       }, 500)
     },
 
@@ -1599,6 +1612,8 @@ export default {
           });
         }else {
           this.$message.success(data.msg);
+          //刷新页面的数据
+          this.refreshShopOrderByCon();
           //刷新明FQC操作员
           this.getOperatorList();
           this.pageData.virtualFlag = 'N';
@@ -1644,6 +1659,8 @@ export default {
           });
         }else {
           this.$message.success(data.msg);
+          //刷新页面的数据
+          this.refreshShopOrderByCon();
           //刷新明FQC操作员
           this.getOperatorList();
           this.pageData.virtualFlag = 'N';
@@ -1682,6 +1699,8 @@ export default {
           this.$message.error(data.msg);
         } else {
           this.$message.success(data.msg);
+          //刷新页面的数据
+          this.refreshShopOrderByCon();
           //刷新明细的报工页面
           this.getOrderScheduleList();
         }

src/views/modules/yieldReport/com_merge_roll.vue

@@ -125,10 +125,12 @@ export default {
       this.pageData.reportTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
       //设置对应的参数
       this.pageData.orderNo = scheduleData.orderNo;
-      this.pageData.itemNo = scheduleData.orderNo;
+      this.pageData.itemNo = scheduleData.itemNo;
       this.pageData.seqNo = scheduleData.seqNo;
       this.pageData.rollNo = scheduleData.rollNo;
       this.pageData.operatorId = operatorData.operatorId;
+      this.pageData.newRollNo = '';
+      this.pageData.newRollQty = 0;
       //执行获取页面参数的功能
       this.refreshPageData();
       //自动获取焦点
@@ -160,13 +162,11 @@ export default {
       if (rollQty == null || rollQty == '') {
         //this.$message.error('请输入新卷数量!');
         this.pageData.rollQty = 0;//重新赋值
-        return false;
       }
       //转换成整数
       if (rollQty <= 0) {
         //this.$message.error('新卷数量必须是大于零的整数!');
         this.pageData.rollQty = 0;//重新赋值
-        return false;
       }else{
         this.pageData.rollQty = rollQty;
       }
@@ -175,12 +175,10 @@ export default {
       if (newRollQty == null || newRollQty == '') {
         //this.$message.error('请输入新卷数量!');
         this.pageData.newRollQty = 0;//重新赋值
-        return false;
       }
       if (newRollQty <= 0) {
         //this.$message.error('新卷数量必须是大于零的整数!');
         this.pageData.newRollQty = 0;//重新赋值
-        return false;
       }else{
         this.pageData.newRollQty = newRollQty;
       }
@@ -203,6 +201,7 @@ export default {
         this.pageData.newRollQty = 0;//重新赋值
         return false;
       }
+      debugger;
       let requestData = {
         'site': this.pageData.site,
         'orderNo': this.pageData.orderNo,
@@ -212,7 +211,7 @@ export default {
         'rollQty': this.pageData.rollQty,
         'newRollNo': this.pageData.newRollNo,
         'newRollQty': this.pageData.newRollQty,
-        'userId': this.scheduleData.userName,
+        'username': this.pageData.username,
         'operatorId': this.pageData.operatorId,
         'newRollFlag': false
       };
@@ -244,7 +243,8 @@ export default {
                     if (data.code == 500) {
                       this.$message.error(data.msg);
                     } else {
-                      this.$message.error(data.msg);
+                      this.$message.success(data.msg);
+                      this.closeDialog();
                     }
                   });
                 });
@@ -254,7 +254,8 @@ export default {
                   if (data.code == 500) {
                     this.$message.error(data.msg);
                   } else {
-                    this.$message.error(data.msg);
+                    this.$message.success(data.msg);
+                    this.closeDialog();
                   }
                 });
               }
@@ -279,7 +280,8 @@ export default {
                   if (data.code == 500) {
                     this.$message.error(data.msg);
                   } else {
-                    this.$message.error(data.msg);
+                    this.$message.success(data.msg);
+                    this.closeDialog();
                   }
                 });
               });
@@ -289,7 +291,8 @@ export default {
                 if (data.code == 500) {
                   this.$message.error(data.msg);
                 } else {
-                  this.$message.error(data.msg);
+                  this.$message.success(data.msg);
+                  this.closeDialog();
                 }
               });
             }