From dd43920f404afc8f1940b1e59bd76be866792540 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 12 Mar 2025 14:19:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
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 | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index baffa2d..4bb01ae 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.168'; //正式版本号
+  version = '0.0.169'; //正式版本号
   //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 2f3e597..81eda20 100644
--- a/src/pages/wms/Raw/ReturnMaterials/index.vue
+++ b/src/pages/wms/Raw/ReturnMaterials/index.vue
@@ -83,7 +83,7 @@
       <u-row class="button-bar">
         <!-- 确定 -->
         <u-col :span="6">
-          <u-button @click="onSubmit" type="primary">确认出库</u-button>
+          <u-button @click="onSubmit" type="primary">确认入库</u-button>
         </u-col>
         <!-- 返回 -->
         <u-col :span="6">
@@ -249,8 +249,8 @@ export default class ReturnMaterials extends BasePage {
       params.push({
         createBy: session.loginName,
         factoryCode: session.FactoryCode,
-        whCode: this.areaCode,
-        waCode: this.waCodeList.warehouseCode,
+        whCode: this.waCodeList.warehouseCode,
+        waCode: this.areaCode,
         planNumber: item.planNumber,
         procureCode: item.procureCode,
         userDefined6: item.userDefined1,
@@ -258,6 +258,7 @@ export default class ReturnMaterials extends BasePage {
         materialDesc: item.materialDesc,
         userDefined3: item.userDefined4,
         sn: item.userDefined1,
+        userDefined5: item.userDefined7 || null,
       });
     });
     await this.model.out(params);