From 35b5ba345ff96d3930434647c440ada474df7833 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 8 Jan 2025 09:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
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 | 52 +++++++++++++----------
 src/pages/wms/product/SaleOutWH/model.ts  |  6 ++-
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 2a7c1e8..1658af7 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.163'; //正式版本号
+  version = '0.0.164'; //正式版本号
   //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 b3bba4e..eb7b5be 100644
--- a/src/pages/wms/product/SaleOutWH/index.vue
+++ b/src/pages/wms/product/SaleOutWH/index.vue
@@ -357,30 +357,38 @@ export default class SaleOutWH extends BasePage {
     item.batchNumber = this.bimWl.value;
     await this.model.ScanCodeWholePallet(item);
     if (this.model.scanCode == '200') {
-      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'
-        });
-        this.boxnumber = '';
-        return;
+      if (model.scandatalist.length != 0) {
+        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'
+          });
+          this.boxnumber = '';
+          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',
+              });
+            }
+          });
+        }
       } 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',
-            });
-          }
+          title: model.Submitmsg,
+          duration: 3000,
+          type: 'error',
         });
       }
 
diff --git a/src/pages/wms/product/SaleOutWH/model.ts b/src/pages/wms/product/SaleOutWH/model.ts
index 2830f42..182628c 100644
--- a/src/pages/wms/product/SaleOutWH/model.ts
+++ b/src/pages/wms/product/SaleOutWH/model.ts
@@ -37,13 +37,15 @@ export class SaleOutWH extends VuexModule {
   scanCode: any = '';
   scandatalist: any = [];
   scandata: any = {};
+  Submitmsg: any = '';
   //整托
   @MutationAction
   async ScanCodeWholePallet(params: any) {
     const result: any = await http.post(url.lanjuwms.product.SaleOutWH.ScanCodeWholePallet, params);
     const scanCode = result.code;
-    const scandatalist = result.data;
-    return { scanCode, scandatalist };
+    const scandatalist = result.data || [];
+    const Submitmsg = result.msg;
+    return { scanCode, scandatalist, Submitmsg };
   }
   //单箱
   @MutationAction