From 200950c993e02a1c5a2fe8c254694604655a440f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 14 Jun 2024 15:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D--=E5=A4=A7=E5=93=A5=E8=AE=A9=E5=8E=BB=E6=8E=89=20from?=
 =?UTF-8?q?InventoryStatuses?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanPackAndLocation.vue         | 7 ++++++-
 src/pages/productPutaway/job/productPutawayDetail.vue    | 2 +-
 src/pages/productPutaway/record/productPutawayRecord.vue | 2 +-
 src/pages/putaway/job/putawayDetail.vue                  | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index d8181552..c9e05933 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -105,6 +105,10 @@
 			queryBalance: {
 				type: Boolean,
 				default: true
+			},
+			balanceFromInventoryStatuses:{//是否传fromInventoryStatuses
+				type: Boolean,
+				default: true
 			}
 		},
 		data() {
@@ -255,7 +259,8 @@
 						// 	title: '查询中...',
 						// 	mask: true
 						// })
-						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses,
+						// 采购上架任务--大哥让去掉 fromInventoryStatuses
+						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.balanceFromInventoryStatuses?this.fromInventoryStatuses:undefined,
 							res => {
 								uni.hideLoading();
 								if (res.success) {
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 0ae80cc1..c4c53f0f 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -36,7 +36,7 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 
 		<comMessage ref="comMessage"></comMessage>
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 4cb454b3..820d4a28 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -33,7 +33,7 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 64db0566..78542323 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -41,7 +41,7 @@
 		<!-- 		<winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
 		</winScanPackAndLocationNoBalance> -->
 
-		<winScanPackAndLocation ref="scanPopup" @getResult='getScanResult' :noShowBalanceMessage="true">
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult' :noShowBalanceMessage="true">
 		</winScanPackAndLocation>
 
 		<comMessage ref="comMessage"></comMessage>