diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index b2174e2..3644efb 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -195,6 +195,7 @@ export default {
     return_Tip4: '退料数量不能大于总数',
     quantitys: '不能大于应退货数量',
     actual: '实际退货数量不等于应退货数量',
+    greater: '不能大于总数',
     receiveAStation: '接收工位',
 
     //库内主菜单
@@ -205,7 +206,9 @@ export default {
     Inventory: '成品盘点',
     raw_Inventory: '原材料盘点',
     Transfer: '移库码',
+    LibraryCode: '请生成移库码',
     generate: '生成',
+    TargetLocation: '请选择不同目标库位',
 
     RowWarehouse: '原材料库内',
     SemiProductZC: '半成品转储',
@@ -237,6 +240,9 @@ export default {
 
     // 委外-出库
     CommissionGoOut: '委外出库',
+    Outbound: '出库库位',
+    Warehousing: '入库库位',
+    PleaseQuantity: '请输入本次数量',
     CommissionedGoOutDetails: '出库明细',
     CommissionedGoOutNumber: '出库数量',
     // 委外-提示
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 7d9761a..aafa0c9 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -228,12 +228,18 @@ export default {
     CommissionedThisNumber: 'quantity',
     CommissionedNumber: 'Receipt quantity',
     CommissionedEntrantDetails: 'Warehousing',
+    greater: 'Cannot be greater than total',
+    LibraryCode: 'Please change the library code',
     CommissionedReceiptQuantity: 'Receipt quantity',
+    TargetLocation: 'Please select a different target location',
     subcontract: 'subcontract',
 
     // 委外-出库
     CommissionGoOut: 'Subcontracting issue',
+    Outbound: 'Outbound location',
+    Warehousing: 'Warehousing location',
     CommissionedGoOutDetails: 'Delivery details',
+    PleaseQuantity: 'Please enter this quantity',
     CommissionedGoOutNumber: 'Outbound quantity',
     // 委外-提示
     Commission_tips1: 'Please enter the order No',
diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue
index 37403c9..372d87f 100644
--- a/src/pages/product/warehouse/wholeTransfer/index.vue
+++ b/src/pages/product/warehouse/wholeTransfer/index.vue
@@ -1,147 +1,72 @@
 <template>
   <view class="page-product-receipt">
-    <view
-      class="header"
-      :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
-    >
+    <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="back" />
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
       </view>
-      <view class="title">{{ $t("message.Relocation") }}</view>
+      <view class="title">{{ $t('message.Relocation') }}</view>
       <view class="right"></view>
     </view>
     <u-form class="form" ref="form" :model="form" label-width="180rpx">
-      <u-form-item :label="this.$t('message.Transfer')">
-        <u-input v-model="userDefined4" placeholder="" class="Transfer" />
-        <u-button
-          type="primary"
-          style="height: 60rpx; margin-left: 20rpx"
-          @click="generate"
-          >{{ $t("message.generate") }}</u-button
-        >
+      <!-- 移库码 -->
+      <u-form-item :label="$t('message.Transfer')">
+        <u-input v-model="model.userDefined4" placeholder="" class="Transfer" />
+        <u-button type="primary" style="height: 60rpx; margin-left: 20rpx" @click="generate">{{ $t('message.generate') }}</u-button>
       </u-form-item>
-      <u-form-item
-        :required="true"
-        :label="this.$t('message.product_barCode')"
-        prop="productCode"
-      >
-        <u-search
-          :placeholder="this.$t('message.po_PleaseInput')"
-          v-model="form.productCode"
-          @search="model.getProductCode"
-          :show-action="false"
-        ></u-search>
+      <!-- 条码 -->
+      <u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="query" :show-action="false"></u-search>
       </u-form-item>
-      <u-form-item :label="this.$t('message.product_FGCode')">
-        <u-input
-          :disabled="true"
-          v-model="model.orderInInfo.productCode"
-          placeholder=""
-        />
+      <!-- 成品编码 -->
+      <u-form-item :label="$t('message.product_FGCode')">
+        <u-input :disabled="true" v-model="model.orderInInfo.productCode" placeholder="" />
       </u-form-item>
-      <u-form-item :label="this.$t('message.product_FGDes')">
-        <u-input
-          :disabled="true"
-          v-model="model.orderInInfo.productDescZh"
-          placeholder=""
-        />
+      <!-- 成品描述 -->
+      <u-form-item :label="$t('message.product_FGDes')">
+        <u-input :disabled="true" v-model="model.orderInInfo.productDescZh" placeholder="" />
       </u-form-item>
-      <u-form-item :label="this.$t('message.product_Number')">
-        <u-input
-          :disabled="true"
-          v-model="model.orderInInfo.qty"
-          placeholder=""
-        />
+      <!-- 数量 -->
+      <u-form-item :label="$t('message.product_Number')">
+        <u-input :disabled="true" v-model="model.orderInInfo.qty" placeholder="" />
       </u-form-item>
-      <!-- <u-form-item label="类型:" prop="cboPlace">
-        <u-input
-          v-model="model.orderInInfo.custCode"
-          type="select"
-          @click="cboPlaceSelect = true"
-        />
-        <u-select
-          v-model="cboPlaceSelect"
-          :list="model.modelType"
-          @confirm="(v) => (form.cboPlace = v[0])"
-        ></u-select>
-      </u-form-item> -->
-      <!-- <u-form-item label="类型">
-        <u-input v-model="model.orderInInfo.custCodeName" />
-      </u-form-item> -->
-      <u-form-item :label="this.$t('message.product_Location')">
-        <u-input
-          :disabled="true"
-          v-model="model.orderInInfo.locCode"
-          placeholder=""
-        />
+      <!-- 库位 -->
+      <u-form-item :label="$t('message.product_Location')">
+        <u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
       </u-form-item>
-      <!-- <u-form-item label="库位:" prop="originWl">
-        <u-input v-model="form.originWl.label" type="select" @click="originWlSelect = true" />
-        <u-select
-          v-model="originWlSelect"
-          :list="model.WlList"
-          @confirm="(v) => (form.originWl = v[0])"
-        ></u-select>
-      </u-form-item> -->
-      <!-- <u-form-item label="目标库位:" prop="aimWl">
-        <u-input v-model="form.aimWl.label" type="select" @click="aimWlSelect = true" />
-        <u-select
-          v-model="aimWlSelect"
-          :list="model.WlList"
-          @confirm="(v) => (form.aimWl = v[0])"
-        ></u-select>
-      </u-form-item> -->
-      <u-form-item
-        :required="true"
-        :label="this.$t('message.Warehouse_TargetLocation')"
-        prop="aimWl"
-      >
-        <!-- <u-input v-model="form.aimWl.value" type="select" @click="aimWlSelect1 = true" /> -->
-        <jPicker
-          sureColor="#ff0000"
-          @bindpicker="bookTypeChange"
-          showKey="value"
-          valKey="value"
-          :val="form.aimWl.value"
-          :options="model.WlList"
-        />
+      <!-- 目标库位 -->
+      <u-form-item :required="true" :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
+        <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
       </u-form-item>
     </u-form>
     <view class="bottom-bar">
       <u-row class="button-bar">
+        <!-- 移库明细 -->
         <u-col :span="4">
-          <u-button type="primary" @click="bill">{{
-            $t("message.Warehouse_TransferDetails")
-          }}</u-button>
+          <u-button type="primary" @click="bill">{{ $t('message.Warehouse_TransferDetails') }}</u-button>
         </u-col>
+        <!-- 确定 -->
         <u-col :span="4">
-          <u-button type="primary" @click="onSubmit">{{
-            $t("message.workArea_Confirm")
-          }}</u-button>
+          <u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
         </u-col>
+        <!-- 返回 -->
         <u-col :span="4">
-          <u-button type="error" @click="uni.navigateBack()">{{
-            $t("message.po_Return")
-          }}</u-button>
+          <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
   </view>
 </template>
-
 <script lang="ts">
-import { Component, Ref } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import jPicker from "@/components/J-Picker/jPicker.vue";
-import { VForm, VFormRules } from "vue/types/form";
-import model from "./model";
-import { session } from "@/store/modules/session";
-
+import { Component, Ref } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import jPicker from '@/components/J-Picker/jPicker.vue';
+import { VForm, VFormRules } from 'vue/types/form';
+import model from './model';
+import { session } from '@/store/modules/session';
 interface OptionType {
   label: string;
   value: string;
 }
-
 @Component({
   components: {
     jPicker,
@@ -151,149 +76,115 @@ export default class productCheckReceipt extends BasePage {
   /**
    * 表单引用
    */
-  @Ref("form") readonly $form!: VForm;
-
-  /**
-   * 页面Module
-   */
+  @Ref('form') readonly $form!: VForm;
   model = model;
-
-  /**
-   * 表单数据
-   */
   form = {
-    // originWl: {} as OptionType,
     aimWl: {} as OptionType,
-    // qty: {} as OptionType,
-    productCode: "",
+    productCode: '',
   };
-  userDefined4: any = "";
-  // originWlSelect = false;
   aimWlSelect = false;
-  // aimWlSelect1 = false;
   cboPlaceSelect = false;
   rules: VFormRules<any> = {
-    documentNo: [
-      { required: true, message: this.$t("message.Warehouse_Tip1") as string },
-    ],
+    documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }],
     // originWl: [{ required: true, message: '请选择库位地点' }],
-    aimWl: [
-      { required: true, message: this.$t("message.Warehouse_Tip3") as string },
-    ],
-    cboPlace: [
-      { required: true, message: this.$t("message.Warehouse_Tip4") as string },
-    ],
+    aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }],
+    cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }],
   };
-  back() {
-    uni.navigateBack({ delta: 1 });
-    this.model.orderInInfo.productDescZh = "";
-  }
-  value = "";
+  // back() {
+  //   uni.navigateBack({ delta: 1 });
+  // }
+  value = '';
   show = false;
-
+  //选择目标库位回调函数
   bookTypeChange(e: any) {
     this.form.aimWl = e.pickerName;
   }
-
-  // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
+  //扫描条码回车
+  async query() {
+    if (this.form.productCode == ' ' || this.form.productCode.length == 0) {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.product_unit7') as string,
+      });
+      return;
+    }
+    await model.getProductCode(this.form.productCode);
+    if (model.code == '1') {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.successful') as string,
+      });
+    }
+  }
+  //页面初始化
   onReady() {
-    this.model.orderInInfo.productDescZh = "";
-    this.model.orderInInfo.productCode = "";
-    this.model.orderInInfo.qty = "";
-    this.model.orderInInfo.locCode = "";
     this.$form.setRules(this.rules);
     this.model.queryLocation();
   }
