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,24 +280,29 @@
 		},
 		async onShow() {
 			// 获取上架指引单
-			await getJimuPutawayJobDetail({
+			if(this.data.ids){
-				masterIds: this.data.ids
+				await getJimuPutawayJobDetail({
-			}).then(res => {
+					masterIds: this.data.ids
-				this.data.sublist = res.data
+				}).then(res => {
-				this.getTableSubList()
+					this.data.sublist = res.data
-			})
+					this.getTableSubList()
+				})
+			}
 			// 获取采购收货指引单
-			await queryInspectionFreeFlag({
+			if(this.number){
-				number: this.number
+				await queryInspectionFreeFlag({
-			}).then(async res1 => {
+					number: this.number
-				this.data1 = res1.data
+				}).then(async res1 => {
-				this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0)
+					this.data1 = res1.data
-				// this.data1.inspectDTOList=[]
+					this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0)
-				if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){
+					// this.data1.inspectDTOList=[]
-					this.tabIndex =2
+					if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){
-				}
+						this.tabIndex =2
-				this.getTableInspectDTOList()
+					}
-			})
+					this.getTableInspectDTOList()
+				})
+			}
+			
 			this.getPointPutawayJobHtml()
 			this.getPurchaseReceiptJobHtml()
 		},