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

src/manifest.json

@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.68",
+    "versionName" : "1.0.69",
-    "versionCode" : 68,
+    "versionCode" : 69,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/mycomponents/scan/winScanButton.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="scan_float" @click="goScan('bottom')">
+		<view class="scan_float" ref="scanRef" @click="goScan('bottom')" @touchstart="handleTouchStart" @touchmove.prevent="handleTouchMove">
 			<image src="@/static/icons_ui/icon_scan_white.svg"></image>
 			<view>扫描</view>
 		</view>
@@ -19,7 +19,9 @@
 				old: {
 					x: 0,
 					y: 0
-				}
+				},
+				btnX:20,
+				btnY:20,
 			}
 		},
 		props: {
@@ -30,6 +32,16 @@
 
 		},
 		methods: {
+			handleTouchStart(e) {
+				this.btnX = e.changedTouches[0].clientX-e.currentTarget.offsetLeft
+				this.btnY = e.changedTouches[0].clientY-e.currentTarget.offsetTop
+			},
+			handleTouchMove(e) {
+				console.log("handleTouchMove",e);
+				this.$refs.scanRef.$el.style.left = e.changedTouches[0].clientX-this.btnX+'px'
+				this.$refs.scanRef.$el.style.top = e.changedTouches[0].clientY-this.btnY+'px'		
+			},
+
 			goScan(content) {
 				this.$emit("goScan", '');
 			},

src/pages/fg/receiptByPlan.vue

@@ -275,43 +275,30 @@
 					console.log(JSON.stringify(params))
 
 					let list = []
-					try {
+					var planData = await planReceiptSubmit(params)
-						var planData = await planReceiptSubmit(params)
+					console.log('planData', planData)
-						console.log('planData', planData)
+					if (planData.data && planData.data.length > 0) {
-						if (planData.data) {
+						planData.data.forEach(item => {
-
+							list.push({
-							planData.data.forEach(item => {
+								itemCode: item.itemCode, // 物品代码
-								list.push({
+								itemName: item.itemName, // 物品名称
-									itemCode: item.itemCode, // 物品代码
+								packName: item.packName, // 包装名称
-									itemName: item.itemName, // 物品名称
+								packageCode: item.toPackingNumber, // 包装号
-									packName: item.packName, // 包装名称
+								batch: item.toBatch, //批次
-									packageCode: item.toPackingNumber, // 包装号
+								parentNumber: item.parentNumber, //父包装号
-									batch: item.toBatch, //批次
+								itemType: item.itemType, //物料类型
-									parentNumber: item.parentNumber, //父包装号
+								asnNumber: item.asnNumber, //ASN
-									itemType: item.itemType, //物料类型
+								supplierCode: item.supplierCode, // 供应商
-									asnNumber: item.asnNumber, //ASN
+								qty: item.qty, // 数量
-									supplierCode: item.supplierCode, // 供应商
+								printTimes: getCurrDateTime(), // 打印时间
-									qty: item.qty, // 数量
+								productionLineCode: item.productionLineCode, //生产线
-									printTimes: getCurrDateTime(), // 打印时间
+								barcodeString: item.barcodeString, // 标签信息
-									productionLineCode: item.productionLineCode, //生产线
+								barcodeBase64: '',
-									barcodeString: item.barcodeString, // 标签信息
+								requestNumber: item.requestNumber
-									barcodeBase64: '',
-									requestNumber: item.requestNumber
-								})
 							})
-						} else {
+						})
-							throw new Error("提交失败")
+					} else {
-						}
+						throw new Error("提交失败")
-					} catch (error) {
-						console.log('异常', error)
-						if (error.indexOf('请返回开工阶段') > -1) {
-							uni.hideLoading()
-							this.showErrorMessage('计划已完成')
-							this.clearData()
-							this.openFg();
-							return
-						}
-
 					}
 
 					//装配收货记录 生成后 创建 制品上架申请
@@ -324,15 +311,17 @@
 					// }
 					//创建上架申请和检验申请
 					if (createProductputawaySwitch) {
-						createPutawayRequestByPlan(list[0].requestNumber).then(res => {
+						if (list.length > 0 && list[0].requestNumber) {
-							createInspectRequestByPlan(list[0].requestNumber)
+							createPutawayRequestByPlan(list[0].requestNumber).then(res => {
-						})
+								createInspectRequestByPlan(list[0].requestNumber)
+							})
+						}
 					} else { //创建检验申请
-						createInspectRequestByPlan(list[0].requestNumber)
+						if (list.length > 0 && list[0].requestNumber) {
+							createInspectRequestByPlan(list[0].requestNumber)
+						}
 					}
 
-
-
 					var queryParams = {
 						filters: [{
 							column: "number",
@@ -375,15 +364,24 @@
 						this.index = 1;
 						this.dataContent.handleQty = 0;
 					}
-
+					var hintMsg ="提交成功\n生成装配收货记录\n";
+					if(list.length>0&&list[0].requestNumber){
+						hintMsg += list[0].requestNumber
+					}
 					nextTick(() => {
-						this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list)
+						this.showCommitSuccessMessage(hintMsg, list)
 					})
 
 				} catch (error) {
 					uni.hideLoading()
 					var hint = error.message ? error.message : error
-					this.showErrorMessage(hint)
+					if (hint.indexOf('请返回开工阶段') > -1) {
+						this.showErrorMessage('计划已完成')
+						this.clearData()
+						this.openFg();
+					} else {
+						this.showErrorMessage(hint)
+					}
 				}
 
 			},
@@ -490,7 +488,7 @@
 				batchPrintingLable(number).then(resLable => {
 					console.log('batchPrintingLable', resLable)
 					uni.hideLoading()
-					if(resLable.data){
+					if (resLable.data) {
 						const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
 						const webData = {
 							token: storage.getStorage(storage.constant.token),
@@ -499,8 +497,8 @@
 						uni.navigateTo({
 							url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
 						});
-					}else {
+					} else {
-						_this.showErrorMessage(number+"批量打印标签 H5失败")
+						_this.showErrorMessage(number + "批量打印标签 H5失败")
 					}
 				}).catch(error => {
 					uni.hideLoading()
@@ -527,22 +525,22 @@
 					return
 				}
 				uni.showLoading({
-					title:"正在获取打印信息",
+					title: "正在获取打印信息",
-					mask:true
+					mask: true
 				})
 				getBalanceToPackage({
 					packingNumber: packingNumber.join(',')
 				}).then(res => {
 					console.log('PC打印', res)
-					if(res.data&&res.data.number){
+					if (res.data && res.data.number) {
 						_this.getH5BatchPrintingLable(res.data.number)
-					}else {
+					} else {
 						uni.hideLoading()
-						var hint =""
+						var hint = ""
-						packingNumber.forEach(item=>{
+						packingNumber.forEach(item => {
-							hint+=item
+							hint += item
 						})
-						hint+"根据库存余额获取包装信息"
+						hint + "根据库存余额获取包装信息"
 						_this.showErrorMessage(hint)
 					}