From b6a8a83fd58863293d3d5ab3335d67b1f836018f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 19 Feb 2025 10:01:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?YT-1949PDA=E6=89=AB=E6=8F=8F=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=97=B6=EF=BC=8C=E5=BA=93=E5=AD=98=E4=B8=8D=E7=B2=97?= =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA=20?= =?UTF-8?q?=EF=BC=8C=E8=BF=98=E6=98=AF=E6=89=AB=E6=8F=8F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issueSupplies/job/issueDetailBatch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/issueSupplies/job/issueDetailBatch.vue b/src/pages/issueSupplies/job/issueDetailBatch.vue index 8622d972..6a5a60c5 100644 --- a/src/pages/issueSupplies/job/issueDetailBatch.vue +++ b/src/pages/issueSupplies/job/issueDetailBatch.vue @@ -244,7 +244,7 @@ this.showErrorMessage("物料【" + itemCode + "】已经扫描") return } - if(qty>result.balance.qty){ + if(detail.qty>result.balance.qty){ this.showErrorMessage("物料【" + itemCode + "】库存不足") return } From 04b2a6131a513f30d632d2346ebf3a69138f3715 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 19 Feb 2025 10:18:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?YT-1947PDA=20=E6=89=A7=E8=A1=8C=E8=A1=A5?= =?UTF-8?q?=E7=BB=99=E5=93=81=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7=20?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=89=A7=E8=A1=8C=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueSupplies/job/issueDetailBatch.vue | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/pages/issueSupplies/job/issueDetailBatch.vue b/src/pages/issueSupplies/job/issueDetailBatch.vue index 6a5a60c5..66ae3f54 100644 --- a/src/pages/issueSupplies/job/issueDetailBatch.vue +++ b/src/pages/issueSupplies/job/issueDetailBatch.vue @@ -244,10 +244,10 @@ this.showErrorMessage("物料【" + itemCode + "】已经扫描") return } - if(detail.qty>result.balance.qty){ - this.showErrorMessage("物料【" + itemCode + "】库存不足") - return - } + // if(detail.qty>result.balance.qty){ + // this.showErrorMessage("物料【" + itemCode + "】库存不足") + // return + // } detail.scaned = true } this.continueScan() @@ -269,10 +269,6 @@ }, submitJob() { - uni.showLoading({ - title: "提交中....", - mask: true - }); // var params = this.setParams() issueJobEopSubmit(this.detailSource).then(res => { uni.hideLoading() @@ -387,11 +383,11 @@ return } let index = 0 + uni.showLoading({ + title: "提交中....", + mask: true + }); await this.recursion(index) - if(this.str1){ - console.log(this.str1) - } - }, async recursion(index){ let filters = [] @@ -413,7 +409,7 @@ await getBalanceByFilter(params).then(res => { const balance = res.data.list[0] if(this.detailSource.subList[index].qty>balance.qty){ - this.str1 += "物料【" + itemCode + "】、" + this.str1 += "物料【" + this.detailSource.subList[index].itemCode + "】、" } index++; if(index < this.detailSource.subList.length){ @@ -421,7 +417,8 @@ }else{ if(this.str1){ this.str1 = this.str1.substring(0,this.str1.length - 1) - this.showErrorMessage(`${str1}库存不足`) + this.showErrorMessage(`${this.str1}库存不足`) + uni.hideLoading() }else{ this.submitJob() } From eec31dcbbbb7f493c9236fb3442bd296e7baed56 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 19 Feb 2025 11:32:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?YT-1956PDA=20=E4=BB=BB=E5=8A=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=20=E7=82=B9=E5=87=BB=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=EF=BC=8C=E7=84=A6=E7=82=B9=E5=BA=94=E8=AF=A5=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E5=88=B0=E8=BE=93=E5=85=A5=E6=A1=86YT-1949PD?= =?UTF-8?q?A=E6=89=AB=E6=8F=8F=E6=98=8E=E7=BB=86=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=B8=8D=E7=B2=97=EF=BC=8C=E6=9C=AA=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=8F=90=E7=A4=BA=20=EF=BC=8C=E8=BF=98=E6=98=AF?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=88=90=E5=8A=9F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winScanPackAndLocationNoShow.vue | 9 ++++++--- src/pages/issueSupplies/job/issueDetailBatch.vue | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/mycomponents/scan/winScanPackAndLocationNoShow.vue b/src/mycomponents/scan/winScanPackAndLocationNoShow.vue index d57e5f30..ee12eaaa 100644 --- a/src/mycomponents/scan/winScanPackAndLocationNoShow.vue +++ b/src/mycomponents/scan/winScanPackAndLocationNoShow.vue @@ -507,9 +507,12 @@ }, packGetFocus() { - if (this.$refs.comscan) { - this.$refs.comscan.getfocus(); - } + setTimeout(()=>{ + if (this.$refs.comscan) { + this.$refs.comscan.getfocus(); + } + },300) + }, packLoseFocus() { diff --git a/src/pages/issueSupplies/job/issueDetailBatch.vue b/src/pages/issueSupplies/job/issueDetailBatch.vue index 66ae3f54..8a91d6a4 100644 --- a/src/pages/issueSupplies/job/issueDetailBatch.vue +++ b/src/pages/issueSupplies/job/issueDetailBatch.vue @@ -244,10 +244,10 @@ this.showErrorMessage("物料【" + itemCode + "】已经扫描") return } - // if(detail.qty>result.balance.qty){ - // this.showErrorMessage("物料【" + itemCode + "】库存不足") - // return - // } + if(detail.qty>result.balance.qty){ + this.showErrorMessage("物料【" + itemCode + "】库存不足") + return + } detail.scaned = true } this.continueScan() @@ -477,6 +477,7 @@ }, openScanPopup() { this.$refs.scanPopup.openScanPopupForJob(this.jobContent); + this.scanPopupGetFocus(); }, closeScanPopup() {