From 571c86f95c525e3c07fb37d2740880e237474be0 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 13 Jun 2024 14:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/balance.js                         | 39 ++++++++++++++-----
 .../scan/winScanPackAndLocation.vue           |  4 +-
 .../productPutaway/job/productPutawayJob.vue  |  2 +-
 src/pages/purchaseReceipt/job/receiptJob.vue  |  2 +-
 src/pages/putaway/job/putawayJob.vue          |  2 +-
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/common/balance.js b/src/common/balance.js
index 1a53c9f6..30ee40ad 100644
--- a/src/common/balance.js
+++ b/src/common/balance.js
@@ -211,15 +211,21 @@ export function byPacking(label, locationCode, fromInventoryStatuses, callback)
 		action: "==",
 		value: locationCode
 	})
-	if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+	if (fromInventoryStatuses) {
+		var status = ""
+		fromInventoryStatuses.forEach(res => {
+			status = res + ","
+		})
+
 		filters.push({
 			column: "inventoryStatus",
 			action: "in",
-			value: fromInventoryStatuses
+			value: status
 		})
 	}
 
 
+
 	var params = {
 		filters: filters,
 		pageNo: 1,
@@ -274,11 +280,16 @@ export function byBatch(label, locationCode, fromInventoryStatuses, callback) {
 		value: locationCode
 	})
 
-	if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+	if (fromInventoryStatuses) {
+		var status = ""
+		fromInventoryStatuses.forEach(res => {
+			status = res + ","
+		})
+
 		filters.push({
 			column: "inventoryStatus",
 			action: "in",
-			value: fromInventoryStatuses
+			value: status
 		})
 	}
 
@@ -346,11 +357,16 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback)
 		value: locationCode
 	})
 
-	if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+	if (fromInventoryStatuses) {
+		var status = ""
+		fromInventoryStatuses.forEach(res => {
+			status = res + ","
+		})
+
 		filters.push({
 			column: "inventoryStatus",
 			action: "in",
-			value: fromInventoryStatuses
+			value: status
 		})
 	}
 
@@ -400,11 +416,16 @@ export function byUniqueId(label, locationCode, fromInventoryStatuses, callback)
 		value: label.packingNumber
 	})
 
-	if (fromInventoryStatuses != null && fromInventoryStatuses != "") {
+	if (fromInventoryStatuses) {
+		var status = ""
+		fromInventoryStatuses.forEach(res => {
+			status = res + ","
+		})
+
 		filters.push({
 			column: "inventoryStatus",
 			action: "in",
-			value: fromInventoryStatuses
+			value: status
 		})
 	}
 
@@ -474,4 +495,4 @@ export function balanceByLocation(locationCode, callback) {
 		result.message = err.message;
 		callback(result)
 	})
-}
+}
\ No newline at end of file
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 636b7c56..d8181552 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -140,7 +140,7 @@
 				} else {
 					this.locationGetFocus();
 				}
-				this.fromInventoryStatuses = this.businessType.outInventoryStatuses
+				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses) 
 				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
 				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区
 				setTimeout(res => {
@@ -164,7 +164,7 @@
 				setTimeout(res => {
 					this.$refs.popup.open('bottom')
 				}, 500)
-				this.fromInventoryStatuses = jobContent.outInventoryStatuses
+				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
 				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
 			},
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index f2b2592b..b68fdafe 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -22,7 +22,7 @@
 			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
 		</view>
 		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
-		<winScanPackJob ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
+		<winScanPackJob ref="scanPopup" @getResult='getScanResult' >
 		</winScanPackJob>
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>
 		<comMessage ref="comMessage"></comMessage>
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 1966414c..677e643e 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -20,7 +20,7 @@
 			<receipt-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></receipt-job-list-popup>
 		</view>
 		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
-		<winScanPackJob :title="scanTitle" ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
+		<winScanPackJob :title="scanTitle" ref="scanPopup" @getResult='getScanResult' >
 		</winScanPackJob>
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>
 		<comMessage ref="comMessage"></comMessage>
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index fc22b4de..ef54b650 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -23,7 +23,7 @@
 		</view>
 		<win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button>
 
-		<winScanPackJob ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
+		<winScanPackJob ref="scanPopup" @getResult='getScanResult'>
 		</winScanPackJob>
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>