From 0aab719baf96f97dff6bf069282709d1d90c8b17 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 23 Oct 2024 21:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=89=AB=E6=8F=8F=E6=A0=87=E5=BF=97=E5=8D=A1=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue           |  2 +-
 src/pages/wms/product/SaleOutWH/index.vue | 42 ++++++++++++++---------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index b28251a..43fe486 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.119'; //正式版本号
+  version = '0.0.120'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/wms/product/SaleOutWH/index.vue b/src/pages/wms/product/SaleOutWH/index.vue
index 96cc626..9f1a445 100644
--- a/src/pages/wms/product/SaleOutWH/index.vue
+++ b/src/pages/wms/product/SaleOutWH/index.vue
@@ -356,22 +356,32 @@ export default class SaleOutWH extends BasePage {
     item.siteCode = session.FactoryCode;
     await this.model.ScanCodeWholePallet(item);
     if (this.model.scanCode == '200') {
-      (this.$refs.uToast as any).show({
-        title: '成功',
-        type: 'success',
-      });
-      model.scandatalist.map((item) => {
-        item.productCode = item.productCode.slice(item.productCode.search(/[1-9]/));
-        if (item.productCode == this.orderNoItemList.productCode) {
-          this.list.push(item);
-          this.orderNoItemList.outQuantity += item.amount;
-        } else {
-          (this.$refs.uToast as any).show({
-            title: '扫描的物料必须与选择的物料相同',
-            type: 'error',
-          });
-        }
-      });
+      let chongfuscan = this.list.some((item) => item.storageId === model.scandatalist[0].storageId);
+      if (chongfuscan) {
+        (this.$refs.uToast as any).show({
+          title: '请勿重复扫描标志卡',
+          // url: '/pages/user/index'
+        });
+        return;
+      } else {
+        (this.$refs.uToast as any).show({
+          title: '成功',
+          type: 'success',
+        });
+        model.scandatalist.map((item) => {
+          item.productCode = item.productCode.slice(item.productCode.search(/[1-9]/));
+          if (item.productCode == this.orderNoItemList.productCode) {
+            this.list.push(item);
+            this.orderNoItemList.outQuantity += item.amount;
+          } else {
+            (this.$refs.uToast as any).show({
+              title: '扫描的物料必须与选择的物料相同',
+              type: 'error',
+            });
+          }
+        });
+      }
+
       // this.list.push()
 
       this.boxnumber = '';