diff --git a/wms/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeVo.java b/wms/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeVo.java
index f58bc1b..abe4f04 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeVo.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeVo.java
@@ -36,4 +36,7 @@ public class BaseGoodsTypeVo implements Vo {
     private String createOrgSid;//创建组织sid
     private String sids;//创建组织sid
     private String outStockRule;//出库规则
+    private String outStockRuleVaule;//出库规则
+    private String userSid;
+    private String orgPath;
 }
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitDto.java b/wms/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitDto.java
index 650a6e6..254c591 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitDto.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitDto.java
@@ -26,4 +26,6 @@ public class BaseGoodsUnitDto implements Dto {
     private String unitName;//单位名称
     private String userSid;
     private String orgPath;
+    private String useOrgSid;//使用组织sid
+    private String createOrgSid;//创建组织sid
 }
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfo.java b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfo.java
index fec0ae3..b79d6f9 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfo.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfo.java
@@ -108,5 +108,5 @@ public class SupplierInfo extends BaseEntity {
     private String createOrgName; // 创建组织名称
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-
+    private double taxRate;
 }
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDetailsVo.java b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDetailsVo.java
index 772f7be..3c70590 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDetailsVo.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDetailsVo.java
@@ -113,4 +113,6 @@ public class SupplierInfoDetailsVo implements Vo {
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("供应商开户行")
     private List<SupplierBankDetailsVo> baseSupplierBankList;
+    private double taxRate;
+    private String remarks;
 }
\ No newline at end of file
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDto.java b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDto.java
index 85cc645..36c0f7f 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDto.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDto.java
@@ -53,64 +53,69 @@ public class SupplierInfoDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("编码")
+    @ApiModelProperty("编码")
     private String supplierCode; // 编码
-	@ApiModelProperty("供应商名称")
+    @ApiModelProperty("供应商名称")
     private String supplierName; // 供应商名称
-	@ApiModelProperty("供应商名称拼音")
+    @ApiModelProperty("供应商名称拼音")
     private String supplierPY; // 供应商名称拼音
-	@ApiModelProperty("供应商类型sid")
+    @ApiModelProperty("供应商类型sid")
     private String supplierTypeSid; // 供应商类型sid
-	@ApiModelProperty("供应商类型")
+    @ApiModelProperty("供应商类型")
     private String supplierTypeName; // 供应商类型
-	@ApiModelProperty("省sid")
+    @ApiModelProperty("省sid")
     private String provinceSid; // 省sid
-	@ApiModelProperty("province")
+    @ApiModelProperty("province")
     private String province; // 
-	@ApiModelProperty("市sid")
+    @ApiModelProperty("市sid")
     private String citySid; // 市sid
-	@ApiModelProperty("city")
+    @ApiModelProperty("city")
     private String city; // 
-	@ApiModelProperty("收货县区sid")
+    @ApiModelProperty("收货县区sid")
     private String countySid; // 收货县区sid
-	@ApiModelProperty("county")
+    @ApiModelProperty("county")
     private String county; // 
-	@ApiModelProperty("详细地址")
+    @ApiModelProperty("详细地址")
     private String address; // 详细地址
-	@ApiModelProperty("手机")
+    @ApiModelProperty("手机")
     private String contactMobile; // 手机
-	@ApiModelProperty("电话")
+    @ApiModelProperty("电话")
     private String contactTelePhone; // 电话
-	@ApiModelProperty("联系人")
+    @ApiModelProperty("联系人")
     private String contactName; // 联系人
-	@ApiModelProperty("传真")
+    @ApiModelProperty("传真")
     private String fax; // 传真
-	@ApiModelProperty("邮编")
+    @ApiModelProperty("邮编")
     private String zipCode; // 邮编
-	@ApiModelProperty("电子邮件")
+    @ApiModelProperty("电子邮件")
     private String email; // 电子邮件
-	@ApiModelProperty("网址")
+    @ApiModelProperty("网址")
     private String website; // 网址
-	@ApiModelProperty("开票公司名称")
+    @ApiModelProperty("开票公司名称")
     private String billingCompanyName; // 开票公司名称
-	@ApiModelProperty("税号")
+    @ApiModelProperty("税号")
     private String registNum; // 税号
-	@ApiModelProperty("法人")
+    @ApiModelProperty("法人")
     private String legalName; // 法人
-	@ApiModelProperty("采购员")
+    @ApiModelProperty("采购员")
     private String purchaser; // 采购员
-	@ApiModelProperty("排序")
+    @ApiModelProperty("排序")
     private Integer sortNo; // 排序
-	@ApiModelProperty("开票类型key")
+    @ApiModelProperty("开票类型key")
     private String billingTypeKey; // 开票类型key
-	@ApiModelProperty("开票类型value")
+    @ApiModelProperty("开票类型value")
     private String billingTypeValue; // 开票类型value
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("开户行信息")
     private List<SupplierBankDto> baseSupplierBankList;
