From e48b95f16e8a3e73c8ee5d89b8b76f68fdbd57ea Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 8 Aug 2024 19:56:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85=EF=BC=8C?=
 =?UTF-8?q?=E6=8B=86=E5=8C=85=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winComScanBalance.vue     | 13 +++++++++----
 src/pages/fg/fgChange.vue                       |  3 ++-
 src/pages/package/record/overPackageRecord.vue  |  6 +++++-
 src/pages/package/record/splitPackageRecord.vue |  5 ++++-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index fc09b61d..f9bb581c 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -78,6 +78,10 @@
 			verifyCategory: {
 				type: Boolean,
 				default: false
+			},
+			isCheckLocationBalance: {
+				type: Boolean,
+				default: true
 			}
 		},
 		data() {
@@ -92,7 +96,6 @@
 				fromLocation: '',
 				fromLocationList: [],
 				fromLocationAreaTypeList: [],
-
 				toLocationAreaTypeList: [],
 				locationOnFocus: false,
 				businessType: {},
@@ -124,10 +127,12 @@
 					return;
 				}
 				this.getItemCodeType(result.package.itemCode, callBack => {
+					if(this.isCheckLocationBalance){
+						this.getToLocationBalance(this.resultData)
+					}else {
+						this.queryBalance(this.resultData)
+					}
 
-					this.getToLocationBalance(this.resultData)
-
-					//this.queryBalance(this.resultData)
 				})
 			},
 
diff --git a/src/pages/fg/fgChange.vue b/src/pages/fg/fgChange.vue
index 663e06b8..ee70f2ed 100644
--- a/src/pages/fg/fgChange.vue
+++ b/src/pages/fg/fgChange.vue
@@ -71,7 +71,8 @@
 		</view>
 
 		<win-com-scan-balance ref="scanPopup" @getBalance='getPackScanResult' :bussinessCode="bussinessCode"
-			:verifyCategory='true'>
+			:verifyCategory='true'
+			:isCheckLocationBalance="false">
 		</win-com-scan-balance>
 
 		<win-scan-fg-label ref="scanFgPopup" @getResult='getFgScanResult' title='灯码'></win-scan-fg-label>
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 2b904d94..4e2e0b27 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -63,7 +63,11 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' bussinessCode="OverPackage">
+		<winComScanBalance ref="scanPopup" 
+		@getBalance='getScanResult'
+		 bussinessCode="OverPackage"
+		 :isCheckLocationBalance="false"
+		 >
 		</winComScanBalance>
 
 
diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue
index 04aff03d..b78ce07d 100644
--- a/src/pages/package/record/splitPackageRecord.vue
+++ b/src/pages/package/record/splitPackageRecord.vue
@@ -38,7 +38,10 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="typeCode">
+		<winComScanBalance ref="scanPopup"
+		 @getBalance='getScanResult' 
+		  :isCheckLocationBalance="false"
+		 :bussinessCode="typeCode">
 		</winComScanBalance>
 		<comMessage ref="comMessage"></comMessage>
 	</view>