Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

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,

src/pages/pointPutawayJob/index.vue

@@ -280,13 +280,16 @@
 		},
 		async onShow() {
 			// 获取上架指引单
+			if(this.data.ids){
 				await getJimuPutawayJobDetail({
 					masterIds: this.data.ids
 				}).then(res => {
 					this.data.sublist = res.data
 					this.getTableSubList()
 				})
+			}
 			// 获取采购收货指引单
+			if(this.number){
 				await queryInspectionFreeFlag({
 					number: this.number
 				}).then(async res1 => {
@@ -298,6 +301,8 @@
 					}
 					this.getTableInspectDTOList()
 				})
+			}
+			
 			this.getPointPutawayJobHtml()
 			this.getPurchaseReceiptJobHtml()
 		},