From b7e18fe0c5ff1c4ea923e5f2e7008a41130144e9 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 29 Dec 2023 15:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/basic.js                                 | 17 +++++++++++++++++
 mycomponents/detail/comDetailCard.vue           |  3 ++-
 .../productPutaway/job/productPutawayDetail.vue | 10 ++++------
 .../productReceipt/job/productReceiptDetail.vue |  5 ++---
 pages/putaway/job/putawayDetail.vue             |  8 ++++----
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/common/basic.js b/common/basic.js
index 53648ae5..b7467356 100644
--- a/common/basic.js
+++ b/common/basic.js
@@ -992,3 +992,20 @@ export function navigateBack(backIndex) {
 		history.back();
 	}
 }
+/**
+ * 深度克隆对象
+ * @param {*} target 
+ */
+export function  deepCopyData(target) {
+	// 克隆原始类型和null
+	if (!(target !== null && (typeof target === 'object' || typeof target === 'function'))) {
+		return target;
+	}
+	let cloneTarget = Array.isArray(target) ? [] : {};
+	// 克隆对象和数组
+	for (const key in target) {
+		cloneTarget[key] = this.deepCopyData(target[key]);
+	}
+
+	return cloneTarget;
+}
diff --git a/mycomponents/detail/comDetailCard.vue b/mycomponents/detail/comDetailCard.vue
index f3c72706..79801df8 100644
--- a/mycomponents/detail/comDetailCard.vue
+++ b/mycomponents/detail/comDetailCard.vue
@@ -31,10 +31,11 @@
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<recommend :detail="item" :isShowToLocation="false">
 							</recommend>
+							<u-line />
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</view>
-				<u-line />
+				
 			</uni-collapse-item>
 		</uni-collapse>
 		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue
index 3c323a0b..661329eb 100644
--- a/pages/productPutaway/job/productPutawayDetail.vue
+++ b/pages/productPutaway/job/productPutawayDetail.vue
@@ -142,7 +142,7 @@
 			if (e.from == 'backbutton') {
 				if (this.received) {
 					//取消承接任务	
-					cancleProductPutawayJob(this.id).then(res => {
+					cancleTakeProductPutawayJob(this.id).then(res => {
 						uni.navigateBack();
 					}).catch(error => {
 						uni.navigateBack();
@@ -276,15 +276,13 @@
 						var itemDetail = detail.subList.find(r => {
 							return r.packingNumber == packingNumber &&
 								r.batch == batch &&
-								r.fromLocationCode == locationCode
+								r.fromLocationCode == result.fromLocationCode
 						})
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
-								"]不在列表中")
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
 						} else {
 							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
-									"]已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
 							} else {
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index 7dd8e04c..5701bce4 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -14,7 +14,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
-							@remove="updateData" @updateData="updateData" :locationTypeList='tolocationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
 						</comProductDetailCard>
 					</view>
 					<u-line />
@@ -28,7 +28,7 @@
 				<view class="">
 					<requiredLocation title="收货库位" :locationCode="toLocationCode"
 						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
-						:locationTypeList="tolocationTypeList"></requiredLocation>
+						:locationTypeList="toLocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -104,7 +104,6 @@
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				toLocationTypeList: [],
-				toLocationInfo: {},
 				managementList: []
 
 			};
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 0f20f86b..30db744a 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -284,13 +284,13 @@
 					} else {
 						var itemDetail = detail.subList.find(r => {
 							return r.packingNumber == packingNumber &&
-								r.batch == batch
+								r.batch == batch&&
+								r.fromLocationCode == result.fromLocationCode
 						})
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
-						} else {
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
 							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);