From dcc474f5237da481b5bebdcc722354952e86387f Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 7 Aug 2024 16:22:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/coms/comScanDeliverPack.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index 244a093f..f8c6bec3 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -316,12 +316,15 @@
 								detail:{
 									...packageInfo,
 									fromLocationCode: balance.locationCode,
+									toLocationCode:this.toLocationCode
 								},
 								handleQty: 0,
-								packingNumber: label.packingNumber,
+								packingNumber: null,
+								// packingNumber: label.packingNumber,
 								qty: label.qty,
 								uom: label.uom
 							}],
+							toLocationCode:this.toLocationCode,
 							fromLocationCode: balance.locationCode,
 							handleQty: 0,
 							qty: label.qty,

From c534b06d4cb57d94193bcf0d8eb16d7236217ee0 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 7 Aug 2024 16:27:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8D=95=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pointPutawayJob/index.vue | 39 ++++++++++++++++-------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 431e8328..84cd1655 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -280,24 +280,29 @@
 		},
 		async onShow() {
 			// 获取上架指引单
-			await getJimuPutawayJobDetail({
-				masterIds: this.data.ids
-			}).then(res => {
-				this.data.sublist = res.data
-				this.getTableSubList()
-			})
+			if(this.data.ids){
+				await getJimuPutawayJobDetail({
+					masterIds: this.data.ids
+				}).then(res => {
+					this.data.sublist = res.data
+					this.getTableSubList()
+				})
+			}
 			// 获取采购收货指引单
-			await queryInspectionFreeFlag({
-				number: this.number
-			}).then(async res1 => {
-				this.data1 = res1.data
-				this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0)
-				// this.data1.inspectDTOList=[]
-				if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){
-					this.tabIndex =2
-				}
-				this.getTableInspectDTOList()
-			})
+			if(this.number){
+				await queryInspectionFreeFlag({
+					number: this.number
+				}).then(async res1 => {
+					this.data1 = res1.data
+					this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0)
+					// this.data1.inspectDTOList=[]
+					if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){
+						this.tabIndex =2
+					}
+					this.getTableInspectDTOList()
+				})
+			}
+			
 			this.getPointPutawayJobHtml()
 			this.getPurchaseReceiptJobHtml()
 		},