Merge remote-tracking branch 'origin/master'

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java

@@ -36,6 +36,10 @@ public class GoodsSkuPurSelectList {
     private BigDecimal cost;
     //单价1
     private BigDecimal cost1;
+    //保质期
+    private String shelfLife;
+    //税率
+    private BigDecimal taxRate;
     //货号
     private String itemNumber;
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java

@@ -15,10 +15,6 @@ public class GoodsSkuPurSelectQuery implements Query {
     private String goodsSkuCode;
     //商品名称
     private String goodsName;
-    //商品条码
-    private String barCode;
-    //规格名称
-    private String goodsSkuOwnSpec;
 
-    private String orgPath;
+    private String createOrgSid;
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java

@@ -65,4 +65,7 @@ public class PurchaseBillQuery implements Query {
     @ApiModelProperty("用户sid")
     private String userSid;
     private int index;
+
+    @ApiModelProperty("审核状态key")
+    private String examineStateKey;
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java

@@ -99,6 +99,8 @@ public class PurchaseBillDetailDetailsVo implements Vo {
     private Date deliveryDate;
     @ApiModelProperty("总税额")
     private BigDecimal taxAmount;
+    @ApiModelProperty("保质期")
+    private Integer shelfLife;
 
     /*
      * 商品扩展字段

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java

@@ -94,6 +94,8 @@ public class PurchaseBillDetailDto implements Dto {
     private String deliveryDate;
     @ApiModelProperty("总税额")
     private BigDecimal taxAmount;
+    @ApiModelProperty("保质期")
+    private Integer shelfLife;
 
     /*
      * 商品扩展字段