diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js index a89ed1f..2c45be8 100644 --- a/apps/hand-factory/config.js +++ b/apps/hand-factory/config.js @@ -8,7 +8,7 @@ module.exports = { // 应用名称 name: "ruoyi-app", // 应用版本 - version: "1.3.17", + version: "1.3.18", // 应用logo logo: "/static/logo.jpg", // 官方网站 diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json index aae9066..a72cf66 100644 --- a/apps/hand-factory/manifest.json +++ b/apps/hand-factory/manifest.json @@ -2,7 +2,7 @@ "name" : "科伦普", "appid" : "__UNI__E781B49", "description" : "", - "versionName" : "1.3.17", + "versionName" : "1.3.18", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/apps/hand-factory/pages/easycode/easycode.vue b/apps/hand-factory/pages/easycode/easycode.vue index 97905b2..520fee7 100644 --- a/apps/hand-factory/pages/easycode/easycode.vue +++ b/apps/hand-factory/pages/easycode/easycode.vue @@ -399,7 +399,15 @@ confirmText: '确认', title: '确定要将钢卷号为:' + coilRes.data.currentCoilNo + '发货吗?', showCancel: true, - success: async () => { + success: async (res) => { + console.log(res) + if (res.cancel) { + uni.showToast({ + title: '已取消发货', + icon: 'none' + }) + return; + } try { // 判断钢卷的质量状态,必须是A+, A,A-, B+其中之一 if (!['A+', 'A', 'A-', 'B+'].includes(coilRes.data.qualityStatus)) { @@ -407,22 +415,22 @@ return; } // 1. 更新钢卷状态为已发货 - await exportCoil(coilRes.data.coilId); + // await exportCoil(coilRes.data.coilId); // 2. 插入一条已完成的待操作记录 - await addPendingAction({ - coilId: coilRes.data.coilId, - currentCoilNo: coilRes.data.currentCoilNo, - actionType: 402, // 402=发货 - actionStatus: 2, // 直接标记为完成状态 - scanTime: new Date(), - scanDevice: this.getDeviceInfo(), - priority: 0, // 0=普通 - sourceType: 'scan', - warehouseId: coilRes.data.warehouseId, - processTime: new Date(), - completeTime: new Date() - }); + // await addPendingAction({ + // coilId: coilRes.data.coilId, + // currentCoilNo: coilRes.data.currentCoilNo, + // actionType: 402, // 402=发货 + // actionStatus: 2, // 直接标记为完成状态 + // scanTime: new Date(), + // scanDevice: this.getDeviceInfo(), + // priority: 0, // 0=普通 + // sourceType: 'scan', + // warehouseId: coilRes.data.warehouseId, + // processTime: new Date(), + // completeTime: new Date() + // }); uni.showToast({ title: '发货成功', diff --git a/apps/hand-factory/utils/update.js b/apps/hand-factory/utils/update.js index f504c2e..aa6f465 100644 --- a/apps/hand-factory/utils/update.js +++ b/apps/hand-factory/utils/update.js @@ -73,7 +73,7 @@ function checkStorageSpace() { function checkUpdate(forceCheck = false) { // 1. 准备本地版本信息 const localVersion = plus.runtime.version; // 基座版本 - const staticVersion = '1.0.0'; // 静态默认版本 + const staticVersion = '1.3.18'; // 静态默认版本 const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本(从存储获取或用默认) const currentVersion = compareVersion(localWgtVersion, localVersion) > 0 ? localWgtVersion @@ -151,24 +151,24 @@ function checkUpdate(forceCheck = false) { // 显示更新提示模态框 function showUpdateModal(remoteVersion, wgtUrl) { - // uni.showModal({ - // title: '发现新版本', - // content: `检测到新版本(${remoteVersion}),是否立即下载并更新?`, - // confirmText: '立即更新', - // cancelText: '退出', - // showCancel: true, - // success: (modalRes) => { - // if (modalRes.confirm) { - // // 用户确认更新:检查存储空间 -> 下载 -> 安装 - // handleConfirmUpdate(wgtUrl, remoteVersion); - // } else { - // // 直接退出 + uni.showModal({ + title: '发现新版本', + content: `检测到新版本(${remoteVersion}),是否立即下载并更新?`, + confirmText: '立即更新', + cancelText: '暂不更新', + showCancel: true, + success: (modalRes) => { + if (modalRes.confirm) { + // 用户确认更新:检查存储空间 -> 下载 -> 安装 + handleConfirmUpdate(wgtUrl, remoteVersion); + } else { + // 直接退出 - // // 用户取消更新:询问是否忽略该版本 - // handleCancelUpdate(remoteVersion); - // } - // } - // }); + // 用户取消更新:询问是否忽略该版本 + // handleCancelUpdate(remoteVersion); + } + } + }); } diff --git a/apps/hand-factory/version.json b/apps/hand-factory/version.json index 99bf24f..50ca49d 100644 --- a/apps/hand-factory/version.json +++ b/apps/hand-factory/version.json @@ -1,5 +1,5 @@ { - "version": "klp 1.3.17", + "version": "klp 1.3.18", "wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt", "apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk" } \ No newline at end of file