From f34ba234440f8530d999b3d9f2a236b699602707 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Thu, 31 Oct 2024 14:10:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=A0=A1=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/Raw/ReceivePO/index.vue  | 22 ++++++++++++++++------
 src/pages/wms/Raw/ReceiveSRM/index.vue | 22 ++++++++++++++++------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index a5c00bb..f087471 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.123'; //正式版本号
+  version = '0.0.124'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue
index 9c1a013..c194c0d 100644
--- a/src/pages/wms/Raw/ReceivePO/index.vue
+++ b/src/pages/wms/Raw/ReceivePO/index.vue
@@ -265,12 +265,22 @@ export default class receivePO extends BasePage {
       let alreadyList = model.byidcardobj;
       alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
       let id = alreadyList.userDefined4;
-      this.list.forEach((item) => {
-        if (item.id == id) {
-          item.realityNumber += alreadyList.planNumber;
-        }
-      });
-      this.receivedlist.push(alreadyList);
+      let flage = this.list.some((item) => item.id === id);
+      if (flage) {
+        this.list.forEach((item) => {
+          if (item.id == id) {
+            item.realityNumber += alreadyList.planNumber;
+          }
+        });
+        this.receivedlist.push(alreadyList);
+      } else {
+        (this.$refs.uToast as any).show({
+          title: '该标志卡与上面的采购单不匹配',
+          type: 'default',
+        });
+        return;
+      }
+
       //this.confirmNumber();
       this.Idcard = '';
       this.twofouces = true;
diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue
index 3700f2f..d5d3ca8 100644
--- a/src/pages/wms/Raw/ReceiveSRM/index.vue
+++ b/src/pages/wms/Raw/ReceiveSRM/index.vue
@@ -353,12 +353,22 @@ export default class receiveSRM extends BasePage {
       let alreadyList = model.byidcardobj;
       alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
       let id = alreadyList.userDefined4;
-      this.list.forEach((item) => {
-        if (item.id == id) {
-          item.realityNumber += alreadyList.planNumber;
-        }
-      });
-      this.receivedlist.push(alreadyList);
+      let flage = this.list.some((item) => item.id === id);
+      if (flage) {
+        this.list.forEach((item) => {
+          if (item.id == id) {
+            item.realityNumber += alreadyList.planNumber;
+          }
+        });
+        this.receivedlist.push(alreadyList);
+      } else {
+        (this.$refs.uToast as any).show({
+          title: '该标志卡与上面的采购单不匹配',
+          type: 'default',
+        });
+        return;
+      }
+
       //this.confirmNumber();
       this.Idcard = '';
       this.twofouces = true;