|
@@ -10,7 +10,7 @@ import lombok.Data;
|
|
|
import lombok.EqualsAndHashCode;
|
|
|
import lombok.ToString;
|
|
|
|
|
|
-import java.sql.Timestamp;
|
|
|
+import java.lang.Long;
|
|
|
|
|
|
@Data
|
|
|
@EqualsAndHashCode(callSuper = true)
|
|
@@ -64,157 +64,154 @@ public class StockInfoDto extends BaseQueryParam {
|
|
|
@ApiModelProperty(name = "is_tort", value = "是否侵权:1是 2否")
|
|
|
private Long isTort;
|
|
|
|
|
|
- @ApiModelProperty(name = "hasVirtualSku", value = "是否有虚拟sku")
|
|
|
+ @ApiModelProperty(name = "has_virtual_sku", value = "是否有虚拟sku")
|
|
|
private Long hasVirtualSku;
|
|
|
|
|
|
- @ApiModelProperty(name = "buyerId", value = "采购员ID(员工ID)")
|
|
|
+ @ApiModelProperty(name = "buyer_id", value = "采购员ID(员工ID)")
|
|
|
private Long buyerId;
|
|
|
|
|
|
- @ApiModelProperty(name = "salesId", value = "销售员ID(员工ID)")
|
|
|
+ @ApiModelProperty(name = "sales_id", value = "销售员ID(员工ID)")
|
|
|
private Long salesId;
|
|
|
|
|
|
- @ApiModelProperty(name = "deliverId", value = "配货员(员工ID),多个之间用,分隔,1个时:,id,")
|
|
|
+ @ApiModelProperty(name = "deliver_id", value = "配货员(员工ID),多个之间用,分隔,1个时:,id,")
|
|
|
private String deliverId;
|
|
|
|
|
|
- @ApiModelProperty(name = "artDesignerId", value = "美工")
|
|
|
+ @ApiModelProperty(name = "art_designer_id", value = "美工")
|
|
|
private Long artDesignerId;
|
|
|
|
|
|
- @ApiModelProperty(name = "defaultCost", value = "默认成本价")
|
|
|
+ @ApiModelProperty(name = "default_cost", value = "默认成本价")
|
|
|
private Double defaultCost;
|
|
|
|
|
|
- @ApiModelProperty(name = "stockQuantity", value = "库存数量")
|
|
|
+ @ApiModelProperty(name = "stock_quantity", value = "库存数量")
|
|
|
private Long stockQuantity;
|
|
|
|
|
|
- @ApiModelProperty(name = "forecastDaySale", value = "forecastDaySale")
|
|
|
+ @ApiModelProperty(name = "forecast_day_sale", value = "forecastDaySale")
|
|
|
private Double forecastDaySale;
|
|
|
|
|
|
- @ApiModelProperty(name = "shippingQuantity", value = "在途数量")
|
|
|
+ @ApiModelProperty(name = "shipping_quantity", value = "在途数量")
|
|
|
private Long shippingQuantity;
|
|
|
|
|
|
- @ApiModelProperty(name = "waitingQuantity", value = "未发货数量")
|
|
|
+ @ApiModelProperty(name = "waiting_quantity", value = "未发货数量")
|
|
|
private Long waitingQuantity;
|
|
|
|
|
|
- @ApiModelProperty(name = "quantityInterval1", value = "本周")
|
|
|
+ @ApiModelProperty(name = "quantity_interval1", value = "本周")
|
|
|
private Long quantityInterval1;
|
|
|
|
|
|
- @ApiModelProperty(name = "quantityInterval2", value = "上周")
|
|
|
+ @ApiModelProperty(name = "quantity_interval2", value = "上周")
|
|
|
private Long quantityInterval2;
|
|
|
|
|
|
- @ApiModelProperty(name = "", value = "")
|
|
|
+ @ApiModelProperty(name = "quantity_interval3", value = "quantity_interval3")
|
|
|
private Long quantityInterval3;
|
|
|
|
|
|
- @ApiModelProperty(name = "", value = "")
|
|
|
+ @ApiModelProperty(name = "quantity_interval4", value = "quantity_interval4")
|
|
|
private Long quantityInterval4;
|
|
|
|
|
|
- @ApiModelProperty(name = "", value = "")
|
|
|
+ @ApiModelProperty(name = "quantity_interval5", value = "quantity_interval5")
|
|
|
private Long quantityInterval5;
|
|
|
|
|
|
- @ApiModelProperty(name = "", value = "")
|
|
|
+ @ApiModelProperty(name = "quantity_interval6", value = "quantity_interval6")
|
|
|
private Long quantityInterval6;
|
|
|
|
|
|
- @ApiModelProperty(name = "isSingleWarehouse", value = "是否单仓库 : 1 是 2 否")
|
|
|
+ @ApiModelProperty(name = "is_single_warehouse", value = "是否单仓库 : 1 是 2 否")
|
|
|
private Long isSingleWarehouse;
|
|
|
|
|
|
- @ApiModelProperty(name = "defaultWarehouseId", value = "默认仓库ID(冗余字段,便于订单查找)")
|
|
|
+ @ApiModelProperty(name = "default_warehouse_id", value = "默认仓库ID(冗余字段,便于订单查找)")
|
|
|
private Long defaultWarehouseId;
|
|
|
|
|
|
- @ApiModelProperty(name = "defaultStockWarehouseDetailId", value = "默认库存SKU对应仓位ID(冗余字段,便于订单查找)")
|
|
|
+ @ApiModelProperty(name = "default_stock_warehouse_detail_id", value = "默认库存SKU对应仓位ID(冗余字段,便于订单查找)")
|
|
|
private Long defaultStockWarehouseDetailId;
|
|
|
|
|
|
- @ApiModelProperty(name = "defaultGridCode", value = "默认仓位号")
|
|
|
+ @ApiModelProperty(name = "default_grid_code", value = "默认仓位号")
|
|
|
private String defaultGridCode;
|
|
|
|
|
|
- @ApiModelProperty(name = "timeCreated", value = "创建时间")
|
|
|
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
|
|
|
- private Timestamp timeCreated;
|
|
|
+ @ApiModelProperty(name = "time_created", value = "创建时间")
|
|
|
+ private Long timeCreated;
|
|
|
|
|
|
- @ApiModelProperty(name = "timeModify", value = "修改时间")
|
|
|
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
|
|
|
- private Timestamp timeModify;
|
|
|
+ @ApiModelProperty(name = "time_modify", value = "修改时间")
|
|
|
+ private Long timeModify;
|
|
|
|
|
|
- @ApiModelProperty(name = "purchaseType", value = "1.分仓采购 2.智能联合统一采购")
|
|
|
+ @ApiModelProperty(name = "purchase_type", value = "1.分仓采购 2.智能联合统一采购")
|
|
|
private Long purchaseType;
|
|
|
|
|
|
- @ApiModelProperty(name = "isCloud", value = "是否云分销商品1:是;2:否")
|
|
|
+ @ApiModelProperty(name = "is_cloud", value = "是否云分销商品1:是;2:否")
|
|
|
private Long isCloud;
|
|
|
|
|
|
- @ApiModelProperty(name = "retailSku", value = "供货商子sku")
|
|
|
+ @ApiModelProperty(name = "retail_sku", value = "供货商子sku")
|
|
|
private String retailSku;
|
|
|
|
|
|
- @ApiModelProperty(name = "platformId", value = "平台类型id")
|
|
|
+ @ApiModelProperty(name = "platform_id", value = "平台类型id")
|
|
|
private Long platformId;
|
|
|
|
|
|
- @ApiModelProperty(name = "platformUrl", value = "平台链接")
|
|
|
+ @ApiModelProperty(name = "platform_url", value = "平台链接")
|
|
|
private String platformUrl;
|
|
|
|
|
|
- @ApiModelProperty(name = "retailId", value = "供应商id")
|
|
|
+ @ApiModelProperty(name = "retail_id", value = "供应商id")
|
|
|
private Long retailId;
|
|
|
|
|
|
- @ApiModelProperty(name = "livenessType", value = "活跃度:1:爆款;2:旺款;3:平款;4:滞销款;")
|
|
|
+ @ApiModelProperty(name = "liveness_type", value = "活跃度:1:爆款;2:旺款;3:平款;4:滞销款;")
|
|
|
private Long livenessType;
|
|
|
|
|
|
- @ApiModelProperty(name = "isNewType", value = "是否新款:1:是")
|
|
|
+ @ApiModelProperty(name = "is_new_type", value = "是否新款:1:是")
|
|
|
private Long isNewType;
|
|
|
|
|
|
- @ApiModelProperty(name = "isMachining", value = "是否有加工产品:1有,2无")
|
|
|
+ @ApiModelProperty(name = "is_machining", value = "是否有加工产品:1有,2无")
|
|
|
private Long isMachining;
|
|
|
|
|
|
- @ApiModelProperty(name = "updateDate1", value = "最新出库时间")
|
|
|
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
|
|
|
- private Timestamp updateDate1;
|
|
|
+ @ApiModelProperty(name = "update_date1", value = "最新出库时间")
|
|
|
+ private Long updateDate1;
|
|
|
|
|
|
- @ApiModelProperty(name = "updateDate2", value = "最新入库时间")
|
|
|
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
|
|
|
- private Timestamp updateDate2;
|
|
|
+ @ApiModelProperty(name = "update_date2", value = "最新入库时间")
|
|
|
+ private Long updateDate2;
|
|
|
|
|
|
- @ApiModelProperty(name = "stopSelltime", value = "停止销售时间")
|
|
|
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
|
|
|
- private Timestamp stopSelltime;
|
|
|
+ @ApiModelProperty(name = "stop_selltime", value = "停止销售时间")
|
|
|
+ private Long stopSelltime;
|
|
|
|
|
|
- @ApiModelProperty(name = "defaultRetailId", value = "默认供应商编号")
|
|
|
+ @ApiModelProperty(name = "default_retail_id", value = "默认供应商编号")
|
|
|
private Long defaultRetailId;
|
|
|
|
|
|
- @ApiModelProperty(name = "creatorId", value = "创建者id")
|
|
|
+ @ApiModelProperty(name = "creator_id", value = "创建者id")
|
|
|
private Long creatorId;
|
|
|
|
|
|
- @ApiModelProperty(name = "purchasePrice", value = "采购价")
|
|
|
+ @ApiModelProperty(name = "creator", value = "创建者")
|
|
|
+ private String creator;
|
|
|
+ @ApiModelProperty(name = "updater", value = "更新者")
|
|
|
+ private String updater;
|
|
|
+
|
|
|
+ @ApiModelProperty(name = "purchase_price", value = "采购价")
|
|
|
private Double purchasePrice;
|
|
|
|
|
|
- @ApiModelProperty(name = "processCost", value = "加工费用")
|
|
|
+ @ApiModelProperty(name = "process_cost", value = "加工费用")
|
|
|
private Double processCost;
|
|
|
|
|
|
- @ApiModelProperty(name = "shippingCost", value = "采购运费")
|
|
|
+ @ApiModelProperty(name = "shipping_cost", value = "采购运费")
|
|
|
private Double shippingCost;
|
|
|
|
|
|
@ApiModelProperty(name = "parent_brand_id", value = "父级品牌ID")
|
|
|
private Long parentBrandId;
|
|
|
|
|
|
- @ApiModelProperty(name = "brandId", value = "品牌ID")
|
|
|
+ @ApiModelProperty(name = "brand_id", value = "品牌ID")
|
|
|
private Long brandId;
|
|
|
|
|
|
- @ApiModelProperty(name = "isList", value = "是否开启序列号管理 1.开启 2.不开启")
|
|
|
+ @ApiModelProperty(name = "is_list", value = "是否开启序列号管理 1.开启 2.不开启")
|
|
|
private Long isList;
|
|
|
|
|
|
- @ApiModelProperty(name = "lastTime", value = "修改时间")
|
|
|
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
|
|
|
- private Timestamp lastTime;
|
|
|
+ @ApiModelProperty(name = "last_time", value = "修改时间")
|
|
|
+ private Long lastTime;
|
|
|
|
|
|
- @ApiModelProperty(name = "minPaidtime", value = "未发货量订单最早时间")
|
|
|
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
|
|
|
- private Timestamp minPaidtime;
|
|
|
+ @ApiModelProperty(name = "min_paidtime", value = "未发货量订单最早时间")
|
|
|
+ private Long minPaidtime;
|
|
|
|
|
|
- @ApiModelProperty(name = "IsSynchro", value = "自动同步平台库存 1启用 2停用")
|
|
|
+ @ApiModelProperty(name = "is_synchro", value = "自动同步平台库存 1启用 2停用")
|
|
|
private Long isSynchro;
|
|
|
|
|
|
@ApiModelProperty(name = "third_category_id", value = "三级目录Id")
|
|
|
private Long thirdCategoryId;
|
|
|
|
|
|
@ApiModelProperty(name = "update_time", value = "最后更新时间")
|
|
|
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
|
|
|
- private Timestamp updateTime;
|
|
|
+ private Long updateTime;
|
|
|
|
|
|
@ApiModelProperty(name = "status_updatetime", value = "sku状态更新时间")
|
|
|
- private Timestamp statusUpdatetime;
|
|
|
+ private Long statusUpdatetime;
|
|
|
|
|
|
@ApiModelProperty(name = "all_quantity", value = "后台计算使用")
|
|
|
private Long allQuantity;
|
|
@@ -226,8 +223,7 @@ public class StockInfoDto extends BaseQueryParam {
|
|
|
private Long isActive;
|
|
|
|
|
|
@ApiModelProperty(name = "last_paid_time", value = "最近付款时间")
|
|
|
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
|
|
|
- private Timestamp lastPaidTime;
|
|
|
+ private Long lastPaidTime;
|
|
|
|
|
|
@ApiModelProperty(name = "last_provider_id", value = "最新入库供应商ID")
|
|
|
private Long lastProviderId;
|