From 8efe269405706c24d1d79b405737e78a5eb86244 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 6 Aug 2024 14:12:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/coms/comScanIssuePack.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 9296a11e..3018d2d4 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -488,6 +488,10 @@ } if (this.toLocation && result.package.packUnit) { let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode); + if(!item){ + this.showErrorMessage('扫描物料代码不属于该任务'); + return + } if (result.package.packUnit !== item.packUnit) { this.$refs.comMessage.showQuestionMessage( `扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料？`, res => { From d1dbad53804ff7602d9c27b6173fb635c907cdb4 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 6 Aug 2024 15:26:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=88=E8=BF=9B=E5=85=88=E5=87=BA?= =?UTF-8?q?=E5=8F=91=E6=96=99=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/record/issueRecord.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue index 9236e084..b9219f6f 100644 --- a/src/pages/issue/record/issueRecord.vue +++ b/src/pages/issue/record/issueRecord.vue @@ -235,8 +235,15 @@ that.recommendList.forEach(r => r.locationCode = r.fromLocationCode) let recommendInfo = res.data[0]; if (recommendInfo.batch != result.package.batch) { - that.showErrorMessage('扫描的批次【' + result.package.batch + '】,不是系统推荐的批次【' + - recommendInfo.batch + '】,不满足系统的先进先出规则,请重新扫描'); + that.$refs.comMessage.showQuestionMessage('扫描的批次【' + result.package.batch + '】,不是系统推荐的批次【' + + recommendInfo.batch + '】,不满足系统的先进先出规则,'+'是否继续?', + res => { + if(res){ + this.setData(result); + } + }) + // that.showErrorMessage('扫描的批次【' + result.package.batch + '】,不是系统推荐的批次【' + + // recommendInfo.batch + '】,不满足系统的先进先出规则,请重新扫描'); } else { this.setData(result); } From f025ee1d49d00544c37508c9004d3b568030f23f Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 6 Aug 2024 15:44:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BB=A7=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/repleinsh/record/repleinshRecord.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue index 7cd3b6c2..c7378cfe 100644 --- a/src/pages/repleinsh/record/repleinshRecord.vue +++ b/src/pages/repleinsh/record/repleinshRecord.vue @@ -259,8 +259,15 @@ that.recommendList.forEach(r => r.locationCode = r.fromLocationCode) let recommendInfo = res.data[0]; if (recommendInfo.batch != result.package.batch) { - that.showErrorMessage('扫描的批次【' + result.package.batch + '】,不是系统推荐的批次【' + - recommendInfo.batch + '】,不满足系统的先进先出规则,请重新扫描'); + // that.showErrorMessage('扫描的批次【' + result.package.batch + '】,不是系统推荐的批次【' + + // recommendInfo.batch + '】,不满足系统的先进先出规则,请重新扫描'); + that.$refs.comMessage.showQuestionMessage('扫描的批次【' + result.package.batch + '】,不是系统推荐的批次【' + + recommendInfo.batch + '】,不满足系统的先进先出规则,'+'是否继续?', + res => { + if(res){ + this.setData(result); + } + }) } else { this.setData(result); }