查询预约信息;
This commit is contained in:
+34
@@ -9,6 +9,7 @@ import com.mhd.oms.domain.reserveStockInOrder.repository.po.ReserveStockInOrderB
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
@@ -469,4 +470,37 @@ public class ReserveInMaterialDetailPO extends ReserveStockInOrderBasePO {
|
||||
@Excel(name = "调整后面积")
|
||||
private BigDecimal adjustedArea;
|
||||
|
||||
@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;
|
||||
|
||||
}
|
||||
+36
@@ -1,5 +1,6 @@
|
||||
package com.mhd.oms.domain.reserveInMaterialDetail.repository.todo;
|
||||
|
||||
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;
|
||||
@@ -7,8 +8,10 @@ import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.oms.domain.reserveStockInOrder.repository.todo.ReserveStockInOrderBaseDO;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -430,4 +433,37 @@ public class ReserveInMaterialDetailDO extends ReserveStockInOrderBaseDO {
|
||||
@Excel(name = "调整后面积")
|
||||
private BigDecimal adjustedArea;
|
||||
|
||||
@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;
|
||||
|
||||
}
|
||||
+36
@@ -1,13 +1,16 @@
|
||||
package com.mhd.oms.domain.reserveInMaterialDetail.repository.todo;
|
||||
|
||||
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;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -435,4 +438,37 @@ public class ReserveInMaterialDetailDTO extends BaseVOEntity {
|
||||
@ApiModelProperty("调整后面积")
|
||||
@Excel(name = "调整后面积")
|
||||
private BigDecimal adjustedArea;
|
||||
|
||||
@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;
|
||||
}
|
||||
+9
-1
@@ -88,6 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="singleVolume" column="single_volume" />
|
||||
<result property="singleGrossWeight" column="single_gross_weight" />
|
||||
<result property="lotNo" column="lot_no" />
|
||||
<result property="reserveQuantity" column="reserve_quantity" />
|
||||
<result property="reserveGrossWeight" column="reserve_gross_weight" />
|
||||
<result property="reserveNetWeight" column="reserve_net_weight" />
|
||||
<result property="reserveVolume" column="reserve_volume" />
|
||||
<result property="reserveArea" column="reserve_area" />
|
||||
<result property="reservePrice" column="reserve_price" />
|
||||
<result property="reserveUnitPrice" column="reserve_unit_price" />
|
||||
<result property="shelfLife" column="shelf_life" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -98,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.discount_rate ,
|
||||
a.single_volume ,
|
||||
a.single_gross_weight ,
|
||||
a.lot_no ,
|
||||
a.lot_no ,a.reserve_quantity,a.reserve_gross_weight,a.reserve_net_weight,a.reserve_volume,a.reserve_area,a.reserve_price,a.reserve_unit_price,a.shelf_life
|
||||
a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id, a.in_order_number, a.material_base_info_id,
|
||||
a.material_code, a.material_name, a.bar_code, a.quantity, a.receipt_quantity, a.shelves_quantity,
|
||||
a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,
|
||||
|
||||
Reference in New Issue
Block a user