回显保费;
This commit is contained in:
+2
@@ -375,4 +375,6 @@ public class ReservationInMaterialDetail extends BaseVOEntity {
|
|||||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||||
private Date drinkDate;
|
private Date drinkDate;
|
||||||
|
@ApiModelProperty("火险保费")
|
||||||
|
private BigDecimal fireInsureFee;
|
||||||
}
|
}
|
||||||
+2
-1
@@ -477,5 +477,6 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO
|
|||||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||||
private Date drinkDate;
|
private Date drinkDate;
|
||||||
private String lotNumber;
|
private String lotNumber;
|
||||||
|
@ApiModelProperty("火险保费")
|
||||||
|
private BigDecimal fireInsureFee;
|
||||||
}
|
}
|
||||||
+2
@@ -442,4 +442,6 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO
|
|||||||
@ApiModelProperty("单价")
|
@ApiModelProperty("单价")
|
||||||
@Excel(name = "单价")
|
@Excel(name = "单价")
|
||||||
private BigDecimal unitPrice;
|
private BigDecimal unitPrice;
|
||||||
|
@ApiModelProperty("火险保费")
|
||||||
|
private BigDecimal fireInsureFee;
|
||||||
}
|
}
|
||||||
+2
@@ -449,4 +449,6 @@ public class ReservationInMaterialDetailDTO extends BaseVOEntity {
|
|||||||
private Date drinkDate;
|
private Date drinkDate;
|
||||||
private String expiryDate;
|
private String expiryDate;
|
||||||
private String productionDate;
|
private String productionDate;
|
||||||
|
@ApiModelProperty("火险保费")
|
||||||
|
private BigDecimal fireInsureFee;
|
||||||
}
|
}
|
||||||
+2
-1
@@ -89,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="singleGrossWeight" column="single_gross_weight" />
|
<result property="singleGrossWeight" column="single_gross_weight" />
|
||||||
<result property="lotNo" column="lot_no" />
|
<result property="lotNo" column="lot_no" />
|
||||||
<result property="drinkDate" column="drink_date" />
|
<result property="drinkDate" column="drink_date" />
|
||||||
|
<result property="fireInsureFee" column="fire_insure_fee" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
|
|
||||||
@@ -102,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
a.lot_no ,
|
a.lot_no ,
|
||||||
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_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.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,a.drink_date,
|
a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,a.drink_date,a.fire_insure_fee,
|
||||||
CASE
|
CASE
|
||||||
WHEN a.pack_detail_id IS NULL OR TRIM(a.pack_detail_id) = '' THEN NULL
|
WHEN a.pack_detail_id IS NULL OR TRIM(a.pack_detail_id) = '' THEN NULL
|
||||||
ELSE CAST(a.pack_detail_id AS BIGINT)
|
ELSE CAST(a.pack_detail_id AS BIGINT)
|
||||||
|
|||||||
Reference in New Issue
Block a user