diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDetailsVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDetailsVo.java index 5ed023d7..ddd9825d 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDetailsVo.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDetailsVo.java @@ -71,14 +71,85 @@ public class ProductInformationDetailsVo implements Vo { private String brand; @ApiModelProperty("品牌sid") private String brandSid; + @ApiModelProperty("产地") + private String placeOfOrigin; + @ApiModelProperty("等级") + private String grade; + @ApiModelProperty("等级key") + private String gradeKey; @ApiModelProperty("保质期") private String qualityGuaranteePeriod; + + @ApiModelProperty("货架") + private String goodsShelves; + @ApiModelProperty("货架key") + private String goodsShelvesCode; @ApiModelProperty("第二代码") private String secondCode; + @ApiModelProperty("毛利率") + private String grossProfitMargin; + + @ApiModelProperty("核算售价") + private String accountingSalesPrice; + @ApiModelProperty("最新进价") + private String latestPurchasePrice; + @ApiModelProperty("库存价") + private String inventoryPrice; @ApiModelProperty("合同进价") private String contractPurchasePrice; + + @ApiModelProperty("会员价") + private String membershipPrice; + + @ApiModelProperty("进项利率") + private String inputTaxRate; + @ApiModelProperty("销项利率") + private String outputTaxRate; + @ApiModelProperty("仓位") + private String position; + @ApiModelProperty("仓位code") + private String positionCode; + @ApiModelProperty("结算供应商") + private String supplier; + @ApiModelProperty("结算供应商sid") + private String supplierSid; + @ApiModelProperty("配货方式") + private String distributionMethod; + @ApiModelProperty("配货方式key") + private String distributionMethodKey; + @ApiModelProperty("来源单位") + private String sourceUnit; + @ApiModelProperty("管理到货期") + private String managementExpirationDate; + + @ApiModelProperty("配货价") + private String rationingPrice; + @ApiModelProperty("最低售价") + private String lowestSellingPrice; + @ApiModelProperty("缺省进价") + private String defaultPurchasePrice; + @ApiModelProperty("批发价") + private String tradePrice; @ApiModelProperty("规格说明") private String specifications; @ApiModelProperty("规格长宽高") private String description; + @ApiModelProperty("规格重量") + private String weight; + @ApiModelProperty("最后调价时间") + private Date priceAdjustmentTime; + @ApiModelProperty("对方系统代码") + private String systemCode; + @ApiModelProperty("去税最新进价") + private String priceWithoutTax; + @ApiModelProperty("去税库存价") + private String taxableInventoryPrice; + @ApiModelProperty("去税合同进价") + private String ContractPriceExcludingTax; + @ApiModelProperty("商品状态") + private String productStatus; + @ApiModelProperty("商品状态key") + private String productStatusKey; + @ApiModelProperty("最新进价(需要每次导入采购订单更新的)") + private String newestPurchasePrice; } \ No newline at end of file diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDto.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDto.java index a20fb66f..8f409b61 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDto.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationDto.java @@ -71,14 +71,85 @@ public class ProductInformationDto implements Dto { private String brand; @ApiModelProperty("品牌sid") private String brandSid; + @ApiModelProperty("产地") + private String placeOfOrigin; + @ApiModelProperty("等级") + private String grade; + @ApiModelProperty("等级key") + private String gradeKey; @ApiModelProperty("保质期") private String qualityGuaranteePeriod; + + @ApiModelProperty("货架") + private String goodsShelves; + @ApiModelProperty("货架key") + private String goodsShelvesCode; @ApiModelProperty("第二代码") private String secondCode; + @ApiModelProperty("毛利率") + private String grossProfitMargin; + + @ApiModelProperty("核算售价") + private String accountingSalesPrice; + @ApiModelProperty("最新进价") + private String latestPurchasePrice; + @ApiModelProperty("库存价") + private String inventoryPrice; @ApiModelProperty("合同进价") private String contractPurchasePrice; + + @ApiModelProperty("会员价") + private String membershipPrice; + + @ApiModelProperty("进项利率") + private String inputTaxRate; + @ApiModelProperty("销项利率") + private String outputTaxRate; + @ApiModelProperty("仓位") + private String position; + @ApiModelProperty("仓位code") + private String positionCode; + @ApiModelProperty("结算供应商") + private String supplier; + @ApiModelProperty("结算供应商sid") + private String supplierSid; + @ApiModelProperty("配货方式") + private String distributionMethod; + @ApiModelProperty("配货方式key") + private String distributionMethodKey; + @ApiModelProperty("来源单位") + private String sourceUnit; + @ApiModelProperty("管理到货期") + private String managementExpirationDate; + + @ApiModelProperty("配货价") + private String rationingPrice; + @ApiModelProperty("最低售价") + private String lowestSellingPrice; + @ApiModelProperty("缺省进价") + private String defaultPurchasePrice; + @ApiModelProperty("批发价") + private String tradePrice; @ApiModelProperty("规格说明") private String specifications; @ApiModelProperty("规格长宽高") private String description; + @ApiModelProperty("规格重量") + private String weight; + @ApiModelProperty("最后调价时间") + private Date priceAdjustmentTime; + @ApiModelProperty("对方系统代码") + private String systemCode; + @ApiModelProperty("去税最新进价") + private String priceWithoutTax; + @ApiModelProperty("去税库存价") + private String taxableInventoryPrice; + @ApiModelProperty("去税合同进价") + private String ContractPriceExcludingTax; + @ApiModelProperty("商品状态") + private String productStatus; + @ApiModelProperty("商品状态key") + private String productStatusKey; + @ApiModelProperty("最新进价(需要每次导入采购订单更新的)") + private String newestPurchasePrice; } \ No newline at end of file diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationVo.java index 10e75dfe..20047971 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationVo.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/productinformation/ProductInformationVo.java @@ -53,100 +53,24 @@ public class ProductInformationVo implements Vo { private static final long serialVersionUID = 8544481348404723979L; private String sid; - @ApiModelProperty("代码") + @ApiModelProperty("代码") private String code; - @ApiModelProperty("名称") + @ApiModelProperty("名称") private String name; - @ApiModelProperty("含量") - private String content; - @ApiModelProperty("类别") + @ApiModelProperty("类别") private String category; - @ApiModelProperty("类别key") - private String categoryKey; - @ApiModelProperty("规格单位") + @ApiModelProperty("规格单位") private String unit; - @ApiModelProperty("制造厂") + @ApiModelProperty("制造厂") private String manufacturer; - @ApiModelProperty("制造厂sid") - private String manufacturerSid; - @ApiModelProperty("品牌") + + @ApiModelProperty("品牌") private String brand; - @ApiModelProperty("品牌sid") - private String brandSid; - @ApiModelProperty("产地") + + @ApiModelProperty("产地") private String placeOfOrigin; - @ApiModelProperty("等级") - private String grade; - @ApiModelProperty("等级key") - private String gradeKey; - @ApiModelProperty("保质期") - private String qualityGuaranteePeriod; - @ApiModelProperty("部门") - private String deptartment; - @ApiModelProperty("货架") - private String goodsShelves; - @ApiModelProperty("货架code") - private String goodsShelvesCode; - @ApiModelProperty("第二代码") + + @ApiModelProperty("第二代码") private String secondCode; - @ApiModelProperty("毛利率") - private String grossProfitMargin; - @ApiModelProperty("采购员") - private String buyer; - @ApiModelProperty("核算售价") - private String accountingSalesPrice; - @ApiModelProperty("最新进价") - private String latestPurchasePrice; - @ApiModelProperty("库存价") - private String inventoryPrice; - @ApiModelProperty("合同进价") - private String contractPurchasePrice; - @ApiModelProperty("会员价") - private String membershipPrice; - @ApiModelProperty("进项税率") - private String inputTaxRate; - @ApiModelProperty("销项税率") - private String outputTaxRate; - @ApiModelProperty("仓位") - private String position; - @ApiModelProperty("仓位code") - private String positionCode; - @ApiModelProperty("结算供应商") - private String supplier; - @ApiModelProperty("结算供应商Sid") - private String supplierSid; - @ApiModelProperty("配货方式") - private String distributionMethod; - @ApiModelProperty("配货方式Key") - private String distributionMethodKey; - @ApiModelProperty("来源单位") - private String sourceUnit; - @ApiModelProperty("管理到效期") - private String managementExpirationDate; - @ApiModelProperty("配货价") - private String rationingPrice; - @ApiModelProperty("最低售价") - private String lowestSellingPrice; - @ApiModelProperty("缺省进价") - private String defaultPurchasePrice; - @ApiModelProperty("批发价") - private String tradePrice; - @ApiModelProperty("规格说明") - private String specifications; - @ApiModelProperty("规格长宽高") - private String description; - @ApiModelProperty("规格重量") - private String weight; - @ApiModelProperty("对方系统代码") - private String systemCode; - @ApiModelProperty("去税最新进价") - private String priceWithoutTax; - @ApiModelProperty("去税库存价") - private String taxableInventoryPrice; - @ApiModelProperty("去税合同进价") - private String ContractPriceExcludingTax; - @ApiModelProperty("商品状态") - private String productStatus; - @ApiModelProperty("最新进价(需要每次导入采购订单更新的)") - private String newestPurchasePrice; + }