diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java index 9d2faa5..5b5fd49 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java +++ b/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; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java index 3684cf8..581c3d6 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java +++ b/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; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java index 4aff57f..386c315 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java +++ b/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; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java index 369f08c..6785d18 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java +++ b/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; /* * 商品扩展字段 diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java index a252456..20c01bb 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java +++ b/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; /* * 商品扩展字段