From 976432989c9bb5e2341caf868f8305da7858ddb4 Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Thu, 29 May 2025 17:08:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E8=BD=A6=E7=BB=91=E5=AE=9A=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AF=B9=E6=8E=A5=EF=BC=8C=E9=83=A8=E4=BB=B6=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=88=A4=E9=87=8D=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/common/batchscancode.vue | 146 ++++++++++++++++-- .../warehouse/component/enterdetails.vue | 6 +- .../pages/warehouse/component/outdetails.vue | 6 +- .../pages/warehouse/wholebind/wholebind.vue | 18 +-- 4 files changed, 144 insertions(+), 32 deletions(-) diff --git a/ebike-maintenance/pages/common/batchscancode.vue b/ebike-maintenance/pages/common/batchscancode.vue index fc777e1..299e23a 100644 --- a/ebike-maintenance/pages/common/batchscancode.vue +++ b/ebike-maintenance/pages/common/batchscancode.vue @@ -38,7 +38,9 @@ showMessage } from '../../utils/tools'; const imgPath = config.imgPath; - + import { + callOperateApi + } from '@/utils/api.js'; const { isOnlyBarCode } = defineProps({ @@ -49,7 +51,7 @@ }); const type = ref(""); - + const scanType = ref(""); const isInitDone = ref(false); const flash = ref("off"); const message = ref(null); @@ -59,6 +61,7 @@ onLoad((options) => { if (options.type) { type.value = options.type; + scanType.value = options.scanType; } }) @@ -72,22 +75,131 @@ const { result } = res.detail; - const now = Date.now(); - console.log("1111111111111111111", now - lastTime, result) - if (lastTime && (now - lastTime < 1000)) return; - lastTime = Date.now(); - if (!scancode.code.includes(result)) { - code.value = result; - scancode.addCode(result, type.value); - message.value.open(); - uni.vibrateShort(); - } else if (now - lastTime < 2000) { - uni.showToast({ - icon: "error", - title: "重复扫码，请返回或扫描下一个", - }); - uni.vibrateShort(); + if (scanType.value == 'bjrk') { + let componentType = ""; + let componentCode = "" + if (type.value == 'inBattery') { + componentType = "262711452730000"; + componentCode = result; + } else if (type.value == 'inHelmet') { + componentType = "262711452730001"; + componentCode = result; + } else if (type.value == 'inEcu') { + componentType = "262711452730008"; + const arrCode = result.split(" "); + const imei = arrCode[0].replace("IMEI:", ""); + const sn = arrCode[1].replace("SN:", ""); + componentCode = sn; + } + const param = { + componentType, + componentCode, + isNew: true + } + callOperateApi("ebikeComponent/validateComponentExistence", param).then(res => { + if (res.code == 200) { + if (res.data) { + uni.showToast({ + icon: "error", + title: "部件编号[" + componentCode + "]已有入库记录！", + }); + } else { + const now = Date.now(); + console.log("1111111111111111111", now - lastTime, result) + if (lastTime && (now - lastTime < 1000)) return; + lastTime = Date.now(); + if (!scancode.code.includes(result)) { + code.value = result; + scancode.addCode(result, type.value); + message.value.open(); + uni.vibrateShort(); + } else if (now - lastTime < 2000) { + uni.showToast({ + icon: "error", + title: "重复扫码，请返回或扫描下一个", + }); + uni.vibrateShort(); + } + } + } else { + uni.showToast({ + icon: "error", + title: res.message, + }); + } + }) + } else if (scanType.value == 'bjgh') { + let componentType = ""; + let componentCode = "" + if (type.value == 'inBattery') { + componentType = "262711452730000"; + componentCode = result[0]; + } else if (type.value == 'inHelmet') { + componentType = "262711452730001"; + componentCode = result[0]; + } else if (type.value == 'inEcu') { + componentType = "262711452730008"; + const arrCode = result.split(" "); + const imei = arrCode[0].replace("IMEI:", ""); + const sn = arrCode[1].replace("SN:", ""); + componentCode = sn; + } + const param = { + componentType, + componentCode, + isNew: false + } + callOperateApi("ebikeComponent/validateComponentExistence", param).then(res => { + if (res.code == 200) { + if (res.data) { + uni.showToast({ + icon: "error", + title: "部件编号[" + componentCode + "]已有入库记录！", + }); + } else { + const now = Date.now(); + console.log("1111111111111111111", now - lastTime, result) + if (lastTime && (now - lastTime < 1000)) return; + lastTime = Date.now(); + if (!scancode.code.includes(result)) { + code.value = result; + scancode.addCode(result, type.value); + message.value.open(); + uni.vibrateShort(); + } else if (now - lastTime < 2000) { + uni.showToast({ + icon: "error", + title: "重复扫码，请返回或扫描下一个", + }); + uni.vibrateShort(); + } + } + } else { + uni.showToast({ + icon: "error", + title: res.message, + }); + } + }) + } else { + const now = Date.now(); + console.log("1111111111111111111", now - lastTime, result) + if (lastTime && (now - lastTime < 1000)) return; + lastTime = Date.now(); + if (!scancode.code.includes(result)) { + code.value = result; + scancode.addCode(result, type.value); + message.value.open(); + uni.vibrateShort(); + } else if (now - lastTime < 2000) { + uni.showToast({ + icon: "error", + title: "重复扫码，请返回或扫描下一个", + }); + uni.vibrateShort(); + } } + } diff --git a/ebike-maintenance/pages/warehouse/component/enterdetails.vue b/ebike-maintenance/pages/warehouse/component/enterdetails.vue index 3820de1..9be581c 100644 --- a/ebike-maintenance/pages/warehouse/component/enterdetails.vue +++ b/ebike-maintenance/pages/warehouse/component/enterdetails.vue @@ -418,18 +418,18 @@ const onBatteryScanClick = (e) => { uni.navigateTo({ - url: `/pages/common/batchscancode?type=inBattery`, // + url: `/pages/common/batchscancode?type=inBattery&scanType=bjrk`, // }); } const onHelmetScanClick = (e) => { uni.navigateTo({ - url: `/pages/common/batchscancode?type=inHelmet`, // + url: `/pages/common/batchscancode?type=inHelmet&scanType=bjrk`, // }); } const onEcuScanClick = (e) => { uni.navigateTo({ - url: `/pages/common/batchscancode?type=inEcu`, // + url: `/pages/common/batchscancode?type=inEcu&scanType=bjrk`, // }); } diff --git a/ebike-maintenance/pages/warehouse/component/outdetails.vue b/ebike-maintenance/pages/warehouse/component/outdetails.vue index f26da90..c689fc2 100644 --- a/ebike-maintenance/pages/warehouse/component/outdetails.vue +++ b/ebike-maintenance/pages/warehouse/component/outdetails.vue @@ -814,19 +814,19 @@ const onInBatteryScanClick = (e) => { uni.navigateTo({ - url: `/pages/common/batchscancode?type=inBattery`, // + url: `/pages/common/batchscancode?type=inBattery&scanType=bjgh`, // }); } const onInHelmetScanClick = (e) => { uni.navigateTo({ - url: `/pages/common/batchscancode?type=inHelmet`, // + url: `/pages/common/batchscancode?type=inHelmet&scanType=bjgh`, // }); } const onInEcuScanClick = (e) => { uni.navigateTo({ - url: `/pages/common/batchscancode?type=inEcu`, // + url: `/pages/common/batchscancode?type=inEcu&scanType=bjgh`, // }); } diff --git a/ebike-maintenance/pages/warehouse/wholebind/wholebind.vue b/ebike-maintenance/pages/warehouse/wholebind/wholebind.vue index a663c13..2686af4 100644 --- a/ebike-maintenance/pages/warehouse/wholebind/wholebind.vue +++ b/ebike-maintenance/pages/warehouse/wholebind/wholebind.vue @@ -17,14 +17,14 @@ - + - - + + @@ -74,7 +74,7 @@ bikeNumber: '', ebikeEcuInfo: { ecuCode: '', - ecuSN: '', + ecuSn: '', ecuModel: '' }, ebikeBatteryInfo: { @@ -187,16 +187,16 @@ if (res.code == 200) { if (res.data) { ebikeInfo.value.ebikeEcuInfo.ecuCode = data["imei"]; - ebikeInfo.value.ebikeEcuInfo.ecuSN = data["sn"]; + ebikeInfo.value.ebikeEcuInfo.ecuSn = data["sn"]; } else { ebikeInfo.value.ebikeEcuInfo.ecuCode = ""; - ebikeInfo.value.ebikeEcuInfo.ecuSN = ""; + ebikeInfo.value.ebikeEcuInfo.ecuSn = ""; ecuCodeScan_zk.value.onSetValue(""); showModelMessage("中控不在仓库中,请重新扫码或输入!"); } } else { ebikeInfo.value.ebikeEcuInfo.ecuCode = ""; - ebikeInfo.value.ebikeEcuInfo.ecuSN = ""; + ebikeInfo.value.ebikeEcuInfo.ecuSn = ""; ecuCodeScan_zk.value.onSetValue(""); showModelMessage("操作失败！"); }