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

src/pages/fg/receiptNoPlan.vue

@@ -395,12 +395,22 @@
 
 			calcFgQty() {
 				this.dataContent.handleQty = this.showList.length;
-				if (this.dataContent.handleQty == this.dataContent.packQty) {
+				if(parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty) <= parseFloat(this.dataContent.packQty)){
+					if(parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty)){
 						if (this.$refs.scanPopup) {
 							this.$refs.scanPopup.closeScanPopup();
 						}
 						this.commit()
 					}
+				}else{
+					if (parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.packQty)) {
+						if (this.$refs.scanPopup) {
+							this.$refs.scanPopup.closeScanPopup();
+						}
+						this.commit()
+					}
+				}
+				
 			},
 
 			scanPopupGetFocus() {
@@ -416,15 +426,22 @@
 			getH5BatchPrintingLable( number) {
 				let _this = this
 				batchPrintingLable(number).then(resLable => {
-					console.log('batchPrintingLable', resLable)
 					const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
 					const webData = {
 						token: storage.getStorage(storage.constant.token),
 						asn_number: resLable.data
 					}
+					
+					if ( this.scanedQty + this.showList.length == this.dataContent.planQty) {
+						uni.redirectTo({
+							url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+						});
+					}else{
 						uni.navigateTo({
 							url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
 						});
+					}
+					
 				})
 			},			
 

src/pages/putaway/record/putawayRecord.vue

@@ -410,6 +410,7 @@
 
 							submitItem.fromLocationCode = detail.locationCode;
 							submitItem.toLocationCode = detail.toLocationCode;
+							submitItem.itemName = item.itemName;
 
 							// detail.toInventoryStatus = detail.inventoryStatus
 							// detail.toLocationCode = detail.toLocationCode

src/pages/repleinsh/job/repleinshDetail.vue

@@ -189,10 +189,6 @@
 							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.toLocationCode = that.subList[0].toLocationCode
-							that.subList[0].itemCode ="255.707-01"
-							that.subList[0].fromLocationCode ="S12-01-1"
-							that.subList[0].batch ="20240728" 
-							that.jobContent.allowModifyLocation="TRUE"
 							
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.detailSource, that.subList)
@@ -340,17 +336,17 @@
 					return
 				}
 				console.log("提交参数", JSON.stringify(params));
-				// repleinshJobSubmit(params).then(res => {
+				repleinshJobSubmit(params).then(res => {
-				// 	uni.hideLoading()
+					uni.hideLoading()
-				// 	if (res.data) {
+					if (res.data) {
-				// 		this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data)
+						this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data)
-				// 	} else {
+					} else {
-				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+						this.showErrorMessage("提交失败[" + res.msg + "]")
-				// 	}
+					}
-				// }).catch(error => {
+				}).catch(error => {
-				// 	uni.hideLoading()
+					uni.hideLoading()
-				// 	this.showErrorMessage(error)
+					this.showErrorMessage(error)
-				// })
+				})
 			},
 
 			setParams() {