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

src/mycomponents/scan/winScanPack.vue

@@ -73,15 +73,19 @@
 			},
 
 			scanClick() {
-				this.$refs.comscan.clickScanMsg();
+				if(this.$refs.comscan){
+					this.$refs.comscan.clickScanMsg();
+				}
+				
 			},
 
 			cancelClick() {
-				this.$refs.comscan.clearScanValue();
+				if(this.$refs.comscan){
+					this.$refs.comscan.clearScanValue();
+				}
 			},
 
 			getScanResult(result) {
-				
 				if (result.success) {
 					this.$emit("getResult", result);
 				} else {

src/mycomponents/scan/winScanPackAndLocation.vue

@@ -201,8 +201,8 @@
 					 if(timer){
 						 clearTimeout(timer)
 					 }
-					 // this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
-					 // this.$refs.comscansimulate.clickScanMsg();
+					 this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
+					 this.$refs.comscansimulate.clickScanMsg();
 				}, 500)
 				
 				
@@ -385,7 +385,9 @@
 
 			//盘点回调
 			countCallBack(datas) {
-				this.$refs.comscan.clear();
+				if(this.$refs.comscan){
+					this.$refs.comscan.clear();
+				}
 				//返回标签信息、库存信息和管理模式
 				let data = {
 					label: this.scanResult.label,
@@ -399,7 +401,9 @@
 			},
 
 			packCallBack(item) {
-				this.$refs.comscan.clear();
+				if(this.$refs.comscan){
+					this.$refs.comscan.clear();
+				}
 				//返回标签信息、库存信息和管理模式
 				let data = {
 					label: this.scanResult.label,

src/pages/pointPutawayJob/index.vue

@@ -33,7 +33,7 @@
 					<u-td>{{cur.batch}}</u-td>
 					<u-td>{{cur.packingNumber}}</u-td>
 					<u-td>{{cur.packUnit}}</u-td>
-					<u-td>{{cur.packQty}}</u-td>
+					<u-td>{{cur.qty}}</u-td>
 					<u-td>{{cur.uom}}</u-td>
 				</u-tr>
 			</u-table>
@@ -221,7 +221,7 @@
 									<td>${cur.batch}</td>
 									<td>${cur.packingNumber}</td>
 									<td>${cur.packUnit}</td>
-									<td>${cur.packQty}</td>
+									<td>${cur.qty}</td>
 									<td>${cur.uom}</td>
 								</tr>
 							`

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -115,13 +115,15 @@
 				isCheckLocation: false,
 				switchCode: "",
 				scanedPackingNumber: '',
-				hintTitle:""
+				hintTitle:"",
+				status:''
 			};
 		},
 		onLoad(option) {
 			this.id = option.id;
 			this.type = option.type;
-			this.scanedPackingNumber = option.scaned || '';
+			this.scanedPackingNumber = option.scaned || '';
+			this.status = option.status || ''
 			if (this.type == 'predict') {
 				this.switchCode = "SemiPutawayLocationCodeValidate"
 				this.hintTitle="预生产上架"
@@ -131,16 +133,19 @@
 				this.hintTitle="成品入库"
 				updateTitle("成品入库详情");
 			}
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-			}
+			
+		},
+		onShow(){
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (this.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -214,6 +219,7 @@
 									if (this.scanedPackingNumber && this.scanedPackingNumber == s
 										.packingNumber) {
 											s.scaned = true
+											s.cancleScanedHiht = true
 											// s.handleQty =s.qty
 											this.openScanPopupSimulate(s)
 										}
@@ -298,7 +304,8 @@
 				this.$refs.scanPopup.closeScanPopup();
 			},
 
-			getScanResult(result) {
+			getScanResult(result) {
+				
 				try {
 					var packingNumber = result.balance.packingNumber;
 					var batch = result.balance.batch;
@@ -319,8 +326,9 @@
 						if (itemDetail == undefined) {
 							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 								.fromLocationCode + "】不在列表中")
-						} else {
-							if (itemDetail.scaned) {
+						} else {
+							
+							if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) {
 								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 									.fromLocationCode + "】已经扫描")
 							} else {

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -134,23 +134,27 @@
 				managementList: [],
 				jobStatus: "",
 				jobToLocationCode: "",
-				scanedPackingNumber: ''
-
+				scanedPackingNumber: '',
+				status:''
 			};
 		},
 		onLoad(option) {
 			this.id = option.id;
-			this.scanedPackingNumber = option.scaned || '';
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-			}
+			this.scanedPackingNumber = option.scaned || '';
+			this.status = option.status || ''
+			
+		},
+		onShow(){
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (this.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -224,6 +228,9 @@
 									if (this.scanedPackingNumber && this.scanedPackingNumber == s
 										.packingNumber){
 											s.scaned = true
+											s.cancleScanedHiht = true
+											s.copyContent = "HMQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty
+
 											this.$refs.scanPopup.simulateScan(s);
 											// s.handleQty =s.qty
 										} 
@@ -239,7 +246,8 @@
 				})
 			},
 
-			getScanResult(result) {
+			getScanResult(result) {
+				
 				let label = result.label;
 				var packingNumber = label.packingNumber;
 				var batch = label.batch;
@@ -256,7 +264,7 @@
 					if (itemDetail == undefined) {
 						this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中")
 					} else {
-						if (itemDetail.scaned) {
+						if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) {
 							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
 						} else {
 							itemDetail.scaned = true;

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -133,7 +133,8 @@
 				jobStatus: "",
 				isAllReceived: false,
 				operation: '',
-				scanedPackingNumber: ''
+				scanedPackingNumber: '',
+				status:''
 			};
 		},
 
@@ -142,16 +143,20 @@
 			this.id = option.id;
 			this.scanedPackingNumber = option.scaned || '';
 			this.operation = option.operation;
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-			}
+			this.status = option.status;
+		},
+			
+		onShow(){
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (this.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -229,7 +234,10 @@
 										if (this.scanedPackingNumber && this
 											.scanedPackingNumber == s
 											.packingNumber) {
-											s.scaned = true
+											s.scaned = true
+											s.cancleScanedHiht = true
+											
+											s.copyContent = "HPQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty
 											this.$refs.scanPopup.simulateScan(s);
 										}
 									})
@@ -246,7 +254,8 @@
 			},
 
 
-			getScanResult(result) {
+			getScanResult(result) {
+				
 				try {
 					var itemCode = result.label.itemCode;
 					var detail = this.detailSource.find(r => r.itemCode == itemCode);
@@ -260,7 +269,7 @@
 						if (itemDetail.length == 0) {
 							this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】不在列表中")
 						} else {
-							if (itemDetail[0].scaned) {
+							if (!itemDetail[0].cancleScanedHiht&&itemDetail[0].scaned) {
 								this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】已经扫描")
 							} else {
 								itemDetail.forEach(item => {
@@ -307,7 +316,7 @@
 								if (isExit == undefined) {
 									this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
 								} else {
-									if (isExit.scaned) {
+									if (!isExit.cancleScanedHiht&&isExit.scaned) {
 										this.showMessage("箱码【" + packingNumber + "】已经扫描")
 									} else {
 										isExit.scaned = true
@@ -325,7 +334,7 @@
 										scanedLength++;
 									}
 								})
-								if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
+								if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) {
 									this.showMessage("箱码【" + packingNumber + "】已经扫描")
 								} else {
 									itemDetail.scaned = true;

src/pages/putaway/job/putawayDetail.vue

@@ -204,6 +204,7 @@
 									if (this.scanedPackingNumber && this.scanedPackingNumber == s
 										.packingNumber) {
 											s.scaned = true
+											s.cancleScanedHiht = true
 											s.packList.forEach(item=>item.scaned = true)
 											s.inventoryStatus = s.inspectResult; //更新检验结果状态
 											this.openScanPopupSimulate(s)
@@ -345,7 +346,7 @@
 								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 									.fromLocationCode + "】不在列表中")
 							} else {
-								if (isExit.scaned) {
+								if (!isExit.cancleScanedHiht&&isExit.scaned) {
 									this.showMessage("箱码【" + packingNumber + "】已经扫描")
 								} else {
 									isExit.scaned = true
@@ -372,7 +373,7 @@
 							//大哥让加的
 							itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
 							
-							if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
+							if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) {
 								this.showMessage("箱码【" + packingNumber + "】已经扫描")
 							} else {
 								itemDetail.scaned = true;