From 2d70008921a7edc61a66955ac85d8ff361474906 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 2 Jan 2024 11:28:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/detail.js                                 |  2 +-
 pages/productionReturn/request/requestDetail.vue | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/detail.js b/common/detail.js
index fdc09bfc..1b566ecf 100644
--- a/common/detail.js
+++ b/common/detail.js
@@ -9,7 +9,7 @@ export function getDataSource(subList) {
 			item.subList.push(newDetail);
 			items.push(item)
 		} else {
-			item.qty += detail.qty
+			item.qty +=Number(detail.qty)
 			let newDetail = createDetailInfo(detail); //
 			item.subList.push(newDetail);
 		}
diff --git a/pages/productionReturn/request/requestDetail.vue b/pages/productionReturn/request/requestDetail.vue
index 262f5f83..3d693314 100644
--- a/pages/productionReturn/request/requestDetail.vue
+++ b/pages/productionReturn/request/requestDetail.vue
@@ -27,6 +27,7 @@
 
 	import {
 		goHome,
+		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -57,7 +58,16 @@
 		},
 		onLoad(option) {
 			this.id = option.id;
+			var businessType = option.businessType;
+			var title="生产退料申请详情"
+			if (businessType == 'ReturnToStore') {
+				title = "生产合格退料申请详情"
+			} else if (this.businessType == 'ReturnToHold') {
+				title = "生产隔离退料申请详情"
+			}
 			this.getDetail();
+			updateTitle(title)
+			
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {

From 749b70d8ebe3b234bed7a77e6014463b3f469691 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 2 Jan 2024 14:25:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/putaway/job/putawayDetail.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 805485c9..aea0d631 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -7,9 +7,9 @@
 			<view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
 			</view>
-			<u-line color="#D8D8D8" ></u-line>
+			<u-line color="#D8D8D8"></u-line>
 		</view>
-		
+
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -289,6 +289,7 @@
 						if (itemDetail == undefined) {
 							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 								.fromLocationCode + "】不在列表中")
+						} else {
 							if (itemDetail.scaned) {
 								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 									.fromLocationCode + "】已经扫描")