From cccd9d2c76a18037677f47af8b0da02054b0c2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 28 Nov 2023 23:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=B7=E6=89=AB=E7=A0=81=EF=BC=9A=E5=A6=82=E6=9E=9C=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=9C=E5=92=8C=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=EF=BC=8C=E5=B0=B1=E7=9B=B4=E6=8E=A5=E8=B7=B3?=
 =?UTF-8?q?=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/mixins/BillModalMixin.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index f4122d5b..c2b4fc25 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -806,7 +806,7 @@ export const BillModalMixin = {
               let newDetailArr = []
               for(let detail of detailArr){
                 if(detail.barCode) {
-                  //如果条码重复，就在给原来的数量加1
+                  //如果扫码结果和条码重复，就在给原来的数量加1
                   if(detail.barCode === this.scanBarCode) {
                     detail.operNumber = (detail.operNumber-0)+1
                     //由于改变了商品数量，需要同时更新相关金额和价税合计
@@ -817,6 +817,11 @@ export const BillModalMixin = {
                     detail.taxLastMoney = (detail.allPrice + detail.taxMoney).toFixed(2)-0
                     hasFinished = true
                   }
+                  //如果扫码结果和序列号重复，就直接跳过
+                  if(detail.snList === this.scanBarCode) {
+                    this.$message.warning('抱歉，已经扫描过该序列号！');
+                    hasFinished = true
+                  }
                   newDetailArr.push(detail)
                 }
               }