Parcourir la source

检验任务和声像记录 添加上传时间

zhangxike il y a 6 jours
Parent
commit
caa0d0cc40

+ 2 - 3
pages/work/download/DownloadList.uvue

@@ -230,11 +230,10 @@
 	
     console.log("开始上传...")
     uploadDataToAPI(e.gxpk, () => {
-	  // 回调函数中执行刷新,确保数据都保存好,进度条跑完
-	  uni.reLaunch({ url: '/pages/work/download/DownloadList' })
+	  
 	}).then((res) => {
 	  // 移除这里的刷新逻辑,避免过早刷新
-	  // 处理断点续传
+		uni.reLaunch({ url: '/pages/work/download/DownloadList' })
 	})
 
   }

+ 2 - 2
pages/work/record/InfoList.uvue

@@ -225,10 +225,10 @@
 		console.log("开始上传...")
 		uploadDataToAPI(e.productno, () => {
 			// 回调函数中执行刷新,确保数据都保存好,进度条跑完
-			uni.reLaunch({ url: '/pages/work/record/InfoList' })
+
 		}).then((res) => {
 			// 移除这里的刷新逻辑,避免过早刷新
-			// 处理断点续传
+			uni.reLaunch({ url: '/pages/work/record/InfoList' })
 		})
 
 	}

+ 1 - 1
utils/dataProcessor.uts

@@ -674,7 +674,7 @@ export const uploadDataToAPI = async (productCode : string, callback ?: () => vo
 		}
 
 		if (finalFailedCount === 0) {
-			let updatedData = " uploadFlag = 1 "
+			let updatedData = " uploadFlag = 1, uploadtime = strftime('%Y-%m-%d %H:%M:%S', 'now', 'localtime') "
 			updateData('app_media_info', updatedData, 'productno', productCode).then((res : UTSJSONObject) => {
 				console.log(`更新完上传标识 ${productCode}`)
 			});

+ 4 - 4
utils/qcDataProcessor.uts

@@ -733,8 +733,8 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
 			}
 
 			taskInfoJson.set('photolist', Array<UTSJSONObject>())
+			taskInfoJson.set('lastupdatetime', null)
 
-			console.log('11111111111111111111')
 
 			//1.填充关键工序数据
 			let keyRes = await getList('app_task_keyprocess', 'pdid', taskInfo?.pdid.toString(), null, null, null)
@@ -792,17 +792,17 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
 				});
 			});
 
-
+		
 			// 检查返回的code值
 			const code = requestResult?.['code'] as number;
 			if (code === 666) {
-				let updatedData = " uploadFlag = 1 "
+				let updatedData = " uploadFlag = 1, uploadtime = strftime('%Y-%m-%d %H:%M:%S', 'now', 'localtime') "
 				updateData('app_task_info', updatedData, 'pdid', taskInfo?.pdid.toString()).then((res : UTSJSONObject) => {
 					console.log(`更新检验任务记录的上传标识 ${taskInfo?.pdid.toString()}`)
 				});
 				uni.showToast({
 					title: `上传成功`,
-					icon: ''
+					icon: 'success'
 				});
 			} else {
 				const errorMsg = requestResult?.['msg'] as string ?? '未知错误';