From e3ace2ec119980ab33ab8879475c9c4410141c0f Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 20 Aug 2024 11:50:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/balance.js                          | 18 ------------------
 .../customerReturn/record/returnRecord.vue     |  9 ++++++---
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/common/balance.js b/src/common/balance.js
index 460e9bf4..a8012fbd 100644
--- a/src/common/balance.js
+++ b/src/common/balance.js
@@ -345,12 +345,6 @@ export function byBatch(label, locationCode, fromInventoryStatuses, callback) {
 			action: "in",
 			value: status
 		})
-
-		filters.push({
-			column: "inventoryStatus",
-			action: "in",
-			value: status
-		})
 	}
 
 	var params = {
@@ -424,12 +418,6 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback)
 			action: "in",
 			value: status
 		})
-
-		filters.push({
-			column: "inventoryStatus",
-			action: "in",
-			value: status
-		})
 	}
 
 	var params = {
@@ -485,12 +473,6 @@ export function byUniqueId(label, locationCode, fromInventoryStatuses, callback)
 			action: "in",
 			value: status
 		})
-
-		filters.push({
-			column: "inventoryStatus",
-			action: "in",
-			value: status
-		})
 	}
 
 	var params = {
diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue
index b1196720..b95a08db 100644
--- a/src/pages/customerReturn/record/returnRecord.vue
+++ b/src/pages/customerReturn/record/returnRecord.vue
@@ -33,7 +33,10 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ">
+		<win-scan-pack-and-location ref="scanPopup" 
+		@getResult='getScanResult' 
+		headerType="HPQ,HMQ"
+		 :balanceFromInventoryStatuses="true">
 		</win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
@@ -155,7 +158,7 @@
 					
 					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack); //
-					
+					newDetail.packingNumber =pack.number
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {
@@ -332,7 +335,7 @@
 							submitItem.itemDesc1 = detail.package.itemDesc1;
 							submitItem.itemDesc2 = detail.package.itemDesc2;
 
-							submitItem.inventoryStatus = detail.inventoryStatus;
+							submitItem.inventoryStatus = this.toInventoryStatuses;
 							submitItem.toInventoryStatus = this.toInventoryStatuses;
 
 							submitItem.fromPackingNumber = info.packingNumber;