diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
index 8d4fca0a..22ad11cd 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
@@ -228,8 +228,7 @@
                 LEFT JOIN jg_voucher_vehicle b ON b.voucher_id = a.id AND b.f_delete_mark IS NULL
                 LEFT JOIN jg_voucher_product c ON c.voucher_id = a.id AND c.f_delete_mark IS NULL
                 LEFT JOIN jg_vehicle d ON a.vehicle_id = d.id AND d.f_delete_mark IS NULL
-                LEFT JOIN flow_task e ON a.id = e.f_process_id
-            ${ew.customSqlSegment} AND e.f_status = 2
+            ${ew.customSqlSegment}
     </select>
 
     <select id="querySaleReceiptVoucher" resultMap="voucherList">
@@ -493,8 +492,7 @@
                 LEFT JOIN jg_voucher_product b ON a.id=b.voucher_id
                 LEFT JOIN jg_product c ON b.product_id=c.id
                 LEFT JOIN jg_vehicle d ON a.vehicle_id = d.id
-                LEFT JOIN flow_task e ON a.id = e.f_process_id
-            ${ew.customSqlSegment} AND e.f_status = 2 AND a.id not in (SELECT voucher_id from jg_warehousing_storage_poundlist where f_delete_mark is null)
+            ${ew.customSqlSegment}  AND a.id not in (SELECT voucher_id from jg_warehousing_storage_poundlist where f_delete_mark is null)
         ORDER BY
             a.f_creator_time DESC
 
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingReturnMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingReturnMapper.xml
index 30c88d22..07e98ed8 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingReturnMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingReturnMapper.xml
@@ -13,9 +13,72 @@
         <result column="theoryNum" property="theoryNum"></result>
         <result column="returnUnit" property="returnUnit"></result>
         <result column="batchNumber" property="batchNumber"></result>
+    </resultMap>
+
+    <resultMap id="warehousingreturnList" type="jnpf.entity.WarehousingReturnEntity">
+        <id column="id" property="id"></id>
+        <result column="return_code" property="returnCode"></result>
+        <result column="warehouse_id" property="warehouseId"></result>
+        <result column="return_time" property="returnTime"></result>
+        <result column="return_reason" property="returnReason"></result>
+        <result column="return_status" property="returnStatus"></result>
+        <result column="business_id" property="businessId"></result>
+        <result column="remark" property="remark"></result>
+        <result column="f_creator_time" property="creatorTime"></result>
+        <result column="f_creator_user_id" property="creatorUserId"></result>
+        <result column="f_last_modify_time" property="lastModifyTime"></result>
+        <result column="f_last_modify_user_id" property="lastModifyUserId"></result>
+        <result column="business_type" property="businessType"></result>
+        <result column="realName" property="realName"/>
+        <result column="realNameA" property="realNameA"/>
+        <result column="returnNum" property="returnNum"/>
+        <result column="returnReason1" property="returnReason1"/>
+        <result column="warehouseName" property="warehouseName"/>
 
     </resultMap>
 
