Commit b6ac3678 authored by zhengyi's avatar zhengyi

订单无收货人时,无法保存收货方式的数据bug修复

parent f17caac1
-- 当订单无收货人时,收货方式无法保存的bug修复
alter table `ecw_order`
add column `harvest_method` tinyint DEFAULT '1' COMMENT '收货方式:1 自提 2 送货上门';
-- 放货箱数与放货率
alter table `ecw_order`
add column `release_ratio` decimal(5,2) DEFAULT '0.00' COMMENT '放货率';
......
......@@ -406,6 +406,9 @@ public class OrderDO extends BaseDO {
@ApiModelProperty(value = "送货时间")
private Date deliveryDate;
@ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ")
private Integer harvestMethod;
/**
* 入仓时间
*/
......
......@@ -6386,6 +6386,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
newOrder.setPickleType(null);
newOrder.setPickRatio(null);
newOrder.setPickNum(null);
newOrder.setReleaseRatio(null);
newOrder.setReleaseNum(null);
newOrder.setCost(null);
newOrder.setPackingListUrl(null);
newOrder.setCommissionPayable(null);
......
......@@ -341,6 +341,9 @@ public class OrderBackVO {
@ExcelProperty("送货时间")
private Date deliveryDate;
@ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ")
private Integer harvestMethod;
@ExcelProperty("入仓时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "入仓时间")
......
......@@ -282,6 +282,9 @@ public class OrderBaseVO {
// @NotNull(message = "送货时间不能为空")
private Date deliveryDate;
@ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ")
private Integer harvestMethod;
@ApiModelProperty(value = "特需类型ids")
private String packageType;
......
......@@ -259,6 +259,9 @@ public class OrderQueryVO {
@ApiModelProperty(value = "是否限制修改收货人")
private Boolean isLimitUpdateConsignee;
@ApiModelProperty(value = "收货方式:1 自提 2 送货上门 ")
private Integer harvestMethod;
@ApiModelProperty(value = "开始放货锁定收货人到期时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment