From 64bc62b1a3e8eb0eb22b9e931524ca11fc92f60a Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Sat, 24 Aug 2024 09:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanPackAndLocation.vue | 8 ++++++--
 src/pages/putaway/job/putawayDetail.vue          | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 60c9b134..2a9a8253 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -458,7 +458,11 @@
 			getQueryCondition() {
 				let condition = '按照以下条件:\n';
 				let label = this.scanResult.label;
-				let status = getInventoryStatusDesc(this.inventoryStatus);
+				var isShowStatus = this.balanceFromInventoryStatuses ? this.fromInventoryStatuses : undefined
+				if(isShowStatus){
+					let status = getInventoryStatusDesc(isShowStatus);
+				}
+				
 				switch (this.managementPrecision) {
 					case 'BY_PACKAGING':
 						condition = condition + '物料号=[' + label.itemCode + ']\n箱码=[' + label.packingNumber +
@@ -479,7 +483,7 @@
 						condition = condition + '物料号=[' + label.itemCode + ']'
 						break;
 				}
-				if (this.inventoryStatus.length > 0) {
+				if (status) {
 					condition = condition + '\n库存状态=[' + status + ']'
 				}
 				return condition;
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 80540675..2c3eb71f 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -43,7 +43,8 @@
 		</winScanPackAndLocationNoBalance> -->
 
 		<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'
-			:noShowBalanceMessage="true">
+			
+			:noShowBalanceMessage="false">
 		</winScanPackAndLocation>
 
 		<comMessage ref="comMessage"></comMessage>