+    <select id="queryWarehousingReturnList" resultMap="warehousingreturnList">
+        SELECT
+            a.*,
+            SUM( b.return_number ) AS returnNum,
+            CASE
+                a.return_reason
+                WHEN '1' THEN
+                    '质量问题'
+                WHEN '1' THEN
+                    '客户退回'
+                WHEN '3' THEN
+                    '试用'
+                WHEN '4' THEN
+                    '临期报废'
+                WHEN '5' THEN
+                    '维修'
+                WHEN '6' THEN
+                    '保养'
+                WHEN '7' THEN
+                    '作业工具'
+                WHEN '8' THEN
+                    '其他'
+                END AS returnReason1,
+            c.f_real_name AS realName,
+            d.f_real_name AS realNameA,
+            e.NAME AS warehouseName
+        FROM
+            jg_warehousing_return a
+                LEFT JOIN jg_warehousing_return_product b ON a.id = b.return_id
+                LEFT JOIN base_user c ON a.f_creator_user_id = c.f_id
+                LEFT JOIN base_user d ON a.f_last_modify_user_id = d.f_id
+                LEFT JOIN jg_business_line e ON a.warehouse_id = e.id
+            ${ew.customSqlSegment}
+        GROUP BY
+        a.id
+        <if test="warehousingReturnPagination.sidx != null and warehousingReturnPagination.sidx != ''">
+            ORDER BY ${warehousingReturnPagination.sidx} ${warehousingReturnPagination.sort}
+        </if>
+
+    </select>
+
+
     <select id="queryReturnNum" resultType="String">
         SELECT SUM(return_number) AS returnNum FROM jg_warehousing_return_product t1
         LEFT JOIN jg_warehousing_return t2 ON t2.id=t1.return_id
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingReturnMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingReturnMapper.java
index 3323d310..4f49aa2b 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingReturnMapper.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingReturnMapper.java
@@ -1,9 +1,13 @@
 package jnpf.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.entity.ProductWarehouseEntity;
 import jnpf.entity.WarehousingReturnEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.model.warehousingreturn.WarehousingReturnPagination;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,4 +25,6 @@ public interface WarehousingReturnMapper extends BaseMapper<WarehousingReturnEnt
 
     //加工单根据商品成品查询bom带出原材料2
     List<ProductWarehouseEntity> queryReturnReceiveProduct(@Param("id") String id);
