diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/entity/ReserveInMaterialDetail.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/entity/ReserveInMaterialDetail.java index 2a4ce88d5..059e9711c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/entity/ReserveInMaterialDetail.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/entity/ReserveInMaterialDetail.java @@ -3,14 +3,17 @@ package com.mhd.oms.domain.reserveInMaterialDetail.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.web.domain.BaseVOEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; /** @@ -364,4 +367,37 @@ public class ReserveInMaterialDetail extends BaseVOEntity { @ApiModelProperty("lot编号") @Excel(name = "lot编号") private String lotNo; + + @ApiModelProperty("预约数量(输入大于等于0的数字,可以为小数)") + @Excel(name = "预约数量") + private BigDecimal reserveQuantity; + + @ApiModelProperty("预约净重(KG)") + @Excel(name = "预约净重(KG)") + private BigDecimal reserveNetWeight; + + @ApiModelProperty("预约毛重(KG)") + @Excel(name = "预约毛重(KG)") + private BigDecimal reserveGrossWeight; + + @ApiModelProperty("总体积(CBM)") + @Excel(name = "预约体积(CBM)") + private BigDecimal reserveVolume; + + @ApiModelProperty("预约面积(SQM)") + @Excel(name = "预约面积(SQM)") + private BigDecimal reserveArea; + + @ApiModelProperty("预约总价") + @Excel(name = "预约总价") + private BigDecimal reservePrice; + + @ApiModelProperty("预约单价") + @Excel(name = "预约单价") + private BigDecimal reserveUnitPrice; + + @ApiModelProperty(value = "保质期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date shelfLife; } \ No newline at end of file