From 95007ee992bd99e75b74ea809c91ceeae0bfaa75 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 28 May 2024 19:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/record.js                                   |  2 ++
 .../productRecycle/record/productRecycleRecord.vue     | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/common/record.js b/src/common/record.js
index ab5d0c9a..af79a00d 100644
--- a/src/common/record.js
+++ b/src/common/record.js
@@ -36,6 +36,8 @@ export function createDetailInfo(balance, pack) {
 	detail.packUnit = pack.packUnit
 	detail.handleQty =  new Decimal(detail.qty).toNumber() ;
 	detail.package = pack;
+	detail.productionlineCode = pack.productionLineCode; // 制品回收记录需要加的
+	detail.toInventoryStatus = balance.inventoryStatus; // 制品回收记录需要加的
 
 	return detail;
 }
diff --git a/src/pages/productRecycle/record/productRecycleRecord.vue b/src/pages/productRecycle/record/productRecycleRecord.vue
index 1159cd2b..6bb35c6a 100644
--- a/src/pages/productRecycle/record/productRecycleRecord.vue
+++ b/src/pages/productRecycle/record/productRecycleRecord.vue
@@ -105,9 +105,9 @@
 			if (this.fromType == "requestType") {
 				updateTitle("采购退货申请")
 			} else {
-				updateTitle("采购退货记录")
+				updateTitle("制品回收记录")
 			}
-			var typeCode = "PurchaseReturn"
+			var typeCode = "Productredress"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
@@ -149,6 +149,7 @@
 			},
 
 			getScanResult(result) {
+				console.log('result',result)
 				if (this.supplierCode == '') {
 					this.supplierCode = result.label.supplierCode;
 				} else {
@@ -170,6 +171,7 @@
 			},
 
 			getDataSource(result) {
+				console.log('getDataSource',result)
 				let balance = result.balance;
 				let label = result.label;
 				let pack = result.package;
@@ -282,10 +284,12 @@
 							submitItem.toBatch = detail.batch;
 
 							submitItem.fromLocationCode = detail.locationCode;
-							submitItem.toLocationCode = ''; //采购退货直接出库，目标库位为空
+							submitItem.toLocationCode = detail.locationCode; 
 							
 							submitItem.qty = detail.handleQty;
 							submitItem.package = "";
+							submitItem.toInventoryStatus = detail.toInventoryStatus;
+							
 							subList.push(submitItem)
 						}
 					})