+  //点击生成随机移库码
   async generate() {
-    let person = JSON.parse(
-      localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
-    );
+    let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
     let loginName = person.session.user.loginName;
     await this.model.getCpMoveBatchNo({ loginName });
-    this.userDefined4 = model.userDefined4;
   }
+  //移库明细
   async bill() {
-    // if (this.form.documentNo == "") {
-    //   uni.showToast({
-    //     icon: "none",
-    //     title: "请先输入要查询的单号" as any,
-    //   });
-    //   return;
-    // }
-    // let person = JSON.parse(
-    //   localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
-    // );
-    // let content = {
-    //   loginName: person.session.user.loginName,
-    //   poNo: this.form.documentNo,
-    //   factoryCode: person.session.user.factoryCode,
-    // };
-    // await this.model.querydetaildlist(content);
     this.model.detailedList = [];
     this.redirectTo(this.page.product.warehouse.wholeTransfer.Local);
   }
+  //移库确认
   onSubmit() {
     this.$form.validate((valid: boolean) => {
       if (!valid) return;
+      if (model.userDefined4 == ' ' || model.userDefined4.length == 0) {
+        uni.showToast({
+          icon: 'none',
+          title: this.$t('message.LibraryCode') as string,
+        });
+        return;
+      }
       if (!this.form.productCode) {
         uni.showToast({
-          icon: "none",
-          title: this.$t("message.Warehouse_Tip5") as string,
+          icon: 'none',
+          title: this.$t('message.Warehouse_Tip5') as string,
         });
         return;
       }
-      // if (!this.form.cboPlace.value) {
-      //   uni.showToast({
-      //     icon: 'none',
-      //     title: '请选择类型!',
-      //   });
-      //   return;
-      // }
-      // if (!this.form.originWl.value) {
-      //   uni.showToast({
-      //     icon: 'none',
-      //     title: '请选择库位!',
-      //   });
-      //   return;
-      // }
       if (!this.form.aimWl.value) {
         uni.showToast({
-          icon: "none",
-          title: this.$t("message.Warehouse_Tip3") as string,
+          icon: 'none',
+          title: this.$t('message.Warehouse_Tip3') as string,
+        });
+        return;
+      }
+      if (this.form.aimWl.value == model.orderInInfo.locCode) {
+        uni.showToast({
+          icon: 'none',
+          title: this.$t('message.TargetLocation') as string,
         });
         return;
       }
-      console.log("orderlist");
-
       const orderlist = [
         {
           ...this.model.orderInInfo,
           originWl: this.model.orderInInfo.locCode,
           barCode: this.model.orderInInfo.barcode,
           aimWl: this.form.aimWl.value,
-          type: "0",
-          orderType: "0",
+          type: '0',
+          orderType: '0',
           keepBy: session.loginName as string,
           factoryCode: session.factoryCode as string,
-          userDefined4: this.userDefined4,
+          userDefined4: model.userDefined4,
         },
       ];
-      console.log("orderlist", orderlist);
       this.model.onTakeoutConfirm(orderlist);
-      this.model.orderInInfo.productDescZh = "";
-      this.model.orderInInfo.productCode = "";
-      this.model.orderInInfo.qty = "";
-      this.model.orderInInfo.locCode = "";
-      this.form.productCode = "";
     });
   }
 }
 </script>
