diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js index 2c45be8..a41c69a 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.18", + version: "1.3.19", // 应用logo logo: "/static/logo.jpg", // 官方网站 diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json index a72cf66..aa554a6 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.18", + "versionName" : "1.3.19", "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 520fee7..a4cbfce 100644 --- a/apps/hand-factory/pages/easycode/easycode.vue +++ b/apps/hand-factory/pages/easycode/easycode.vue @@ -411,26 +411,29 @@ try { // 判断钢卷的质量状态,必须是A+, A,A-, B+其中之一 if (!['A+', 'A', 'A-', 'B+'].includes(coilRes.data.qualityStatus)) { - this.$message.warning('钢卷质量状态需在B+及以上'); + uni.showToast({ + title: '只能发货B+以上品质的钢卷', + icon: 'none' + }); 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 aa6f465..711eb2b 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.3.18'; // 静态默认版本 + const staticVersion = '1.3.19'; // 静态默认版本 const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本(从存储获取或用默认) const currentVersion = compareVersion(localWgtVersion, localVersion) > 0 ? localWgtVersion diff --git a/apps/hand-factory/version.json b/apps/hand-factory/version.json index 50ca49d..2431a27 100644 --- a/apps/hand-factory/version.json +++ b/apps/hand-factory/version.json @@ -1,5 +1,5 @@ { - "version": "klp 1.3.18", + "version": "klp 1.3.19", "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