From e33d89d190ec0fb33fca846b095b23c209471d62 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 5 Nov 2025 10:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=8F=AB=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- pages/zw/manual-callmater.vue | 6 +-- utils/getData4.js | 4 +- utils/mork2.js | 98 +++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 98e1947..ef10432 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # 注意事项 + 原生APP云打包使用自有证书 + 证书别名：testalias -+ 接口在线地址：(https://apifox.com/apidoc/shared-e9d4798e-2db1-493d-a0cb-7a0e881c4bd6/api-160097540) + app图标为lms -+ 接口在线地址：http://47.98.105.245:8001/project/21/interface/api/cat_122 \ No newline at end of file ++ 接口在线地址：(https://s.apifox.cn/9f222323-1b67-426d-856c-e4a4006fdbed/api-344691545) \ No newline at end of file diff --git a/pages/zw/manual-callmater.vue b/pages/zw/manual-callmater.vue index e311649..38f9b41 100644 --- a/pages/zw/manual-callmater.vue +++ b/pages/zw/manual-callmater.vue @@ -99,7 +99,7 @@ - + @@ -190,12 +190,12 @@ }, async _checkoutbillcallMaterial () { this.disabled = true - if (!this.index || !this.index2 || !this.currentData.material_code || !this.index4) { + if (!this.index2 || !this.index4 || JSON.stringify(this.currentData) === '{}') { this.disabled = false return } try { - let res = await checkoutbillcallMaterial(this.index2, this.index, this.currentData.material_code, this.index4, this.currentData.supp_code, this.currentData.supp_name) + let res = await checkoutbillcallMaterial(this.index2, this.index4, this.currentData.storagevehicleext_id) if (res.code === '200') { uni.showToast({ title: res.message, diff --git a/utils/getData4.js b/utils/getData4.js index baaf6de..6e4bc9d 100644 --- a/utils/getData4.js +++ b/utils/getData4.js @@ -263,9 +263,9 @@ export const getPointCodeByVehicleCode = (vcode) => request({ // 手工叫料/退料 // 手工叫料 -export const checkoutbillcallMaterial = (dcode, scode, mcode, type, spcode, spname) => request({ +export const checkoutbillcallMaterial = (dcode, type, id) => request({ url:'api/checkoutbill/callMaterial', - data: {device_code: dcode, struct_code: scode, material_code: mcode, task_type: type, supp_code: spcode, supp_name: spname} + data: {device_code: dcode, task_type: type, storagevehicleext_id: id} }) // 手工退料 export const checkoutbillBackMaterial = (code, type, qty) => request({ diff --git a/utils/mork2.js b/utils/mork2.js index 280c2b3..2e9a942 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -396,4 +396,102 @@ export const getStructCount = (code) => { z: 300 } return res +} + +export const getPdaCallEquipment = () => { + let res = { + data: [{text: '1', value: '1'}] + } + return res +} +export const getPdaCallMaterialSect = (pcode) => { + let res = { + data: [{text: '2', value: '2'}] + } + return res +} +export const getStructivtByMaterialAndSectCode = (scode, mcode) => { + let res = { + "code": "200", + "message": "操作成功!", + "data": [ + { + "supp_code": "hk", + "create_time": "2025-08-29 16:34:28", + "supp_name": "海康", + "material_model": "加钠", + "remark": null, + "storagevehicle_code": "LT0060", + "stor_name": "料桶缓存库", + "qty": 10.000, + "qty_unit_name": "Pcs", + "pcsn": "pc", + "struct_name": "T95", + "sect_name": "超细区", + "frozen_qty": 0.000, + "struct_code": "T95", + "material_name": "钨粉2", + "storagevehicleext_id": "1961346700035624960", + "material_code": "wu2" + }, + { + "supp_code": null, + "create_time": "2025-08-14 15:52:31", + "supp_name": null, + "material_model": null, + "remark": null, + "storagevehicle_code": "LT0011", + "stor_name": "料桶缓存库", + "qty": 1.000, + "qty_unit_name": "Pcs", + "pcsn": "空料桶入库", + "struct_name": "A11", + "sect_name": "超细区", + "frozen_qty": 0.000, + "struct_code": "A11", + "material_name": "空料桶", + "storagevehicleext_id": "1955900325860872192", + "material_code": "KLT001" + }, + { + "supp_code": null, + "create_time": "2025-08-14 15:50:52", + "supp_name": null, + "material_model": "加钠", + "remark": null, + "storagevehicle_code": "LT0076", + "stor_name": "料桶缓存库", + "qty": 10.000, + "qty_unit_name": "Pcs", + "pcsn": "退料", + "struct_name": "T97", + "sect_name": "超细区", + "frozen_qty": 0.000, + "struct_code": "T97", + "material_name": "钨粉2", + "storagevehicleext_id": "1955899913837613056", + "material_code": "wu2" + }, + { + "supp_code": null, + "create_time": "2025-08-14 10:21:30", + "supp_name": null, + "material_model": null, + "remark": null, + "storagevehicle_code": "LT0080", + "stor_name": "料桶缓存库", + "qty": 1.000, + "qty_unit_name": "Pcs", + "pcsn": "空料桶入库", + "struct_name": "T96", + "sect_name": "超细区", + "frozen_qty": 1.000, + "struct_code": "T96", + "material_name": "空料桶", + "storagevehicleext_id": "1955817020029276160", + "material_code": "KLT001" + } + ] +} + return res } \ No newline at end of file