Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex

src/pages/issue/job/issueDetailBatch.vue

@@ -265,20 +265,12 @@
 			closeScan() {
 				this.resizeCollapse();
 			},
-
 			getScanResult(result, managementTypeParams) {
 				if(!result.package.number){
 					this.showErrorMessage("包装号不能为空")
 					return;
 				}
-				uni.showLoading({
-					title:"校验中...",
-					mask:true
-				})
-				//校验箱码是否已经发料
-				issueCheck(result.package.number).then(res=>{
-					uni.hideLoading()
-					if(res.data.length==0){
+				
 				this.managementType = managementTypeParams
 				let array1 = []//记录推荐的库位
 				let array2 = []//记录推荐的批次
@@ -312,17 +304,9 @@
 				if(managementTypeParams == "BY_BATCH" ||managementTypeParams == "BY_QUANTITY" ){
 					this.setDataBatch(result)
 				}
-					}else {
-						this.showErrorMessage("箱码["+result.package.number+"]已经发过料")
-					}
-					
-				}).catch(error=>{
-					uni.hideLoading()
-					this.showErrorMessage(error.message)
-				})
+			},
 			
 
-			},
 			setDataBatch11(result) {
 				console.log(result)
 				try {
@@ -560,7 +544,7 @@
 									that.$forceUpdate()
 								}, 100)
 							}else {
-								this.showErrorMessage("包装号["+packingNumber+"]已经扫描")
+								itemDetail.handleQty=calc.add(itemDetail.handleQty,result.label.qty)
 							}
 							
 					}

src/pages/issue/record/directIssueByBatch.vue

@@ -212,19 +212,21 @@
 					title:"校验中...",
 					mask:true
 				})
-				//校验箱码是否已经发料
-				issueCheck(result.package.number).then(res=>{
-					uni.hideLoading()
-					if(res.data.length==0){
+				
 				this.setData(result);
-					}else {
-						this.showErrorMessage("箱码["+result.package.number+"]已经发过料")
-					}
+				//校验箱码是否已经发料
+				// issueCheck(result.package.number).then(res=>{
+				// 	uni.hideLoading()
+				// 	if(res.data.length==0){
+				// 		this.setData(result);
+				// 	}else {
+				// 		this.showErrorMessage("箱码["+result.package.number+"]已经发过料")
+				// 	}
 					
-				}).catch(error=>{
-					uni.hideLoading()
-					this.showErrorMessage(error.message)
-				})
+				// }).catch(error=>{
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error.message)
+				// })
 				
 			
 			},
@@ -257,9 +259,7 @@
 						newDetail.packingNumber = pack.number
 						item.subList.push(newDetail);
 					} else {
-						if (detail.scaned == true) {
-							this.showErrorMessage("箱码[" + pack.number + "]已经扫描")
-						}
+						detail.handleQty=calc.add(detail.qty,balance.qty)
 					}
 				}
 				calcHandleQty(this.detailSource)