|
@@ -467,11 +467,11 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
|
|
|
uni.showToast({ title: '未获取到数据', icon: 'error' });
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
let taskInfo = JSON.parse<Task>(taskInfoJson.toJSONString());
|
|
|
let canContinueFlag = true;
|
|
|
-
|
|
|
+
|
|
|
// 1. 收集所有需要上传的图片
|
|
|
let res = await getList('app_task_photo', 'pdid', taskInfo?.pdid.toString(), 'uploadFlag', '0', null)
|
|
|
let dataList = res?.['data'] as UTSJSONObject[] ?? Array<UTSJSONObject>()
|
|
@@ -700,43 +700,38 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
|
|
|
// 5. 显示总结信息
|
|
|
const finalFailedCount = retryImages.length;
|
|
|
console.log(`上传总结: 总共${totalImages}张图片, 成功${successCount}张, 失败${finalFailedCount}张`);
|
|
|
-
|
|
|
- uni.hideLoading();
|
|
|
-
|
|
|
+
|
|
|
// 三次重试后如果仍有失败的图片,显示提示
|
|
|
if (finalFailedCount > 0) {
|
|
|
+ uni.hideLoading();
|
|
|
uni.showModal({
|
|
|
title: '上传提示',
|
|
|
content: `总共需要上传${totalImages}张图片,成功${successCount}张,失败${finalFailedCount}张。\n经过${maxRetries}次重试后,仍有${finalFailedCount}张图片上传失败,请检查网络后重新上传。`,
|
|
|
showCancel: false
|
|
|
});
|
|
|
- } else {
|
|
|
- uni.showToast({
|
|
|
- title: `上传完成!共${totalImages}张图片,全部成功。`,
|
|
|
- icon: 'success'
|
|
|
- });
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (callback != null) {
|
|
|
callback();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (finalFailedCount > 0) {
|
|
|
canContinueFlag = false
|
|
|
}
|
|
|
- return finalFailedCount === 0;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ //执行照片上传以外的逻辑
|
|
|
if (!canContinueFlag) {
|
|
|
uni.showToast({
|
|
|
title: `图片上传失败,请重新上传`,
|
|
|
icon: 'error'
|
|
|
});
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
taskInfoJson.set('photolist', Array<UTSJSONObject>())
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+ console.log('11111111111111111111')
|
|
|
+
|
|
|
//1.填充关键工序数据
|
|
|
let keyRes = await getList('app_task_keyprocess', 'pdid', taskInfo?.pdid.toString(), null, null, null)
|
|
|
let keyList = keyRes?.['data'] as UTSJSONObject[] ?? Array<UTSJSONObject>()
|
|
@@ -744,20 +739,20 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
|
|
|
let keyObjectList = [] as AppTaskKeyProcess[]
|
|
|
keyList.forEach(item => {
|
|
|
let keyObject = JSON.parse<AppTaskKeyProcess>(item.toJSONString());
|
|
|
- if (keyObject != null){
|
|
|
+ if (keyObject != null) {
|
|
|
keyObjectList.push(keyObject)
|
|
|
}
|
|
|
})
|
|
|
taskInfoJson.set('keyprocesslist', keyObjectList)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//2.填充检验任务数据
|
|
|
let qcRecoerdRes = await getList('app_task_record', 'pdid', taskInfo?.pdid.toString(), null, null, null)
|
|
|
let qcRecordList = qcRecoerdRes?.['data'] as UTSJSONObject[] ?? Array<UTSJSONObject>()
|
|
|
if (qcRecordList != null && qcRecordList.length > 0) {
|
|
|
let qcRecordJson = qcRecordList[0]
|
|
|
let sxid = qcRecordJson.getString("sxid")
|
|
|
-
|
|
|
+
|
|
|
// 3.填充检验任务item 数据据
|
|
|
let qcRecoerdItemRes = await getList('app_task_record_item', 'psxid', sxid, null, null, null)
|
|
|
let qcRecordItemList = qcRecoerdItemRes?.['data'] as UTSJSONObject[] ?? Array<UTSJSONObject>()
|
|
@@ -765,7 +760,7 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
|
|
|
let itemList = [] as AppTaskRecordItem[]
|
|
|
qcRecordItemList.forEach(item => {
|
|
|
let itemObj = JSON.parse<AppTaskRecordItem>(item.toJSONString());
|
|
|
- if (itemObj != null){
|
|
|
+ if (itemObj != null) {
|
|
|
itemList.push(itemObj)
|
|
|
}
|
|
|
})
|
|
@@ -774,24 +769,34 @@ export const uploadDataToAPI = async (gxpk : string, callback ?: () => void) : P
|
|
|
let qcRecord = JSON.parse<AppTaskRecord>(qcRecordJson.toJSONString());
|
|
|
taskInfoJson.set("qcrecord", qcRecord)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
let requestTask = JSON.parse<AppTaskInfo>(taskInfoJson.toJSONString());
|
|
|
console.log("请求体:", requestTask)
|
|
|
-
|
|
|
- // const requestResult = await new Promise<UTSJSONObject>((resolve, reject) => {
|
|
|
- // uni.request({
|
|
|
- // url: `${globalConfig.uploadTaskURL}`,
|
|
|
- // method: 'POST',
|
|
|
- // header: {
|
|
|
- // 'token': apiToken
|
|
|
- // },
|
|
|
- // success: (res) => resolve(res?.['data'] as UTSJSONObject ?? {} as UTSJSONObject),
|
|
|
- // fail: (err) => reject(err)
|
|
|
- // });
|
|
|
- // });
|
|
|
+
|
|
|
+ const requestResult = await new Promise<UTSJSONObject>((resolve, reject) => {
|
|
|
+ uni.request({
|
|
|
+ url: `${globalConfig.uploadTaskURL}`,
|
|
|
+ method: 'POST',
|
|
|
+ header: {
|
|
|
+ 'token': apiToken
|
|
|
+ },
|
|
|
+ data: {
|
|
|
+ request: requestTask
|
|
|
+ },
|
|
|
+ success: (res) => resolve(res?.['data'] as UTSJSONObject ?? {} as UTSJSONObject),
|
|
|
+ fail: (err) => reject(err)
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
+ console.log(requestResult)
|
|
|
+
|
|
|
+ uni.showToast({
|
|
|
+ title: `上传成功`,
|
|
|
+ icon: 'success'
|
|
|
+ });
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
|
|
|
return true;
|
|
|
} catch (error) {
|