From 2ff626ac13e8fb1849845bb01d0db021e2a4bbe9 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 4 Jul 2024 19:18:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=89=AB=E6=8F=8F=E5=85=B6=E4=BB=96=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E9=80=89=E4=B8=8D=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/coms/comScanDeliverPack.vue    |  2 +-
 .../productionReturn/coms/comScanReturnPack.vue  |  8 ++++----
 src/pages/stockUp/coms/comScanStockUpPack.vue    | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index 2b30bafa..c0e522eb 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -342,7 +342,7 @@
 								)
 							}
 						} else {
-							if (this.jobContent.AllowModifyBatch == null) {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发货明细,是否要继续发货?', res => {
 										if (res) {
diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue
index 2f11c595..3e3b0115 100644
--- a/src/pages/productionReturn/coms/comScanReturnPack.vue
+++ b/src/pages/productionReturn/coms/comScanReturnPack.vue
@@ -321,11 +321,11 @@
 								)
 							}
 						} else {
-							if (this.jobContent.AllowModifyBatch == null) {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发料明细,是否要继续发料?', res => {
 										if (res) {
-											let batch = that.createBatchInfo(label, balance);
+											let batch = that.createBatchInfo(label, balance,packageInfo);
 											fromLocation.Batchs.unshift(batch);
 										}
 									})
@@ -352,7 +352,7 @@
 				}
 			},
 
-			createBatchInfo(data, balance) {
+			createBatchInfo(data, balance,packageInfo) {
 				let batch = {
 					batch: data.lot,
 					qty: 0,
@@ -360,7 +360,7 @@
 					handleQty: Number(data.qty),
 					Records: []
 				}
-				let record = this.creatRecord(data, balance);
+				let record = this.creatRecord(data, balance,packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				return batch;
diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue
index 6e2942e8..4f09dcbf 100644
--- a/src/pages/stockUp/coms/comScanStockUpPack.vue
+++ b/src/pages/stockUp/coms/comScanStockUpPack.vue
@@ -279,13 +279,13 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 										this.showBalanceSelect(balanceRes.data.list, packageInfo);
 									}
 								} else {
-									this.showErrorMessage(balanceRes.message.message);
+									this.showErrorMessage(balanceRes.message);
 								}
 								uni.hideLoading();
 							});
 					}
-				} catch (e) {
-					this.showErrorMessage(e.stack)
+				} catch (error) {
+					this.showErrorMessage(error)
 					uni.hideLoading();
 				}
 			},
@@ -340,11 +340,11 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 								)
 							}
 						} else {
-							if (this.jobContent.AllowModifyBatch == null) {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发货明细,是否要继续发货?', res => {
 										if (res) {
-											let batch = that.createBatchInfo(label, balance);
+											let batch = that.createBatchInfo(label, balance,packageInfo);
 											fromLocation.Batchs.unshift(batch);
 										}
 									})
@@ -371,15 +371,15 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 				}
 			},
 
-			createBatchInfo(data, balance) {
+			createBatchInfo(data, balance,packageInfo) {
 				let batch = {
-					batch: data.lot,
+					batch: data.batch,
 					qty: 0,
 					uom: data.uom,
 					handleQty: Number(data.qty),
 					Records: []
 				}
-				let record = this.creatRecord(data, balance);
+				let record = this.creatRecord(data, balance,packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				return batch;