From 448a09150484313491ee41e6c99f6d7e990b886b Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 9 Sep 2024 15:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8F=90=E4=BA=A4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/package/job/overPackageJob.vue      |  2 +-
 .../package/job/overPackageJobDetail.vue      | 31 ++++++-------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue
index 5ba2e277..8bf8fee0 100644
--- a/src/pages/package/job/overPackageJob.vue
+++ b/src/pages/package/job/overPackageJob.vue
@@ -162,7 +162,7 @@
 						this.businessType = res.businessType;
 						this.openScanPopup();
 					} else {
-						this.showErrorMessage(res.message)
+						this.showMessage(res.message)
 					}
 				});
 			},
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index d42813db..0e3ddcec 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -401,7 +401,9 @@
 					mask: true
 				});
 				var params = this.setParams()
-				console.log(params);
+				
+				console.log("提交参数"+JSON.stringify(params));
+				return
 				overPageSubmit(params).then(res => {
 					uni.hideLoading()
 					// if (res.data == '打印任务已发送，等待打印机处理！') {
@@ -492,28 +494,15 @@
 
 											record.toBatch = r.batch;
 											record.toPackingNumber = ""
-
-											//使用在途库不改变管理模式
-											// if (this.jobContent
-											// 	.useOnTheWayLocation ==
-											// 	'TRUE') {
-											// 	record.toPackingNumber = r
-											// 		.packingNumber;
-											// 	record.toBatch = r.batch;
-											// } else {
-											// 	var info =
-											// 		getPackingNumberAndBatch(
-											// 			this.managementList, r
-											// 			.itemCode,
-											// 			r.packingNumber, r
-											// 			.batch);
-											// 	record.toPackingNumber = info
-											// 		.packingNumber;
-											// 	record.toBatch = info.batch;
-											// }
 											subItem.recordList.push(record);
 										})
-										subList.push(deepCopyData(subItem));
+										
+										var itemInfo = subList.find(r => r.itemCode == subItem.itemCode&& r.fromLocationCode == subItem.fromLocationCode);
+										if(itemInfo){
+											itemInfo.recordList.push(...subItem.recordList)
+										}else {
+											subList.push(deepCopyData(subItem));
+										}
 									}
 								}
 							})