+
+    IPage<WarehousingReturnEntity> queryWarehousingReturnList(@Param("page")Page<WarehousingReturnEntity> page, @Param("warehousingReturnPagination") WarehousingReturnPagination warehousingReturnPagination, @Param("ew")Wrapper<WarehousingReturnEntity> warehousingReturnQueryWrapper);
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BomServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BomServiceImpl.java
index 7d3911c6..fa32091b 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BomServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BomServiceImpl.java
@@ -30,6 +30,9 @@ import jnpf.util.*;
 import java.util.*;
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
+import javax.annotation.Resource;
+
 /**
  *
  * bom
@@ -52,7 +55,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
     private BomItemService bomItemService;
     @Autowired
     private BomItemValueService bomItemValueService;
-    @Autowired
+    @Resource
     private BomMapper bomMapper;
     @Override
     public List<BomEntity> getList(BomPagination bomPagination){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
index e4ccdaa7..c2bdc6b4 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
@@ -794,7 +794,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
         queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
         queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"c.product_id",voucherPagination.getProductIdList());
         queryWrapper.isNull("a.f_delete_mark");
-        queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+//        queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的凭证
         queryWrapper.like("a.organize_json_id",organize);
         Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
         IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherPopup1(page,queryWrapper);
@@ -815,7 +815,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
         queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
         queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList());
         queryWrapper.isNull("a.f_delete_mark");
-        queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+//        queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
         queryWrapper.like("a.organize_json_id",organize);
 
         queryWrapper.eq("a.delivery_type","1"); //取仓配的凭证
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReturnServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReturnServiceImpl.java
index 20baf0ae..63ef6323 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReturnServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingReturnServiceImpl.java
@@ -30,6 +30,9 @@ import jnpf.util.*;
 import java.util.*;
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
+import javax.annotation.Resource;
+
 /**
  *
  * warehousingReturn
@@ -41,14 +44,14 @@ import jnpf.permission.entity.UserEntity;
 @Service
 public class WarehousingReturnServiceImpl extends ServiceImpl<WarehousingReturnMapper, WarehousingReturnEntity> implements WarehousingReturnService{
     @Autowired
-    private GeneraterSwapUtil generaterSwapUtil;
+    private GeneraterSwapUtil2 generaterSwapUtil;
 
     @Autowired
     private UserProvider userProvider;
 
     @Autowired
     private WarehousingReturnProductService warehousingReturnProductService;
-    @Autowired
+    @Resource
     private WarehousingReturnMapper warehousingReturnMapper;
     @Override
     public List<WarehousingReturnEntity> getList(WarehousingReturnPagination warehousingReturnPagination){
@@ -194,8 +197,8 @@ public class WarehousingReturnServiceImpl extends ServiceImpl<WarehousingReturnM
                     Long fir = Long.valueOf(String.valueOf(CreatorTimeList.get(0)));
                     Long sec = Long.valueOf(String.valueOf(CreatorTimeList.get(1)));
 
-                    warehousingReturnQueryWrapper.lambda().ge(WarehousingReturnEntity::getCreatorTime, new Date(fir))
-                    .le(WarehousingReturnEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+                warehousingReturnQueryWrapper.ge("a.F_CREATOR_TIME", new Date(fir))
+                        .le("a.F_CREATOR_TIME", DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
 
 
             }
@@ -203,7 +206,8 @@ public class WarehousingReturnServiceImpl extends ServiceImpl<WarehousingReturnM
             if(ObjectUtil.isNotEmpty(warehousingReturnPagination.getCreatorUserId())){
             warehousingReturnNum++;
 
-        warehousingReturnQueryWrapper.lambda().eq(WarehousingReturnEntity::getCreatorUserId,warehousingReturnPagination.getCreatorUserId());
+//        warehousingReturnQueryWrapper.lambda().eq(WarehousingReturnEntity::getCreatorUserId,warehousingReturnPagination.getCreatorUserId());
+        warehousingReturnQueryWrapper.eq("a.CREATOR_USER_ID",warehousingReturnPagination.getCreatorUserId());
 
             }
 
@@ -213,8 +217,7 @@ public class WarehousingReturnServiceImpl extends ServiceImpl<WarehousingReturnM
                 String value = warehousingReturnPagination.getReturnCode() instanceof List ?
                     JsonUtil.getObjectToString(warehousingReturnPagination.getReturnCode()) :
                     String.valueOf(warehousingReturnPagination.getReturnCode());
-                warehousingReturnQueryWrapper.lambda().like(WarehousingReturnEntity::getReturnCode,value);
-
+                warehousingReturnQueryWrapper.like( "a.RETURN_CODE",value);
             }
 
             if(ObjectUtil.isNotEmpty(warehousingReturnPagination.getReturnTime())){
@@ -224,10 +227,8 @@ public class WarehousingReturnServiceImpl extends ServiceImpl<WarehousingReturnM
                     Long fir = Long.valueOf(String.valueOf(ReturnTimeList.get(0)));
                     Long sec = Long.valueOf(String.valueOf(ReturnTimeList.get(1)));
 
-                    warehousingReturnQueryWrapper.lambda().ge(WarehousingReturnEntity::getReturnTime, new Date(fir))
-                    .le(WarehousingReturnEntity::getReturnTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-
-
+                    warehousingReturnQueryWrapper.ge("a.RETURN_TIME", new Date(fir))
+                    .le("a.RETURN_TIME", DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
             }
 
             if(ObjectUtil.isNotEmpty(warehousingReturnPagination.getReturnReason())){
@@ -251,9 +252,9 @@ public class WarehousingReturnServiceImpl extends ServiceImpl<WarehousingReturnM
         idList.add(String.valueOf(warehousingReturnPagination.getReturnReason()));
         }
         }
-        warehousingReturnQueryWrapper.lambda().and(t->{
-        idList.forEach(tt->{
-        t.like(WarehousingReturnEntity::getReturnReason, tt).or();
+        warehousingReturnQueryWrapper.and(t->{
+            idList.forEach(tt->{
+                t.like("a.RETURN_REASON", tt).or();
         });
         });
 
@@ -274,30 +275,31 @@ public class WarehousingReturnServiceImpl extends ServiceImpl<WarehousingReturnM
             if (intersection.size()==0){
                 intersection.add("jnpfNullList");
             }
-            warehousingReturnQueryWrapper.lambda().in(WarehousingReturnEntity::getId, intersection);
-        }
+            warehousingReturnQueryWrapper.in("a.id", intersection);        }
     //是否有高级查询
         if (StringUtil.isNotEmpty(superOp)){
             if (allSuperIDlist.size()==0){
                 allSuperIDlist.add("jnpfNullList");
             }
             List<String> finalAllSuperIDlist = allSuperIDlist;
-            warehousingReturnQueryWrapper.lambda().and(t->t.in(WarehousingReturnEntity::getId, finalAllSuperIDlist));
-        }
+            warehousingReturnQueryWrapper.and(t->t.in("a.id", finalAllSuperIDlist));        }
     //是否有数据过滤查询
         if (StringUtil.isNotEmpty(ruleOp)){
             if (allRuleIDlist.size()==0){
                 allRuleIDlist.add("jnpfNullList");
             }
             List<String> finalAllRuleIDlist = allRuleIDlist;
-            warehousingReturnQueryWrapper.lambda().and(t->t.in(WarehousingReturnEntity::getId, finalAllRuleIDlist));
+            warehousingReturnQueryWrapper.and(t->t.in("a.id", finalAllRuleIDlist));
         }
         //假删除标志
-        warehousingReturnQueryWrapper.lambda().isNull(WarehousingReturnEntity::getDeleteMark);
+//        warehousingReturnQueryWrapper.lambda().isNull(WarehousingReturnEntity::getDeleteMark);
+        warehousingReturnQueryWrapper.isNull("a.f_delete_mark");
 
         //排序
         if(StringUtil.isEmpty(warehousingReturnPagination.getSidx())){
-            warehousingReturnQueryWrapper.lambda().orderByDesc(WarehousingReturnEntity::getId);
+//            warehousingReturnQueryWrapper.lambda().orderByDesc(WarehousingReturnEntity::getId);
+            warehousingReturnPagination.setSidx("a.f_creator_time");
+            warehousingReturnPagination.setSort("DESC");
         }else{
             try {
                 String sidx = warehousingReturnPagination.getSidx();
@@ -306,7 +308,8 @@ public class WarehousingReturnServiceImpl extends ServiceImpl<WarehousingReturnM
                 Field declaredField = warehousingReturnEntity.getClass().getDeclaredField(strs[0]);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                warehousingReturnQueryWrapper="asc".equals(warehousingReturnPagination.getSort().toLowerCase())?warehousingReturnQueryWrapper.orderByAsc(value):warehousingReturnQueryWrapper.orderByDesc(value);
+//                warehousingReturnQueryWrapper="asc".equals(warehousingReturnPagination.getSort().toLowerCase())?warehousingReturnQueryWrapper.orderByAsc(value):warehousingReturnQueryWrapper.orderByDesc(value);
+                warehousingReturnPagination.setSidx("a." + value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }
@@ -315,8 +318,10 @@ public class WarehousingReturnServiceImpl extends ServiceImpl<WarehousingReturnM
         if("0".equals(dataType)){
             if((total>0 && AllIdList.size()>0) || total==0){
                 Page<WarehousingReturnEntity> page=new Page<>(warehousingReturnPagination.getCurrentPage(), warehousingReturnPagination.getPageSize());
-                IPage<WarehousingReturnEntity> userIPage=this.page(page, warehousingReturnQueryWrapper);
+//                IPage<WarehousingReturnEntity> userIPage=this.page(page, warehousingReturnQueryWrapper);
+                IPage<WarehousingReturnEntity> userIPage =warehousingReturnMapper.queryWarehousingReturnList(page,warehousingReturnPagination,warehousingReturnQueryWrapper);
                 return warehousingReturnPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+
             }else{
                 List<WarehousingReturnEntity> list = new ArrayList();
                 return warehousingReturnPagination.setData(list, list.size());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
index 80922963..8f1e729f 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
@@ -699,7 +699,6 @@ public class WarehousingNotificationController {
             QueryWrapper<WarehousingProductEntity> warehousingProductEntityQueryWrapper=new QueryWrapper<>();
             warehousingProductEntityQueryWrapper.lambda().eq(WarehousingProductEntity::getWarehousingId,id);
             warehousingProductEntityQueryWrapper.like("organize_json_id",organize);
-//
 
         List<WarehousingProductEntity> warehousingProductEntityList = warehousingProductService.list(warehousingProductEntityQueryWrapper);
             List<VoucherEntity> list=new ArrayList<>();
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java
index 2b4d1880..866cd57b 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java
@@ -119,7 +119,7 @@ public class WarehousingReturnController {
         List<WarehousingReturnEntity> list= warehousingReturnService.getList(warehousingReturnPagination);
         List<Map<String, Object>> realList=new ArrayList<>();
         for (WarehousingReturnEntity entity : list) {
-            entity.setReturnNum(warehousingReturnService.queryReturnNum(entity.getId()));
+//            entity.setReturnNum(warehousingReturnService.queryReturnNum(entity.getId()));
             if (entity.getBusinessType().equals("1")){
                 WarehousingReceiveEntity warehousingReceiveEntity =warehousingReceiveService.getInfo(entity.getBusinessId());
                 if (warehousingReceiveEntity!=null){
@@ -142,7 +142,7 @@ public class WarehousingReturnController {
             realList.add(warehousingReturnMap);
         }
         //数据转换
-        realList = generaterSwapUtil.swapDataList(realList, WarehousingReturnConstant.getFormData(), WarehousingReturnConstant.getColumnData(), warehousingReturnPagination.getModuleId(),false);
+//        realList = generaterSwapUtil.swapDataList(realList, WarehousingReturnConstant.getFormData(), WarehousingReturnConstant.getColumnData(), warehousingReturnPagination.getModuleId(),false);
 
         //流程状态添加
         for(Map<String, Object> vo:realList){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnEntity.java
index e8fea992..38b32f68 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnEntity.java
@@ -66,4 +66,12 @@ public class WarehousingReturnEntity  {
 
     @TableField(exist = false)
     private String businessReceive;
+    @TableField(exist = false)
+    private String returnReason1;
+    @TableField(exist = false)
+    private String warehouseName;
+    @TableField(exist = false)
+    private String realName;
+    @TableField(exist = false)
+    private String realNameA;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue
index e8e61525..8eac5421 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue
@@ -80,13 +80,17 @@
           <el-table-column prop="returnCode" label="返库单编号" align="center" sortable width="200"
             fixed="left">
           </el-table-column>
-          <el-table-column prop="warehouseId" label="仓库名称" align="center" width="150">
+          <el-table-column prop="warehouseName" label="仓库名称" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="returnTime" label="返库时间" align="center" width="150">
+          <el-table-column prop="returnTime" label="返库时间" align="center" width="100" sortable>
+            <template slot-scope="scope">
+              {{ scope.row.returnTime | toDate("yyyy-MM-dd") }}
+            </template>
           </el-table-column>
-          <el-table-column label="返库原因" prop="returnReason" align="center" width="150">
+
+          <el-table-column label="返库原因" prop="returnReason1" align="center" width="150">
             <template slot-scope="scope">
-              {{ scope.row.returnReason}}
+              {{ scope.row.returnReason1}}
             </template>
           </el-table-column>
           <el-table-column prop="businessReceive" label="关联单据" align="center" width="200">
@@ -95,13 +99,22 @@
           <el-table-column prop="returnNum" label="返库总数量" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="100" sortable>
+            <template slot-scope="scope">
+              {{ scope.row.creatorTime | toDate("yyyy-MM-dd") }}
+            </template>
           </el-table-column>
-          <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
+
+          <el-table-column prop="realName" label="创建用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
+
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="100" sortable>
+            <template slot-scope="scope">
+              {{ scope.row.lastModifyTime | toDate("yyyy-MM-dd") }}
+            </template>
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
+
+          <el-table-column prop="realNameA" label="修改用户" align="center" width="150">
           </el-table-column>
           <el-table-column prop="flowState" label="状态" align="center" width="150">
             <template slot-scope="scope" v-if="!scope.row.top">