检验任务上传添加user,username, gxno，去除token获取失败的调试弹窗

pages/work/download/DownloadList.uvue

@@ -211,7 +211,7 @@
 		return
 	}
 	
-    await downloadDataFromAPI(productNo.value, () => {
+    await downloadDataFromAPI(productNo.value, () => {	
       // 回调函数中执行刷新，确保数据都保存好，进度条跑完
       uni.reLaunch({ url: '/pages/work/download/DownloadList' })
     }).then((res) => {
@@ -227,13 +227,12 @@
 		});
 		return
 	}
-	
     console.log("开始上传...")
     uploadDataToAPI(e.gxpk, () => {
-	  
+		uni.reLaunch({ url: '/pages/work/download/DownloadList' })
 	}).then((res) => {
 	  // 移除这里的刷新逻辑，避免过早刷新
-		uni.reLaunch({ url: '/pages/work/download/DownloadList' })
+		
 	})
 
   }

pages/work/record/InfoList.uvue

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

utils/auth.uts

@@ -62,9 +62,9 @@ export function getTokenFromApi() : Promise<string> {
 			},
 			fail: (err) => {
 				uni.hideLoading()
-				uni.showModal({
-					content: '获取Token失败:' + err.errMsg 
-				})
+				// uni.showModal({
+				// 	content: '获取Token失败:' + err.errMsg 
+				// })
 				resolve("");
 			},
 		})

utils/qcDataProcessor.uts

@@ -1,4 +1,4 @@
-import { getToken, getTokenFromApi } from './auth'
+import { getToken, getTokenFromApi, getCurrentUserNameSync, getCurrentUserSync } from './auth'
 import { saveTaskInfo, saveTaskPhoto, saveTaskKeyProcess, saveTaskRecord, saveTaskRecordItem, getLatestTask, removeTaskAndRecord, getList, updateData } from '@/api/work'
 import { globalConfig } from '@/config'
 
@@ -25,6 +25,9 @@ export type AppTaskInfo = {
 	qcrecord ?: AppTaskRecord;
 	photolist ?: AppTaskPhoto[];
 	keyprocesslist ?: AppTaskKeyProcess[];
+	username ?: string;
+	user ?: string;
+	gxno ?: string;
 }
 
 export type AppTaskRecord = {
@@ -215,14 +218,14 @@ export const downloadDataFromAPI = async (gxpk : string, callback ?: () => void)
 		const infoJson = await getLatestTask(gxpk, null);
 		if (infoJson?.['data'] != null) {
 			let info = infoJson?.['data'] as UTSJSONObject ?? {} as UTSJSONObject
-			// let ingNum = parseInt(info?.['pdid'] as string);
+			let ingNum = parseInt(info?.['pdid'] as string);
 			//覆盖标识位
 			let overwiteFlag = ref(false);
 			// 先检查是否有任务正在执行中
-			// if (info != null && ingNum > 0) {
-			// 	uni.showToast({ title: `当前产品号已有任务在执行中！`, icon: 'error' });
-			// 	return false;
-			// }
+			if (info != null && ingNum > 0) {
+				uni.showToast({ title: `当前产品号已有任务在执行中！`, icon: 'error' });
+				return false;
+			}
 			// 使用Promise来处理异步流程
 			let deleteDataPromise = new Promise<boolean>((resolve) => {
 				// if (info != null && ingNum == 0) {
@@ -361,8 +364,8 @@ export const downloadDataFromAPI = async (gxpk : string, callback ?: () => void)
 						
 						//保存检验记录
 						let recordObj = taskInfo?.['qcrecord'] as (UTSJSONObject | null);
-						console.log('------------------------------>');
-						console.log(recordObj);
+						// console.log('------------------------------>');
+						// console.log(recordObj);
 						if (recordObj != null) {
 							recordObj['pdid'] = lastId;
 							let recordItemList = recordObj?.['items'] as UTSJSONObject[] ?? Array<UTSJSONObject>();
@@ -472,7 +475,8 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
 				uni.showToast({ title: '未获取到数据', icon: 'error' });
 				return false;
 			}
-
+			console.log('--------------------->')
+			console.log(taskInfoJson)
 			uni.showLoading({ title: `开始上传数据`});
 			let taskInfo = JSON.parse<Task>(taskInfoJson.toJSONString());
 			let canContinueFlag = true;
@@ -734,6 +738,9 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
 
 			taskInfoJson.set('photolist', Array<UTSJSONObject>())
 			taskInfoJson.set('lastupdatetime', null)
+			taskInfoJson.set('user', getCurrentUserNameSync())
+			taskInfoJson.set('username', getCurrentUserSync())
+			
 
 
 			//1.填充关键工序数据