From 78496c75a08bc7d3e430617464affd88c67d1c16 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 18 Mar 2025 10:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E5=90=8E=E7=AB=AF=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=9D=A1=E7=A0=81=E9=87=8D=E5=A4=8D=E6=89=AB=E6=8F=8F?=
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/ReturnMaterials/index.vue | 28 +++++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 4c0f2a0..f9d7441 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.170'; //正式版本号
+  version = '0.0.171'; //正式版本号
   //version = '0.0.14'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/wms/Raw/ReturnMaterials/index.vue b/src/pages/wms/Raw/ReturnMaterials/index.vue
index 286e61f..b8e7c24 100644
--- a/src/pages/wms/Raw/ReturnMaterials/index.vue
+++ b/src/pages/wms/Raw/ReturnMaterials/index.vue
@@ -192,16 +192,24 @@ export default class ReturnMaterials extends BasePage {
     await this.model.getByidcard(item);
     if (model.getidcardcode == '200') {
       let alreadyList = model.byidcardobj;
-      alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
-      this.materilist.forEach((item) => {
-        if (item.id == alreadyList.userDefined4) {
-          item.returnNumber = item.returnNumber + alreadyList.planNumber;
-          //alreadyList.produceCode = item.produceCode;
-        }
-      });
-      //alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
-      this.list.push(alreadyList);
-      this.Idcard = '';
+      if (alreadyList.userDefined10 === '1') {
+        (this.$refs.uToast as any).show({
+          title: '标识卡已经收货完成',
+          // url: '/pages/user/index'
+        });
+        this.Idcard = '';
+      } else {
+        alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
+        this.materilist.forEach((item) => {
+          if (item.id == alreadyList.userDefined4) {
+            item.returnNumber = item.returnNumber + alreadyList.planNumber;
+            //alreadyList.produceCode = item.produceCode;
+          }
+        });
+        //alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
+        this.list.push(alreadyList);
+        this.Idcard = '';
+      }
     }
   }
   confirmNumber(changeobj) {