修改计划外出入库

src/pages/scrap/request/scrapRequestCreate.vue

@@ -159,6 +159,7 @@
 					let newDetail = createDetailInfo(balance, pack); //
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
+					this.scanPopupGetFocus()
 				} else {
 					var detail = item.subList.find(r => {
 						if (r.packingNumber == balance.packingNumber &&
@@ -171,6 +172,7 @@
 					if (detail == undefined) {
 						let newDetail = createDetailInfo(balance, pack);
 						item.subList.push(newDetail);
+						this.scanPopupGetFocus()
 					} else {
 						if (detail.scaned == true) {
 							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描")
@@ -185,7 +187,7 @@
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						this.scanPopupGetFocus()
 					}
 				});
 			},
@@ -231,8 +233,8 @@
 			},
 
 			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.packGetFocus();
 				}
 			},
 
@@ -292,13 +294,6 @@
 					if (res) {}
 				});
 			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
 
 			showScanMessage(message) {
 				this.$refs.comMessage.showScanMessage(message);

src/pages/unPlanned/record/issueRecord.vue

@@ -154,12 +154,13 @@
 					// newDetail.inventoryStatus ="OK";
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
+					this.packGetFocus()
 				} else {
 					var detail = item.subList.find(r => {
-						if (r.packingNumber == result.packingNumber &&
-							r.batch == result.batch &&
-							r.locationCode == result.locationCode &&
-							r.inventoryStatus == result.inventoryStatus &&
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus &&
 							r.scaned == true) {
 							return r;
 						}
@@ -168,14 +169,21 @@
 					if (detail == undefined) {
 						let newDetail = createDetailInfo(balance, pack);
 						item.subList.push(newDetail);
+						this.packGetFocus()
 					} else {
-						this.showErrorMessage(result.packingNumber + "重复扫描")
+						this.showErrorMessage("箱码[" + balance.packingNumber + "]批次[" + balance.batch + "]已经扫描")
 					}
 				}
 				this.calcHandleQty();
 
 			},
 			
+			packGetFocus(){
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packGetFocus()
+				}
+			},
+
 			calcHandleQty() {
 				calcHandleQty(this.detailSource);
 				this.$forceUpdate();
@@ -184,7 +192,7 @@
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						this.packGetFocus()
 					}
 				});
 			},

src/pages/unPlanned/record/receiptRecord.vue

@@ -144,10 +144,12 @@
 					let newDetail = this.createDetailInfo(label, pack);
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
+					this.getfocus()
+					
 				} else {
 					var detail = item.subList.find(r => {
-						if (r.packingNumber == result.number &&
-							r.batch == result.batch) {
+						if (r.packingNumber == pack.number &&
+							r.batch == pack.batch) {
 							return r;
 						}
 					})
@@ -155,9 +157,10 @@
 					if (detail == undefined) {
 						let newDetail = this.createDetailInfo(label, pack);
 						item.subList.push(newDetail);
+						this.getfocus()
 					} else {
 						if (detail.scaned) {
-							this.showErrorMessage("箱码[" + result.Number + "]批次[" + result.batch + "]已经扫描")
+							this.showErrorMessage("箱码[" + pack.number + "]批次[" + pack.batch + "]已经扫描")
 						}
 
 					}
@@ -166,6 +169,12 @@
 
 			},
 			
+			getfocus(){
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.getfocus()
+				}
+			},
+
 			createItemInfo(label, pack) {
 				let item = {
 					itemCode: pack.itemCode,
@@ -213,7 +222,7 @@
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						this.getfocus()
 					}
 				});
 			},

src/pages/unPlanned/request/issueRequestCreate.vue

@@ -166,12 +166,13 @@
 					let newDetail = createDetailInfo(balance, pack); //
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
+					this.packGetFocus()
 				} else {
 					var detail = item.subList.find(r => {
-						if (r.packingNumber == result.packingNumber &&
-							r.batch == result.batch &&
-							r.locationCode == result.locationCode &&
-							r.inventoryStatus == result.inventoryStatus &&
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus &&
 							r.scaned == true) {
 							return r;
 						}
@@ -180,13 +181,21 @@
 					if (detail == undefined) {
 						let newDetail = createDetailInfo(balance, pack);
 						item.subList.push(newDetail);
+						this.packGetFocus()
 					} else {
-						this.showErrorMessage(result.packingNumber + "重复扫描")
+						this.showErrorMessage("包装["+balance.packingNumber+"]"+"批次["+balance.batch+"]" + "重复扫描")
 					}
 				}
 				this.calcHandleQty();
 
 			},
+			packGetFocus(){
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packGetFocus()
+				}
+				
+			},
+			
 
 			calcHandleQty() {
 				calcHandleQty(this.detailSource);
@@ -196,7 +205,7 @@
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						this.packGetFocus()
 					}
 				});
 			},