原材料退料修改

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;

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,
+        whCode: this.waCodeList.warehouseCode,
-        waCode: 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);