Merge branch 'xgmFlwms' of http://47.97.1.152:5880/r/wms_app into xgmFlwms

zhang

2025-06-24 7dd2e7918b00a857ca8a3634e24b2f6dd7446d1b

 pages/basics/combPro.vue

@@ -264,18 +264,21 @@
         },
         addTableData(data){
            this.matData=[];
            for(var i=0;i<data.length;i++){
               var toPush = true;
               for(var j=0;j<this.matData.length;j++){
                  if(data[i].matnr ===this.matData[j].matnr && data[i].itemBatch === this.matData[j].itemBatch && data[i].specs === this.matData[j].specs){
                     this.matData[j].count = Number(this.matData[j].count) + Number(data[i].count);
                     toPush = false;
                  }
               }
               if(toPush) {
                  // data[i].count = 0
                  this.matData.push(data[i]);	
               }
            // for(var i=0;i<data.length;i++){
            //    var toPush = true;
            //    for(var j=0;j<this.matData.length;j++){
            //       if(data[i].matnr ===this.matData[j].matnr && data[i].itemBatch === this.matData[j].itemBatch && data[i].specs === this.matData[j].specs){
            //          this.matData[j].count = Number(this.matData[j].count) + Number(data[i].count);
            //          toPush = false;
            //       }
            //    }
            //    if(toPush) {
            //       // data[i].count = 0
            //       this.matData.push(data[i]);	
            //    }
            // }
            for   (let k of data) {
               this.matData.push(k);	
            }
         },
         
@@ -319,11 +322,11 @@
                that.messageText = '托盘码必须为8位'
                return;
            }
            if(that.couChange){
               that.messageToggle('error')
               that.messageText = '请先确认入库数量'
               return;
            }
            // if(that.couChange){
            //    that.messageToggle('error')
            //    that.messageText = '请先确认入库数量'
            //    return;
            // }
            for (var i = 0; i < that.matData.length; i++){
               if (that.matData[i].count === 0) {
                  that.messageToggle('error')
@@ -351,7 +354,7 @@
                     that.couChange=true
                     that.messageToggle('success')
                     that.messageText = '组托成功'
                     this.getFocus('firstFocus')
                     that.getFocus('firstFocus')
                  } else if(res.data.code === 403){
                     setTimeout(() => {
                        uni.reLaunch({
@@ -389,7 +392,7 @@
                           that.couChange=true
                           that.messageToggle('success')
                           that.messageText = '组托成功'
                           this.getFocus('firstFocus')
                           that.getFocus('firstFocus')
                        } else if(res.data.code === 403){
                           uni.navigateBack({
                              delta: 1
@@ -428,7 +431,7 @@
                     that.couChange=true
                     that.messageToggle('success')
                     that.messageText = '组托成功'
                     this.getFocus('firstFocus')
                     that.getFocus('firstFocus')
                  } else if(res.data.code === 403){
                        uni.navigateBack({
                            delta: 1
@@ -464,7 +467,7 @@
                     that.couChange=true
                     that.messageToggle('success')
                     that.messageText = '组托成功'
                     this.getFocus('firstFocus')
                     that.getFocus('firstFocus')
                  } else if(res.data.code === 403){
                        uni.navigateBack({
                            delta: 1