修改来源库位, 计划外出库校验

pages/count/job/countDetail.vue

@@ -273,8 +273,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/customerReturn/job/returnDetail.vue

@@ -226,8 +226,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/inspect/job/inspectDetail.vue

@@ -270,8 +270,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/inspect/job/inspectFullDetail.vue

@@ -286,8 +286,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/inspect/job/inspectResult.vue

@@ -479,9 +479,9 @@
 					if (res.data) {
 						var hint="";
 						if(this.jobContent.nextAction=="FULL_INSPECT"){
-							hint ="提交成功<br>生成到货检验任务" + res.data
+							hint ="提交成功<br>生成到货检验任务<br>" + res.data
 						}else {
-							hint ="提交成功<br>生成到货检验记录" + res.data
+							hint ="提交成功<br>生成到货检验记录<br>" + res.data
 						}
 						this.showCommitSuccessMessage(hint)
 					} else {

pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -267,8 +267,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/productDismantle/job/productDismantleDetail.vue

@@ -241,8 +241,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/productPutaway/job/productPutawayDetail.vue

@@ -241,8 +241,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/productionReceipt/job/productionReceiptDetail.vue

@@ -226,8 +226,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/productionReturn/job/returnDetail.vue

@@ -243,8 +243,8 @@
 				// 	let item = this.detailSource[i];
 				// 	item.subList.forEach(l => {
 				// 		//重复的库位不往里面插入
-				// 		var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-				// 		if (location.length == 0) {
+				// 		var location = fromlocationList.find(res => res == l.fromLocationCode)
+						// if (location == undefined) {
 						// 	fromlocationList.push(l.fromLocationCode);
 						// }
 				// 		//来源库位赋默认值

pages/putaway/job/putawayDetail.vue

@@ -250,8 +250,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/scrap/job/scrapJobDetail.vue

@@ -374,8 +374,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/transfer/job/issueDetail.vue

@@ -230,8 +230,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/transfer/job/transferDetail.vue

@@ -281,8 +281,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/unPlanned/job/issueJobDetail.vue

@@ -218,13 +218,14 @@
 					} else {
 						var itemDetail = detail.subList.find(r => {
 							return r.packingNumber == packingNumber &&
-								r.batch == batch
+								r.batch == batch&&
+								r.fromLocationCode == result.fromLocationCode
 						})
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
 						} else {
 							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
@@ -362,6 +363,17 @@
 				})
 			},
 			
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
 			openScanPopup() {
 				let fromlocationCode = '';
 				let fromlocationList = [];
@@ -369,8 +381,8 @@
 					let item = this.detailSource[i];
 					item.subList.forEach(l => {
 						//重复的库位不往里面插入
-						var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode)
-						if (location.length == 0) {
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
 							fromlocationList.push(l.fromLocationCode);
 						}
 						//来源库位赋默认值

pages/unPlanned/job/receiptJobDetail.vue

@@ -217,15 +217,16 @@
 					var itemCode = result.label.itemCode;
 					var detail = this.detailSource.find(r => r.itemCode == itemCode);
 					if (detail == undefined) {
-						this.showMessage("物料号【" + itemCode + "】不在列表中")
+						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
 					} else {
 
-						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch);
+						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch
+						&& r.fromLocationCode == result.fromLocationCode);
 						if (itemDetail == undefined) {
-							this.showMessage("箱码【" + packingNumber + "】,批次【" + batch + "】不在列表中")
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
 						} else {
 							if (itemDetail.scaned) {
-								this.showMessage("箱码【" + packingNumber + "】已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
 							} else {
 								itemDetail.scaned = true;
 								itemDetail.handleQty = Number(result.label.qty);