diff --git a/src/pages.json b/src/pages.json
index 96acbbc..2b649f9 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -464,6 +464,14 @@
         "navigationBarTextStyle": "white"
       }
     },
+    {
+      "path": "pages/wms/WhiteManagement/WhiteReturn/index",
+      "style": {
+        "navigationBarTitleText": "白胚退货入库",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+      }
+    },
     {
       "path": "pages/wms/WhiteManagement/TransferInlibrary/index",
       "style": {
diff --git a/src/pages/wms/WhiteManagement/WhiteReturn/index.vue b/src/pages/wms/WhiteManagement/WhiteReturn/index.vue
new file mode 100644
index 0000000..8a1ce36
--- /dev/null
+++ b/src/pages/wms/WhiteManagement/WhiteReturn/index.vue
@@ -0,0 +1,508 @@
+<template>
+  <view class="page-product-receipt">
+    <view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
+      <view class="left">
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
+      </view>
+      <view class="title">退货入库</view>
+      <view class="right"></view>
+    </view>
+    <view class="fiexdcontent">
+      <u-form class="form" ref="form" label-width="180rpx">
+        <!-- 单号 -->
+        <view class="single">
+          <view class="single-left">
+            <view>托盘号:</view>
+            <u-search placeholder="请扫描" v-model="orderNo" :show-action="false"></u-search>
+          </view>
+          <!-- <view class="single-right">
+            <u-button type="primary" @click="query">提单</u-button>
+          </view> -->
+        </view>
+        <!-- 订单 -->
+        <u-form-item label="仓库">
+          <!-- <u-input :border="true" v-model="histroyItem.productDescZh" placeholder="" style="overflow: hidden" /> -->
+          <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="label" valKey="value" :val="aimWl.value" :options="warehouselist" />
+        </u-form-item>
+        <u-form-item label="物料编码">
+          <!-- <u-input :border="true" v-model="histroyItem.productDescZh" placeholder="" style="overflow: hidden" /> -->
+          <u-search placeholder="请扫描" v-model="materialCode" @search="query" :show-action="false"></u-search>
+        </u-form-item>
+        <!-- 机台 -->
+        <!-- <u-form-item label="出库仓库"> 成品库 </u-form-item> -->
+      </u-form>
+      <u-form style="margin-top: 1rpx" class="form3">
+        <view class="list">
+          <!-- <view class="row-list">
+            <view class="list-item"> 物料编码: </view>
+            <view> {{ orderNoItemList && orderNoItemList.materialCode }} </view>
+          </view> -->
+          <view class="row-list">
+            <view class="list-item"> 物料名称: </view>
+            <view> {{ orderNoItemList && orderNoItemList.materialDesc }} </view>
+          </view>
+          <view class="row-list">
+            <view class="row-list-item">
+              <view class="list-item"> 退料数量: </view>
+              <u-input :border="true" v-model="amount" placeholder="" style="overflow: hidden" />
+            </view>
+            <view class="row-list-item">
+              <view class="list-item"> 单位: </view>
+              <view> {{ orderNoItemList && orderNoItemList.userDefined1 }} </view>
+            </view>
+          </view>
+          <view class="row-list">
+            <view class="list-item"> 入库库位: </view>
+            <u-input :border="true" v-model="wlCode" placeholder="" style="overflow: hidden" />
+          </view>
+
+          <!-- <view class="row-list">
+            <view class="list-item">捡货数量: </view>
+            <view> {{ outnumber }} </view>
+          </view> -->
+        </view>
+      </u-form>
+    </view>
+    <view class="bottom-bar">
+      <u-row class="button-bar">
+        <!-- 确定 -->
+        <u-col :span="6">
+          <u-button @click="onSubmit" type="primary">确认</u-button>
+        </u-col>
+        <!-- 返回 -->
+        <u-col :span="6">
+          <u-button type="error" @click="uni.navigateBack({})">返回</u-button>
+        </u-col>
+      </u-row>
+    </view>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+<script lang="ts">
+import { Component } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import jPicker from '@/components/J-Picker/jPicker.vue';
+import model from './model';
+import { session } from '@/store/modules/session';
+interface OptionType {
+  label: string;
+  value: string;
+}
+//import { session } from '@/store/modules/session';
+@Component({
+  components: {
+    jPicker,
+  },
+})
+export default class WhiteReturn extends BasePage {
+  model = model;
+  aimWl = {} as OptionType;
+  orderNo: any = '';
+  border = true;
+  orderNoItemList: any = [];
+  warehouselist = [];
+  materialCode: any = '';
+  amount = 0;
+  wlCode: any = '';
+
+  async onLoad() {
+    await this.model.getwarehouselist();
+    this.warehouselist = model.warehouselist;
+    this.aimWl = this.warehouselist[0];
+  }
+  bookTypeChange(e: any) {
+    this.aimWl = e.pickerName;
+  }
+
+  //查询物料信息
+  async query() {
+    if (this.materialCode == '') {
+      (this.$refs.uToast as any).show({
+        title: '请输入物料编码',
+        // url: '/pages/user/index'
+      });
+      return;
+    }
+    await this.model.showProduceCode(this.materialCode);
+    if (model.orderNoItemList) {
+      this.orderNoItemList = model.orderNoItemList;
+    }
+  }
+
+  async onSubmit() {
+    if (this.orderNo == '' || this.orderNo.length == 0) {
+      (this.$refs.uToast as any).show({
+        title: '请输入托盘号',
+        // url: '/pages/user/index'
+      });
+      return;
+    }
+    if (this.amount == '' || this.amount <= 0) {
+      (this.$refs.uToast as any).show({
+        title: '请输入退货数量',
+        // url: '/pages/user/index'
+      });
+      return;
+    }
+    let params = {
+      factoryCode: session.FactoryCode,
+      materialCode: this.orderNoItemList.materialCode,
+      materialDesc: this.orderNoItemList.materialDesc,
+      userDefined1: this.orderNoItemList.userDefined1,
+      wlCode: this.wlCode,
+      amount: this.amount,
+      sn: this.orderNo,
+      createBy: session.loginName,
+      whCode: this.aimWl.value,
+    };
+    await this.model.into(params);
+    if (this.model.SubmitCode == '200') {
+      (this.$refs.uToast as any).show({
+        title: '成功',
+        type: 'success',
+      });
+      this.orderNo = '';
+      this.materialCode = '';
+      this.orderNoItemList = {};
+      this.amount = 0;
+      this.wlCode = '';
+    } else {
+      (this.$refs.uToast as any).show({
+        title: '失败',
+        type: 'error',
+      });
+      // this.getlist();
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.page-product-receipt {
+  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat;
+  background-size: 100% 600rpx;
+  padding: 118rpx 30rpx 162rpx;
+  min-height: 100%;
+
+  .header {
+    position: fixed;
+    top: 0rpx;
+    left: 0;
+    right: 0;
+    z-index: 99;
+    display: flex;
+    height: 120rpx;
+    line-height: 88rpx;
+    color: #fff;
+    font-size: 34rpx;
+    font-weight: 500;
+    text-align: center;
+    padding: 45rpx 0rpx 0rpx;
+
+    .title {
+      flex: 3;
+    }
+
+    .left,
+    .right {
+      flex: 1;
+    }
+
+    .icon {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 88rpx;
+      height: 88rpx;
+    }
+  }
+
+  .fiexdcontent {
+    position: fixed;
+    width: 92%;
+    box-shadow: 0 0 14px 0 rgb(128 128 128 / 46%);
+    z-index: 100;
+  }
+  .form {
+    background-color: #fff;
+    padding: 30rpx;
+    border-radius: 10rpx;
+    //box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
+
+    .u-form-item {
+      padding: 20rpx 0;
+      line-height: 35rpx;
+
+      .Transfer {
+        width: 280rpx;
+        height: 64rpx;
+        background: rgb(242, 242, 242);
+        border-radius: 110rpx;
+      }
+    }
+
+    .single {
+      width: 100%;
+      height: 60rpx;
+      display: flex;
+
+      .single-left {
+        width: 80%;
+        height: 100%;
+        display: flex;
+
+        view {
+          width: 142rpx;
+          height: 100%;
+          line-height: 55rpx;
+        }
+      }
+
+      .single-right {
+        button {
+          // margin-top: 15rpx;
+          width: 140rpx;
+          height: 70rpx;
+          background-color: #fa3534;
+        }
+      }
+    }
+
+    .row {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-around;
+      flex: 1;
+    }
+  }
+  .form3 {
+    background-color: #fff;
+    padding: 25rpx 25rpx 25rpx;
+    border-radius: 10rpx;
+    //box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
+    //color: #8d8989;
+    // .list {
+    //   display: flex;
+    //   flex-direction: row;
+    // }
+    .row-list {
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      padding: 4px 0px;
+      .row-list-item {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        width: 50%;
+      }
+      .list-item {
+        display: flex;
+        flex-direction: row;
+        flex: 1;
+        margin: auto;
+      }
+    }
+
+    .righttitle {
+      display: flex;
+      justify-content: flex-end;
+
+      .boder-icon-rigth {
+        border: 1rpx solid #fa3534;
+        width: 130rpx;
+        text-align: center;
+        background: #fa3534;
+        color: #ffffff;
+        margin-top: 10px;
+      }
+    }
+  }
+  .form4 {
+    background-color: #fff;
+    padding: 18rpx;
+    border-radius: 10rpx;
+    margin-top: 2rpx;
+    .u-input__input {
+      min-height: 36px;
+    }
+  }
+
+  .scroll {
+    // margin-top: 2rpx;
+    height: 460rpx;
+    position: absolute;
+    width: 92%;
+    top: 770rpx;
+    /* bottom: 40px; */
+    overflow: auto;
+    .form2 {
+      background-color: #fff;
+      padding: 25rpx 25rpx 25rpx;
+      border-radius: 10rpx;
+      box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
+      color: #8d8989;
+      .list {
+        display: flex;
+        flex-direction: row;
+        .rowleft {
+          width: 90%;
+          .row-list {
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            .row-list-item {
+              display: flex;
+              flex-direction: row;
+              justify-content: space-between;
+              width: 48%;
+            }
+            .list-item {
+              display: flex;
+              flex-direction: row;
+              flex: 1;
+            }
+          }
+        }
+        .rowright {
+          width: 20%;
+          display: flex;
+          justify-content: right;
+          .righttitle {
+            width: 60%;
+            background-color: #8d898947;
+            color: red;
+            text-align: center;
+            /* margin: auto; */
+            height: 100%;
+            line-height: 70rpx;
+          }
+        }
+      }
+
+      // .righttitle {
+      //   display: flex;
+      //   justify-content: flex-end;
+
+      //   .boder-icon-rigth {
+      //     border: 1rpx solid #fa3534;
+      //     width: 130rpx;
+      //     text-align: center;
+      //     background: #fa3534;
+      //     color: #ffffff;
+      //     margin-top: 10px;
+      //   }
+
+      //   .zhuangtai {
+      //     background: #a7a0a04a;
+      //     width: 224rpx;
+      //     margin-right: -27rpx;
+      //     border: 2rpx solid #a7a0a04a;
+      //     border-radius: 12rpx;
+      //     text-align: center;
+      //     margin-bottom: 10rpx;
+      //   }
+
+      //   .zhuangtai[data-state='1'] {
+      //     color: green;
+      //   }
+
+      //   .zhuangtai[data-state='0'] {
+      //     color: blue;
+      //   }
+      // }
+    }
+  }
+
+  .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;
+  }
+
+  .button-bar {
+  }
+
+  .photoList {
+    display: flex;
+    padding-top: 12rpx;
+
+    .chooseBtn {
+      width: 202rpx;
+      height: 202rpx;
+      background: #fafafa;
+      border-radius: 12rpx;
+      border: 2rpx dashed #e2e2e2;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      .inner {
+        text-align: center;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+      }
+
+      .desc {
+        font-size: 28rpx;
+        font-weight: 400;
+        color: #24252a;
+        line-height: 40rpx;
+      }
+
+      .img {
+        width: 50rpx;
+        height: 50rpx;
+        margin-bottom: 6rpx;
+      }
+    }
+
+    .photoBox {
+      width: 202rpx;
+      height: 202rpx;
+      background: #fafafa;
+      border-radius: 12rpx;
+      position: relative;
+
+      .closeBtn {
+        position: absolute;
+        top: -12rpx;
+        right: -12rpx;
+        z-index: 2;
+        width: 36rpx;
+        height: 36rpx;
+
+        .img {
+          width: 36rpx;
+          height: 36rpx;
+        }
+      }
+
+      .img {
+        width: 202rpx;
+        height: 202rpx;
+        border-radius: 12rpx;
+      }
+    }
+
+    .itemBox {
+      flex: 0 0 202rpx;
+      margin-right: 20rpx;
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+
+    // /deep/ .remarksBox textarea {
+    //   font-size: 24rpx;
+    // }
+  }
+}
+</style>
diff --git a/src/pages/wms/WhiteManagement/WhiteReturn/model.ts b/src/pages/wms/WhiteManagement/WhiteReturn/model.ts
new file mode 100644
index 0000000..5e1b49e
--- /dev/null
+++ b/src/pages/wms/WhiteManagement/WhiteReturn/model.ts
@@ -0,0 +1,46 @@
+import { 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';
+@Module({
+  namespaced: true,
+  dynamic: true,
+  store,
+  name: 'page.WhiteManagement.WhiteReturn',
+})
+export class WhiteReturn extends VuexModule {
+  orderNoItemList: any = {};
+  @MutationAction
+  async showProduceCode(materialCode: any) {
+    const result: any = await http.post(url.lanjuwms.WhiteManagement.WhiteReturn.queryMaterialInfor, {
+      materialCode: materialCode,
+      factoryCode: session.FactoryCode,
+    });
+    // http.defaults.headers.common['Accept-Language'] = session.PoolName;
+    const orderNoItemList = result.data;
+    return { orderNoItemList };
+  }
+  SubmitCode: any = '';
+  @MutationAction
+  async into(params: any) {
+    const result: any = await http.post(url.lanjuwms.WhiteManagement.WhiteReturn.WhiteBilletReturnConfir, params);
+    const SubmitCode = result.code;
+    return { SubmitCode };
+  }
+  warehouselist: any = [];
+  @MutationAction
+  async getwarehouselist() {
+    const result = await http.post(url.lanjuwms.raw.ProductionREQ.warehouselist, {
+      factoryCode: session.FactoryCode,
+    });
+    const warehouselist = result.data.map((element: any) => ({
+      label: element.warehouseName,
+      value: element.warehouseCode,
+      ...element,
+    }));
+    return { warehouselist };
+  }
+}
+
+export default getModule(WhiteReturn);
diff --git a/src/pages/wms/index.vue b/src/pages/wms/index.vue
index 9b8f6a4..9786cd7 100644
--- a/src/pages/wms/index.vue
+++ b/src/pages/wms/index.vue
@@ -150,9 +150,20 @@
           :label="item.menuName"
           label-pos="bottom"
           size="80"
-          :name="item.menuName == '白胚入库' ? '../../static/icons/icon-54.png' : item.menuName == '白胚出库' ? '../../static/icons/icon-55.png' : '../../static/icons/icon-56.png'"
+          :name="item.menuName == '白胚入库' || '退货入库' ? '../../static/icons/icon-54.png' : item.menuName == '白胚出库' ? '../../static/icons/icon-55.png' : '../../static/icons/icon-56.png'"
         ></u-icon>
         <!-- 写死菜单 -->
+        <!-- <u-icon
+          @click="
+            uni.navigateTo({
+              url: page.wms.WhiteReturn,
+            })
+          "
+          label="退货入库"
+          label-pos="bottom"
+          size="80"
+          name="../../static/icons/icon-54.png"
+        ></u-icon> -->
       </view>
     </view>
     <!-- 以下为写死的菜单 -->
diff --git a/src/utils/page.ts b/src/utils/page.ts
index 3a448f6..ab4797a 100644
--- a/src/utils/page.ts
+++ b/src/utils/page.ts
@@ -37,5 +37,6 @@ export const page = {
     WhiteInstorage: '/pages/wms/WhiteManagement/WhiteInstorage/index',
     WhiteOutstorage: '/pages/wms/WhiteManagement/WhiteOutstorage/index',
     TransferInlibrary: '/pages/wms/WhiteManagement/TransferInlibrary/index',
+    WhiteReturn: '/pages/wms/WhiteManagement/WhiteReturn/index',
   },
 };
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 22d9cca..e29761c 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -115,6 +115,10 @@ export const url = {
       TransferInlibrary: {
         WhiteWarehouseDump: qianzhuione + '/wms/WmsToWCSmission/WhiteWarehouseDump',
       },
+      WhiteReturn: {
+        queryMaterialInfor: qianzhuione + '/wms/WmsToWCSmission/queryMaterialInfor',
+        WhiteBilletReturnConfir: qianzhuione + '/wms/WmsToWCSmission/WhiteBilletReturnConfir',
+      },
     },
   },
   // 设备管理