From d548a171da70b18a58caaf208e0e17a29b0ad55b Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 12 Jan 2024 10:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=96=99=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/record.js                                     | 1 +
 pages/purchaseReturn/request/returnRequestCreate.vue | 4 ++--
 pages/putaway/request/putawayRequestCreate.vue       | 9 ++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/record.js b/common/record.js
index 8980df6c..2e457395 100644
--- a/common/record.js
+++ b/common/record.js
@@ -28,6 +28,7 @@ export function createDetailInfo(data, pack) {
 	let detail = {};
 	Object.assign(detail, data)
 	detail.balanceQty = Number(detail.qty)
+	detail.qty = Number(detail.qty);
 	detail.stdPackQty = Number(pack.stdPackQty)
 	detail.stdPackUnit = pack.stdPackUnit
 	detail.handleQty =0;
diff --git a/pages/purchaseReturn/request/returnRequestCreate.vue b/pages/purchaseReturn/request/returnRequestCreate.vue
index dbc33c07..11f8fde1 100644
--- a/pages/purchaseReturn/request/returnRequestCreate.vue
+++ b/pages/purchaseReturn/request/returnRequestCreate.vue
@@ -219,9 +219,9 @@
 						purchaseReturnRequestCreate(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
-								this.showCommitSuccessMessage("提交成功<br>生成采购退货申请" + res.data, )
+								this.showCommitSuccessMessage("提交成功<br>生成采购退货申请<br>" + res.data)
 							} else {
-								this.showErrorMessage("提交失败"+res.msg)
+								this.showErrorMessage("提交失败["+res.msg+"]")
 							}
 						}).catch(error => {
 							uni.hideLoading()
diff --git a/pages/putaway/request/putawayRequestCreate.vue b/pages/putaway/request/putawayRequestCreate.vue
index 18a8cc44..b57bb414 100644
--- a/pages/putaway/request/putawayRequestCreate.vue
+++ b/pages/putaway/request/putawayRequestCreate.vue
@@ -52,7 +52,6 @@
 <script>
 	import {
 		putawayRequestSubmit,
-		putawayRecordSubmit,
 		validateItemAndLocation,
 		getPutawayRecommendLocation
 	} from '@/api/request2.js';
@@ -61,6 +60,7 @@
 		goHome,
 		updateTitle,
 		getCurrDateTime,
+		deepCopyData,
 		getPackingNumberAndBatchByList
 	} from '@/common/basic.js';
 	import {
@@ -286,7 +286,7 @@
 				putawayRequestSubmit(params).then(res => {
 					uni.hideLoading()
 					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成采购上架申请<br>" + res.data, )
+						this.showCommitSuccessMessage("提交成功<br>生成原料上架申请<br>" + res.data, )
 					} else {
 						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
@@ -308,10 +308,9 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							var subItem = {};
-							Object.assign(subItem, detail)
+							var subItem = deepCopyData(detail);
 							subItem.fromLocationCode = detail.locationCode;
-							subItem.qty=detail.handleQty;
+							subItem.qty = detail.handleQty!=0? detail.handleQty:detail.qty;
 							subItem.package = null;
 							subList.push(subItem)
 						}