+    private String userSid;
+    private String orgPath;
+    private double taxRate;
+    private String remarks;
+    private String orgSid;
 }
\ No newline at end of file
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoVo.java b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoVo.java
index ddb9321..9e35515 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoVo.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoVo.java
@@ -62,4 +62,6 @@ public class SupplierInfoVo implements Vo {
     private String contactName;
     @ApiModelProperty("手机")
     private String contactMobile;
+    private double taxRate;
+    private String remarks;
 }
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java
index 8f28e8a..ec2bb8f 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java
@@ -14,38 +14,45 @@ import java.util.Date;
  **/
 @Data
 public class WarehouseAnsBill extends BaseEntity {
-
-    @ApiModelProperty("外部单号（业务单据编号）")
-    private String sourceBillNo;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("申请时间")
+    private Date applicationTime;
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
     private String busTypeKey;
     @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
     private String busTypeValue;
-    @ApiModelProperty("制单人姓名")
-    private String createByName;
-    @ApiModelProperty("货物状态")
+    @ApiModelProperty("交接状态")
+    private String handoverStatus;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("交接时间")
+    private Date handoverTime;
+    @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
     private Integer billState;
-    @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
-    private String reviewStatus;
-    @ApiModelProperty("拒绝原因")
-    private String refuseReason;
-    @ApiModelProperty("联系人")
-    private String contact;
-    @ApiModelProperty("联系人手机")
-    private String mobile;
+    @ApiModelProperty("仓库sid")
+    private Integer warehouseSid;
+    @ApiModelProperty("仓库名")
+    private String warehouseName;
+    @ApiModelProperty("库区sid")
+    private String warehouseRackSid;
+    @ApiModelProperty("库区名")
+    private String warehouseRackName;
+    @ApiModelProperty("申请人")
+    private String applicant;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预约时间")
+    private Date reservationTime;
     @ApiModelProperty("供应商sid")
     private String supplierSid;
-    @ApiModelProperty("供应商名称")
+    @ApiModelProperty("供应商")
     private String supplierName;
-    @ApiModelProperty("货主sid")
-    private String goodsOwnerSid;
-    @ApiModelProperty("货主")
-    private String goodsOwner;
-    @ApiModelProperty("预计到货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date deliveryDate;
+    @ApiModelProperty("外部单号")
+    private String sourceBillNo;
+    @ApiModelProperty("联系人")
+    private String contact;
+    @ApiModelProperty("联系电话")
+    private String mobile;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillDto.java
index 62cbd5f..a421ebc 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillDto.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillDto.java
@@ -1,5 +1,6 @@
 package com.yxt.wms.biz.func.warehouseansbill;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,34 +20,45 @@ public class WarehouseAnsBillDto {
     private String sid;
     private String createBySid;
 
-    @ApiModelProperty("外部单号（业务单据编号）")
-    private String sourceBillNo;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("申请时间")
+    private Date applicationTime;
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
     private String busTypeKey;
     @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
     private String busTypeValue;
-    @ApiModelProperty("制单人姓名")
-    private String createByName;
+    @ApiModelProperty("交接状态")
+    private String handoverStatus;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("交接时间")
+    private Date handoverTime;
     @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
     private Integer billState;
-    @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
-    private String reviewStatus;
-    @ApiModelProperty("拒绝原因")
-    private String refuseReason;
-    @ApiModelProperty("联系人")
-    private String contact;
-    @ApiModelProperty("联系人手机")
-    private String mobile;
+    @ApiModelProperty("仓库sid")
+    private Integer warehouseSid;
+    @ApiModelProperty("仓库名")
+    private String warehouseName;
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名")
+    private String warehouseAreaName;
+    @ApiModelProperty("申请人")
+    private String applicant;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预约时间")
+    private Date reservationTime;
     @ApiModelProperty("供应商sid")
     private String supplierSid;
-    @ApiModelProperty("供应商名称")
+    @ApiModelProperty("供应商")
     private String supplierName;
-    @ApiModelProperty("货主sid")
-    private String goodsOwnerSid;
-    @ApiModelProperty("货主")
-    private String goodsOwner;
-    @ApiModelProperty("预计到货日期")
-    private Date deliveryDate;
+    @ApiModelProperty("外部单号")
+    private String sourceBillNo;
+    @ApiModelProperty("联系人")
+    private String contact;
+    @ApiModelProperty("联系电话")
+    private String mobile;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java
index 86586ab..9ac32fe 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java
@@ -34,4 +34,14 @@ public class WarehouseAnsBillQuery implements Query {
 
     @ApiModelProperty("外部单号（业务单据编号）")
     private String sourceBillNo;
+
+
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
 }
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java
index 71547ff..20b6ff3 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java
@@ -4,6 +4,8 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,14 +20,20 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
 
     @Autowired
     private WarehouseAnsBillFeign wmsAnsBillFeign;
+    @Autowired
+    private CommonMethod commonMethod;
 
     public ResultBean<String> saveOrUpdateBill(WarehouseAnsBillDto dto) {
         return wmsAnsBillFeign.saveOrUpdate(dto);
     }
 
 
-    public ResultBean<PagerVo<WarehouseAnsBillVo>> listPages(PagerQuery<WarehouseAnsBillQuery> pagerQuery) {
-        return wmsAnsBillFeign.listPage(pagerQuery);
+    public ResultBean<PagerVo<WarehouseAnsBillVo>> listPages(PagerQuery<WarehouseAnsBillQuery> pq) {
+        WarehouseAnsBillQuery query=new WarehouseAnsBillQuery();
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
+        pq.getParams().setIndex(dataRule.getIndex());
+        return wmsAnsBillFeign.listPage(pq);
     }
 
     public ResultBean<WarehouseAnsDetailsVo> details(String sid) {
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java
index 7469c18..9be2ea4 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java
@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -14,38 +16,50 @@ public class WarehouseAnsBillVo {
 
 
     private String sid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("申请时间")
+    private Date applicationTime;
     @ApiModelProperty("单据编号")
     private String billNo;
-    @ApiModelProperty("单据日期")
-    private String createTime;
-    @ApiModelProperty("制单人姓名")
-    private String createByName;
-    @ApiModelProperty("外部单号（业务单据编号）")
-    private String sourceBillNo;
+    @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
+    private String busTypeKey;
     @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
     private String busTypeValue;
-    @ApiModelProperty("供应商名称")
+    @ApiModelProperty("交接状态")
+    private String handoverStatus;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("交接时间")
+    private Date handoverTime;
+    @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
+    private Integer billState;
+    @ApiModelProperty("仓库sid")
+    private Integer warehouseSid;
+    @ApiModelProperty("仓库名")
+    private String warehouseName;
+    @ApiModelProperty("库区sid")
+    private String warehouseAreaSid;
+    @ApiModelProperty("库区名")
+    private String warehouseAreaName;
+    @ApiModelProperty("申请人")
+    private String applicant;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预约时间")
+    private Date reservationTime;
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商")
     private String supplierName;
+    @ApiModelProperty("外部单号")
+    private String sourceBillNo;
     @ApiModelProperty("联系人")
     private String contact;
-    @ApiModelProperty("联系人手机")
+    @ApiModelProperty("联系电话")
     private String mobile;
-    @ApiModelProperty("预计到货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private String deliveryDate;
-
-    //单据状态
-    private String billState;
-
-    @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
-    private String reviewStatus;
-    @ApiModelProperty("拒绝原因")
-    private String refuseReason;
-
-/*    @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
-    private String billStateValue;
-    @ApiModelProperty("货主")
-    private String goodsOwner;*/
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
 
 
 }
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java
index 6e71f47..f936fdf 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java
@@ -25,14 +25,6 @@ public class WarehouseAnsBillDetailDto {
     private String goodsSkuOwnSpec;
     @ApiModelProperty("计量单位")
     private String unit;
-    @ApiModelProperty("单位成本（采购价）")
-    private String cost;
     @ApiModelProperty("预约数量（采购订单数量）")
     private String orderCount;
-    @ApiModelProperty("税额")
-    private String taxAmount;
-    @ApiModelProperty("含税价")
-    private String taxPrice;
-    @ApiModelProperty("金额")
-    private String amount;
 }
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsListDetailsVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsListDetailsVo.java
index 9f5635c..a2d9a64 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsListDetailsVo.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsListDetailsVo.java
@@ -33,24 +33,5 @@ public class WarehouseAnsListDetailsVo {
     //已收货数量
     @ApiModelProperty("实际入库数量-根据收货单计算")
     private Integer actualInCount;
-    //入库价
-    @ApiModelProperty("单位成本（采购价）")
-    private String cost;
-    @ApiModelProperty("税额")
-    private String taxAmount;
-    @ApiModelProperty("含税价")
-    private String taxPrice;
-    //采购金额
-    @ApiModelProperty("金额")
-    private String amount;
-
-
- /*   @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
-    @ApiModelProperty("商品Skusid")
-    private String goodsSkuSid;*/
-
 
 }
diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackVo.java
index 4293697..1a4cf41 100644
--- a/wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackVo.java
+++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackVo.java
@@ -29,5 +29,9 @@ public class WarehouseRackVo implements Vo {
     private String locationSid;//库位sid
     private String warehouseName;//仓库名称
     private String locationName;//库位名称
+    private String useOrgSid;//创建组织sid
+    private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
 
 }
diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java b/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java
index c1b8a49..b50e662 100644
--- a/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java
+++ b/wms/src/main/java/com/yxt/wms/feign/portal/sysuser/SysUserDto.java
@@ -44,5 +44,5 @@ public class SysUserDto implements Dto {
     private String userSid;
     private String password;
     private String orgSid;
-
+    private String sourceSid;
 }
\ No newline at end of file