Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-09 e2f151957b38d3c02c26be4343b6916d65e800b7

 ´úÂë¹ÜÀí/»´°²PDA/pages/stash/pickingMat.vue

@@ -185,6 +185,10 @@
            }
            this.$u.post('/api/OutStockLockInfo/MaterialPick?palletCode=' + this.barcode, {}).then(res => {
               if (res.status) {
                  if(this.warehouseId==5){
                     this.Finish("8005");
                  }
						
                  uni.$showMsg('拣选成功!')
                  this.barcode = "";
                  this.matInfos = [];
@@ -196,6 +200,23 @@
               }
            })
         },
         Finish(code){
            this.$u.post('http://127.0.0.1:9291/api/CTU_AGV/PutFinish?&code=' + code).then(
               res => {
                  if (res.status) {
                     // this.$refs.uToast.show({
                     //    title: "完成成功",
                     //    type: "success"
                     // })
                     // this.barcode = "";
                  } else {
                     // this.$refs.uToast.show({
                     //    title: res.message,
                     //    type: "error"
                     // })
                  }
               })
         },
         inputChange(e) {
            this.$nextTick(() => {
               this.istrue = false;