diff --git a/apps/hand-factory/api/wms/coil.js b/apps/hand-factory/api/wms/coil.js index 1cd2cde..7ab2866 100644 --- a/apps/hand-factory/api/wms/coil.js +++ b/apps/hand-factory/api/wms/coil.js @@ -68,3 +68,10 @@ export function getMaterialCoilTrace(enterCoilNo, currentCoilNo) { } }) } + +export function exportCoil(coilId) { + return request({ + url: '/wms/materialCoil/exportCoil/' + coilId, + method: 'get' + }) +} diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js index 70fa851..a89ed1f 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.16", + version: "1.3.17", // 应用logo logo: "/static/logo.jpg", // 官方网站 diff --git a/apps/hand-factory/manifest.json b/apps/hand-factory/manifest.json index da96701..aae9066 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.16", + "versionName" : "1.3.17", "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 f7cd6f0..97905b2 100644 --- a/apps/hand-factory/pages/easycode/easycode.vue +++ b/apps/hand-factory/pages/easycode/easycode.vue @@ -122,7 +122,8 @@ getMaterialCoil, updateMaterialCoilSimple, listMaterialCoil, - updateMaterialCoil + updateMaterialCoil, + exportCoil } from '@/api/wms/coil.js' import { addPendingAction @@ -400,11 +401,13 @@ showCancel: true, success: async () => { try { + // 判断钢卷的质量状态,必须是A+, A,A-, B+其中之一 + if (!['A+', 'A', 'A-', 'B+'].includes(coilRes.data.qualityStatus)) { + this.$message.warning('钢卷质量状态需在B+及以上'); + return; + } // 1. 更新钢卷状态为已发货 - await updateMaterialCoilSimple({ - ...coilRes.data, - status: 1, - }); + await exportCoil(coilRes.data.coilId); // 2. 插入一条已完成的待操作记录 await addPendingAction({ diff --git a/apps/hand-factory/pages/easycode/editby.vue b/apps/hand-factory/pages/easycode/editby.vue index 1eb2921..c010f0c 100644 --- a/apps/hand-factory/pages/easycode/editby.vue +++ b/apps/hand-factory/pages/easycode/editby.vue @@ -61,6 +61,13 @@ + + + + 长度 (米) + + diff --git a/apps/hand-factory/pages/receive/receive.vue b/apps/hand-factory/pages/receive/receive.vue index ff3d1a8..bb3c11c 100644 --- a/apps/hand-factory/pages/receive/receive.vue +++ b/apps/hand-factory/pages/receive/receive.vue @@ -97,6 +97,13 @@ + + + + 长度 (米) + + diff --git a/apps/hand-factory/version.json b/apps/hand-factory/version.json index ab46915..99bf24f 100644 --- a/apps/hand-factory/version.json +++ b/apps/hand-factory/version.json @@ -1,5 +1,5 @@ { - "version": "klp 1.3.16", + "version": "klp 1.3.17", "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