-
 <style lang="scss" scoped>
 .page-product-receipt {
-  background: #f2f2f2
-    linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
   padding: 118rpx 30rpx 162rpx;
   min-height: 100%;
diff --git a/src/pages/product/warehouse/wholeTransfer/model.ts b/src/pages/product/warehouse/wholeTransfer/model.ts
index 4ab7a7c..0d8716f 100644
--- a/src/pages/product/warehouse/wholeTransfer/model.ts
+++ b/src/pages/product/warehouse/wholeTransfer/model.ts
@@ -1,15 +1,9 @@
-import {
-  Action,
-  getModule,
-  Module,
-  MutationAction,
-  VuexModule,
-} from "vuex-module-decorators";
-import store from "@/store";
-import http from "@/utils/request";
-import { url } from "@/utils/url";
-import { session } from "@/store/modules/session";
-import vm from "@/main";
+import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
+import store from '@/store';
+import http from '@/utils/request';
+import { url } from '@/utils/url';
+import { session } from '@/store/modules/session';
+import vm from '@/main';
 // import { page } from '@/utils/page';
 
 class OrderInInfo {
@@ -26,16 +20,16 @@ class OrderInInfo {
   namespaced: true,
   dynamic: true,
   store,
-  name: "product.warehouse.wholeTransfer",
+  name: 'product.warehouse.wholeTransfer',
 })
 export class wholeTransfer extends VuexModule {
   /**
    * 库位地点列表
    */
   WlList = [];
-  userDefined4 = "";
+  userDefined4 = '';
   detailedList: any;
-
+  code = '';
   /**
    * 物料型号类型
    */
@@ -48,7 +42,7 @@ export class wholeTransfer extends VuexModule {
   /**
    * 隐藏看单号
    */
-  dnNo = "";
+  dnNo = '';
   /**
    * 看单号查询结果
    */
@@ -74,12 +68,10 @@ export class wholeTransfer extends VuexModule {
     const result: any = await http.get(url.warehouse.wholeTransfer.list, {
       params: {
         factoryCode: session.factoryCode,
-        // factoryCode: '1999',
         loginName: session.loginName,
-        // loginName: '1999',
       },
     });
-    console.log("库位数据", result);
+    console.log('库位数据', result);
     const WlList = result.data.map((_: any) => ({
       label: _.locationCode,
       value: _.locationCode,
@@ -97,34 +89,34 @@ export class wholeTransfer extends VuexModule {
     const res: any = await http.post(url.warehouse.wholeTransfer.content, {
       barcode,
       factoryCode: session.factoryCode,
-      // factoryCode: '1999',
       loginName: session.loginName,
-      // loginName: '1999',
     });
-    console.log("获取来的数据", res.data.records);
+    const code = res.code;
     const orderInInfo = res.data.records[0];
-    if (orderInInfo.custCode == "0") {
-      orderInInfo.custCodeName = vm.$t("message.Warehouse_NX") as any;
-    } else if (orderInInfo.custCode == "1") {
-      orderInInfo.custCodeName = vm.$t("message.Warehouse_WX") as any;
-    } else if (orderInInfo.custCode == "2") {
-      orderInInfo.custCodeName = vm.$t("message.Warehouse_YJ") as any;
-    } else if (orderInInfo.custCode == "4") {
-      orderInInfo.custCodeName = vm.$t("message.Warehouse_BCP") as any;
+    if (orderInInfo.custCode == '0') {
+      orderInInfo.custCodeName = vm.$t('message.Warehouse_NX') as any;
+    } else if (orderInInfo.custCode == '1') {
+      orderInInfo.custCodeName = vm.$t('message.Warehouse_WX') as any;
+    } else if (orderInInfo.custCode == '2') {
+      orderInInfo.custCodeName = vm.$t('message.Warehouse_YJ') as any;
+    } else if (orderInInfo.custCode == '4') {
+      orderInInfo.custCodeName = vm.$t('message.Warehouse_BCP') as any;
     }
+    return { orderInInfo, code };
+  }
+  //清除数据
+  @MutationAction
+  async empty() {
+    const orderInInfo: any = [];
     return { orderInInfo };
   }
-
   @MutationAction
   async onTakeoutConfirm(list: any) {
-    const records: any = await http.post(
-      url.warehouse.rowTransfer.commit,
-      list
-    );
+    const records: any = await http.post(url.warehouse.rowTransfer.commit, list);
     if (records.code == 1) {
       uni.showToast({
-        icon: "success",
-        title: "success",
+        icon: 'success',
+        title: 'success',
       });
       // uni.navigateTo({ url: page.product.warehouse.index });
     }
@@ -133,19 +125,15 @@ export class wholeTransfer extends VuexModule {
   //生成移库码
   @MutationAction
   async getCpMoveBatchNo(loginName: any) {
-    let res: any = await http.post(
-      url.warehouse.rowTransfer.getCode,
-      loginName
-    );
+    let res: any = await http.post(url.warehouse.rowTransfer.getCode, loginName);
     let userDefined4 = res.data;
-    this.userDefined4 = userDefined4;
     return { userDefined4 };
   }
   //查询明细
-  @Action({ commit: "updateCheckedOrderInInfoListKw" })
+  @Action({ commit: 'updateCheckedOrderInInfoListKw' })
   async querydetaildlist(content: any) {
-    let res: any = await http.post("/wmspda/fg/queryListByBatchNo", content);
-    console.log("明细》》》》》》》》》", res.list);
+    let res: any = await http.post('/wmspda/fg/queryListByBatchNo', content);
+    console.log('明细》》》》》》》》》', res.list);
     this.detailedList = res.data;
     return res;
   }
@@ -178,12 +166,12 @@ export class wholeTransfer extends VuexModule {
   /**
    * 修改库位
    */
-  @Action({ commit: "updateCheckedOrderInInfoListKw" })
+  @Action({ commit: 'updateCheckedOrderInInfoListKw' })
   async changeOrderInLocation(kw: string) {
-    await http.post("/wmspda/material/orderin/enter", {
+    await http.post('/wmspda/material/orderin/enter', {
       loginName: session.loginName,
       // loginName: '1999',
-      warehouseCode: "",
+      warehouseCode: '',
       factoryCode: session.factoryCode,
       // factoryCode: '1999',
       locationCode: kw,
diff --git a/src/pages/raw/warehouse/rowTransfer/config.ts b/src/pages/raw/warehouse/rowTransfer/config.ts
index f723101..aff8f73 100644
--- a/src/pages/raw/warehouse/rowTransfer/config.ts
+++ b/src/pages/raw/warehouse/rowTransfer/config.ts
@@ -5,30 +5,30 @@ import vm from '@/main';
 export const headers = [
   {
     label: vm.$t('message.Warehouse_OrderNo'),
-    key: 'orderNo',
+    key: 'orderNo', //单号
     // width: '15%',
   },
   {
     label: vm.$t('message.po_MaterielNo'),
-    key: 'productCode',
+    key: 'productCode', //物料号
     // width: '15%',
   },
   {
     label: vm.$t('message.po_MaterielDes'),
-    key: 'productDescZh',
+    key: 'productDescZh', //物料描述
     width: 350,
   },
   {
     label: vm.$t('message.dn_Number'),
-    key: 'qty',
+    key: 'qty', //数量
   },
   {
     label: vm.$t('message.Warehouse_OriginalLocation'),
-    key: 'originWl',
+    key: 'originWl', //原库位
   },
   {
     label: vm.$t('message.Warehouse_TargetLocation'),
-    key: 'aimWl',
+    key: 'aimWl', //目标库位
   },
   // {
   //   label: '校验状态',
diff --git a/src/pages/raw/warehouse/rowTransfer/details.vue b/src/pages/raw/warehouse/rowTransfer/details.vue
index 6a759a8..fb45094 100644
--- a/src/pages/raw/warehouse/rowTransfer/details.vue
+++ b/src/pages/raw/warehouse/rowTransfer/details.vue
@@ -1,25 +1,13 @@
 <template>
   <view class="page-kan-dan-detail">
-    <view
-      class="header"
-      :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
-    >
+    <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
       </view>
-      <view class="title">{{ $t("message.Warehouse_TransferDetails") }}</view>
+      <view class="title">{{ $t('message.Warehouse_TransferDetails') }}</view>
       <view class="right"></view>
     </view>
-    <wyb-table
-      class="table"
-      ref="table"
-      width="100%"
-      enable-check="multiple"
-      show-left-and-right-border
-      :headers="headers"
-      :contents="model.orderInInfoList"
-      :show-vert-border="false"
-    />
+    <wyb-table class="table" ref="table" width="100%" enable-check="multiple" show-left-and-right-border :headers="headers" :contents="model.orderInInfoList" :show-vert-border="false" />
     <view class="bottom-bar">
       <!-- <view class="extra">
         <u-row>
@@ -42,14 +30,10 @@
       <view class="container">
         <u-row>
           <u-col :span="6">
-            <u-button type="primary" @click="Confirm">{{
-              $t("message.dn_Confirm")
-            }}</u-button>
+            <u-button type="primary" @click="Confirm">{{ $t('message.dn_Confirm') }}</u-button>
           </u-col>
           <u-col :span="6">
-            <u-button type="error" @click="uni.navigateBack({ delta: 1 })">{{
-              $t("message.po_Return")
-            }}</u-button>
+            <u-button type="error" @click="uni.navigateBack({ delta: 1 })">{{ $t('message.po_Return') }}</u-button>
           </u-col>
         </u-row>
       </view>
@@ -58,18 +42,18 @@
 </template>
 
 <script lang="ts">
-import { Component } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import model from "./model";
+import { Component } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import model from './model';
 // import { order, OrderDetail } from '@/pages/raw/warehouse/transfer/model';
 // import { auth } from '@/store/modules/auth';
 // import { pick, omit, cloneDeep } from 'lodash/fp';
-import { headers } from "./config";
-import { session } from "@/store/modules/session";
+import { headers } from './config';
+import { session } from '@/store/modules/session';
 
 @Component
 export default class KanDanHandOverDetails extends BasePage {
-  order = "";
+  order = '';
   headers = headers;
 
   /**
@@ -108,15 +92,15 @@ export default class KanDanHandOverDetails extends BasePage {
     });
     if (orderlist.length == 0) {
       uni.showToast({
-        icon: "none",
-        title: "请先选中要移库的数据" as any,
+        icon: 'none',
+        title: '请先选中要移库的数据' as any,
       });
       return;
     }
     orderlist.forEach((item: any) => {
-      item.type = "1";
+      item.type = '1';
       item.keepBy = session.loginName;
-      item.orderType = "0";
+      item.orderType = '0';
     });
     await model.onTakeoutConfirm(orderlist);
     setTimeout(() => {
@@ -128,8 +112,7 @@ export default class KanDanHandOverDetails extends BasePage {
 
 <style lang="scss" scoped>
 .page-kan-dan-detail {
-  background: #f2f2f2
-    linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
   padding: 118rpx 30rpx 162rpx;
   min-height: 100%;
diff --git a/src/pages/raw/warehouse/rowTransfer/index.vue b/src/pages/raw/warehouse/rowTransfer/index.vue
index 09a63ee..65b618d 100644
--- a/src/pages/raw/warehouse/rowTransfer/index.vue
+++ b/src/pages/raw/warehouse/rowTransfer/index.vue
@@ -7,59 +7,65 @@
       <view class="title">{{ $t('message.RowRelocation') }}</view>
       <view class="right"></view>
     </view>
-    <u-form class="form" label-width="130rpx">
-      <view class="title">{{ $t('message.Warehouse_QueryCriteria') }}</view>
-      <u-form-item :required="true" :label="this.$t('message.Warehouse_OrderNo')">
-        <u-input v-model="order3" :placeholder="this.$t('message.po_PleaseInput')" />
+    <u-form class="form" ref="form" :error-type="['toast']" label-width="150rpx">
+      <!-- 单号查询 -->
+      <u-form-item :required="true" :label="$t('message.InventoryOrderNo')" prop="orderNo">
+        <u-search :placeholder="$t('message.Commission_tips1')" v-model="order3" @search="query" :show-action="false"></u-search>
+      </u-form-item>
+      <!-- 物料号选择 -->
+      <u-form-item :required="true" :label="$t('message.CommissionedMaterielNo')">
+        <u-input v-model="orderlist.productCode" type="select" @click="materialCodeSelect = true" :placeholder="$t('message.Warehouse_Tip6')" />
+        <u-select :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="materialCodeSelect" :list="model.materielList" @confirm="materialConfirm"></u-select>
+      </u-form-item>
+      <!-- 物料描述 -->
+      <u-form-item :label="$t('message.po_MaterielDes')">
+        <u-input :disabled="true" v-model="orderlist.productDescZh" placeholder="" />
+      </u-form-item>
+      <!-- 出库库位 -->
+      <u-form-item :label="$t('message.Outbound')">
+        <u-input :disabled="true" v-model="orderlist.originWl" placeholder="" />
+      </u-form-item>
+      <!-- 入库库位 -->
+      <u-form-item :label="$t('message.Warehousing')">
+        <u-input :disabled="true" v-model="orderlist.aimWl" placeholder="" />
+      </u-form-item>
+      <!-- 总数 -->
+      <u-form-item :label="$t('message.Warehouse_TotalNumber')">
+        <u-input :disabled="true" v-model="orderlist.qty" placeholder="" />
+      </u-form-item>
+      <!-- 本次数量 -->
+      <u-form-item :label="$t('message.CommissionedThisNumber')">
+        <u-input v-model="NEWqty" placeholder="" />
       </u-form-item>
-      <u-row class="button-bar">
-        <u-col :span="4">
-          <u-button type="error" @click="uni.navigateBack()">{{
-            $t('message.po_Return')
-          }}</u-button>
-        </u-col>
-        <u-col :span="8">
-          <u-button type="primary" @click="submit"
-            >{{ $t('message.po_Continue') }}
-          </u-button></u-col
-        >
-      </u-row>
     </u-form>
+    <view class="bottom-bar">
+      <u-row class="button-bar">
+        <!-- 确定 -->
+        <u-col :span="6">
+          <u-button type="primary" @click="submit">{{ $t('message.product_Confirm') }}</u-button>
+        </u-col>
+        <!-- 返回 -->
+        <u-col :span="6">
+          <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
+        </u-col>
+      </u-row>
+    </view>
   </view>
 </template>
-
 <script lang="ts">
 import { Component } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import model from './model';
-
-import { page } from '@/utils/page';
-
+import { session } from '@/store/modules/session';
 @Component
 export default class KanDanHandOver extends BasePage {
   order3 = '';
-  /**
-   * 页面Module
-   */
+  NEWqty = '';
   model = model;
-  // async onKdOrderNoConfirm() {
-  //   if (this.order3 === '') {
-  //     uni.showToast({ icon: 'none', title: '请扫描看单号' });
-  //     return;
-  //   } else {
-  //     try {
-  //       const odr = await order.takeOrder({ order3: this.order3, page: 1, row: 50 });
-  //       order.add({ order: odr });
-  //       // uni.navigateTo({ url: page.raw.warehouse.transfer.details });
-  //     } catch (e) {
-  //       uni.showToast({ icon: 'none', title: e.message });
-  //     }
-  //   }
-  // }
-  // onReady() {
-  //   this.model.takeOrder();
-  // }
-  async submit() {
+  materialCodeSelect = false;
+  orderlist: any = [];
+  //查询单号
+  async query() {
     if (this.order3 === '') {
       uni.showToast({ icon: 'none', title: this.$t('message.Warehouse_Tip') as string });
       return;
@@ -67,12 +73,58 @@ export default class KanDanHandOver extends BasePage {
       await this.model.takeYKOrder({
         order3: this.order3,
       });
-      uni.navigateTo({ url: page.raw.warehouse.rowTransfer.details });
+      if (model.code == '1') {
+        uni.showToast({ icon: 'none', title: this.$t('message.successful') as string });
+        this.orderlist = model.materielList[0];
+        this.NEWqty = model.materielList[0].qty;
+      }
+    }
+  }
+  //选择物料回调函数
+  materialConfirm(v: any) {
+    this.orderlist.productCode = v[0].label;
+    model.materielList.forEach((item: any) => {
+      if (this.orderlist.productCode == item.productCode) {
+        this.orderlist = item;
+        this.NEWqty = item.qty;
+      }
+    });
+  }
+  //提交数据
+  async submit() {
+    if (this.order3 == '') {
+      uni.showToast({ icon: 'none', title: this.$t('message.InventoryPleaseScan') as string });
+      return;
+    }
+    if (this.orderlist.length == 0) {
+      uni.showToast({ icon: 'none', title: this.$t('message.Commission_tips6') as string });
+      return;
+    }
+    if (this.NEWqty == '' || parseFloat(this.NEWqty) == 0) {
+      uni.showToast({ icon: 'none', title: this.$t('message.PleaseQuantity') as string });
+      return;
+    }
+    if (parseFloat(this.NEWqty) > parseFloat(this.orderlist.qty)) {
+      uni.showToast({ icon: 'none', title: this.$t('message.greater') as string });
+      return;
+    }
+    this.orderlist.type = '1';
+    this.orderlist.keepBy = session.loginName;
+    this.orderlist.orderType = '0';
+    this.orderlist.qty = this.NEWqty;
+    let arr = [];
+    arr.push(this.orderlist);
+    await model.onTakeoutConfirm(arr);
+    if (model.code == '1') {
+      uni.showToast({ icon: 'none', title: this.$t('message.Warehouse_Tip9') as string });
+      model.empty();
+      setTimeout(() => {
+        this.toPage(this.page.raw.warehouse.rowTransfer.index);
+      }, 2000);
     }
   }
 }
 </script>
-
 <style lang="scss" scoped>
 .page-kan-dan-index {
   background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
@@ -108,7 +160,6 @@ export default class KanDanHandOver extends BasePage {
       height: 88rpx;
     }
   }
-
   .form {
     background-color: #fff;
     padding: 40rpx;
@@ -116,25 +167,19 @@ export default class KanDanHandOver extends BasePage {
     box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
 
     .u-form-item {
+      padding: 30rpx 0;
       line-height: 35rpx;
-      background-color: #f7f6fb;
-      padding: 10rpx 30rpx;
-      border-radius: 8rpx;
-      &:after {
-        border-bottom-width: 0;
-      }
-    }
-
-    .title {
-      margin-bottom: 40rpx;
-      color: #1a1a1a;
-      font-size: 30rpx;
-      font-weight: 500;
-    }
-
-    .button-bar {
-      margin: 40rpx -10rpx 0;
     }
   }
+  .bottom-bar {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 99;
+    background: #ffffff;
+    box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
+    padding: 20rpx;
+  }
 }
 </style>
diff --git a/src/pages/raw/warehouse/rowTransfer/model.ts b/src/pages/raw/warehouse/rowTransfer/model.ts
index 2c78d2a..ce7f7fc 100644
--- a/src/pages/raw/warehouse/rowTransfer/model.ts
+++ b/src/pages/raw/warehouse/rowTransfer/model.ts
@@ -37,6 +37,8 @@ export class rowTransfer extends VuexModule {
    * 看单明细
    */
   orderInInfoList: OrderInInfo[] = [];
+  materielList = [];
+  code = '';
   /**
    * 看单明细未通过明细
    */
@@ -58,9 +60,15 @@ export class rowTransfer extends VuexModule {
         factoryCode: session.factoryCode,
         loginName: session.loginName,
       });
+      console.log('records', records);
+      const code = records.code;
       const orderInInfoList = records.data.records;
-      console.log('获取来的数据', orderInInfoList);
-      return { orderInInfoList };
+      const materielList = orderInInfoList.map((item: any) => ({
+        label: item.productCode,
+        value: item.stoItem,
+        ...item,
+      }));
+      return { orderInInfoList, materielList, code };
     } catch {
       uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any });
     }
@@ -69,16 +77,14 @@ export class rowTransfer extends VuexModule {
   @MutationAction
   async onTakeoutConfirm(list: any) {
     const records: any = await http.post(url.warehouse.rowTransfer.commit, list);
-    if (records.code == 1) {
-      uni.showToast({
-        icon: 'success',
-        title: 'success',
-      });
-      // setTimeout(() => {
-      //   uni.navigateTo({ url: page.raw.warehouse.rowTransfer.index });
-      // }, 2000);
-    }
-    return {};
+    const code = records.code;
+    return { code };
+  }
+  //清除数据
+  @MutationAction
+  async empty() {
+    const materielList = [];
+    return { materielList };
   }
 }