From 310dd0bdd6d943ecadc54c7783b202b214c311f3 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 21 Nov 2024 16:04:45 +0800
Subject: [PATCH] =?UTF-8?q?YT-1119=20=E9=9A=94=E7=A6=BB=E8=BD=AC=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E8=AE=B0=E5=BD=95=E4=BB=8E=E4=BB=93=E5=BA=93=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winScanPackAndLocation.vue | 6 +++++-
 src/pages/inventoryMove/coms/comMoveRecord.vue   | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index acc6abb2..dfcad073 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -149,7 +149,8 @@
 				managementPrecision: '',
 				fromInventoryStatuses: "",
 				isCheck: false,
-				chooseWhich: '1'
+				chooseWhich: '1',
+				fromWarehouseCode:""
 			}
 		},
 		created() {
@@ -277,6 +278,7 @@
 						if (available == "TRUE") {
 							if (checkDirectoryItemExist(this.fromLocationAreaTypeList, type)) {
 								this.location = result;
+								this.fromWarehouseCode=result.warehouseCode
 								// this.packGetFocus();
 								// 如果只回显
 								if(this.isJustReplay){
@@ -470,6 +472,7 @@
 				let data = {
 					label: this.scanResult.label,
 					package: this.scanResult.package,
+					fromWarehouseCode:this.fromWarehouseCode,
 					balance: datas,
 					fromLocationCode: this.fromLocationCode,
 				}
@@ -491,6 +494,7 @@
 				let data = {
 					label: this.scanResult.label,
 					package: this.scanResult.package,
+					fromWarehouseCode:this.fromWarehouseCode,
 					balance: item,
 					fromLocationCode: this.fromLocationCode,
 				}
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index a820b9f4..3199956d 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -157,6 +157,7 @@
 				itemCodeTypeList: [],
 				isShowEditLocation: false,
 				isJustReplay: true, //是否只是回显，不走库存余额接口
+				fromWarehouseCode:""
 			}
 		},
 
@@ -286,6 +287,7 @@
 				this.toLocationInfo = location;
 			},
 			getScanResult(result, managementTypeParams) {
+				this.fromWarehouseCode =result.fromWarehouseCode
 				this.managementType = managementTypeParams
 				if (this.showOnePop) {
 					if (this.isJustReplay) {
@@ -757,7 +759,7 @@
 				})
 				this.dataContent.subList = subList;
 				this.dataContent.creator = creator;
-				this.dataContent.fromWarehouseCode = this.fromLocationInfo.warehouseCode;
+				this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
 				this.dataContent.toWarehouseCode = this.toLocationInfo.warehouseCode;
 				this.dataContent.businessType = this.businessTypeCode;
 				return this.dataContent;