diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index 8bb14470..25cb7dcb 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -395,12 +395,22 @@
 
 			calcFgQty() {
 				this.dataContent.handleQty = this.showList.length;
-				if (this.dataContent.handleQty == this.dataContent.packQty) {
-					if (this.$refs.scanPopup) {
-						this.$refs.scanPopup.closeScanPopup();
+				if(parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty) <= parseFloat(this.dataContent.packQty)){
+					if(parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty)){
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.closeScanPopup();
+						}
+						this.commit()
+					}
+				}else{
+					if (parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.packQty)) {
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.closeScanPopup();
+						}
+						this.commit()
 					}
-					this.commit()
 				}
+				
 			},
 
 			scanPopupGetFocus() {
@@ -416,15 +426,22 @@
 			getH5BatchPrintingLable( number) {
 				let _this = this
 				batchPrintingLable(number).then(resLable => {
-					console.log('batchPrintingLable', resLable)
 					const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
 					const webData = {
 						token: storage.getStorage(storage.constant.token),
 						asn_number: resLable.data
 					}
-					uni.navigateTo({
-						url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
-					});
+					
+					if ( this.scanedQty + this.showList.length == this.dataContent.planQty) {
+						uni.redirectTo({
+							url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+						});
+					}else{
+						uni.navigateTo({
+							url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+						});
+					}
+					
 				})
 			},			
 
@@ -432,7 +449,7 @@
 				let _this = this
 				// #ifdef APP
 				if (pointData.length > 0) {
-					if (this.scanedQty + this.showList.length == this.dataContent.planQty) {
+					if ( this.scanedQty + this.showList.length == this.dataContent.planQty) {
 						uni.redirectTo({
 							url: `/pages/point/index?points=${JSON.stringify(pointData)}`
 						});