jobid查询接口;
This commit is contained in:
+16
@@ -261,4 +261,20 @@ public class MaterialInventoryPO extends MaterialBasePO {
|
|||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Excel(name = "上次计费时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
@Excel(name = "上次计费时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date lastBillingTime;
|
private Date lastBillingTime;
|
||||||
|
|
||||||
|
@ApiModelProperty("每月仓租")
|
||||||
|
@Excel(name = "每月仓租")
|
||||||
|
private BigDecimal monthlyWarehouseRent;
|
||||||
|
|
||||||
|
@ApiModelProperty("半月仓租")
|
||||||
|
@Excel(name = "半月仓租")
|
||||||
|
private BigDecimal halfMonthWarehouseRent;
|
||||||
|
|
||||||
|
@ApiModelProperty("每月仓租单位")
|
||||||
|
@Excel(name = "每月仓租单位")
|
||||||
|
private String monthlyWarehouseRentUnit;
|
||||||
|
|
||||||
|
@ApiModelProperty("半月仓租单位")
|
||||||
|
@Excel(name = "半月仓租单位")
|
||||||
|
private String halfMonthWarehouseRentUnit;
|
||||||
}
|
}
|
||||||
@@ -71,6 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
typeHandler="com.mhd.common.core.handler.ListTypeHandler" />
|
typeHandler="com.mhd.common.core.handler.ListTypeHandler" />
|
||||||
<result property="materialClassifyName" column="material_classify_name"
|
<result property="materialClassifyName" column="material_classify_name"
|
||||||
typeHandler="com.mhd.common.core.handler.ListTypeHandler" />
|
typeHandler="com.mhd.common.core.handler.ListTypeHandler" />
|
||||||
|
<result property="monthlyWarehouseRentUnit" column="monthly_warehouse_rent_unit" />
|
||||||
|
<result property="halfMonthWarehouseRentUnit" column="half_month_warehouse_rent_unit" />
|
||||||
|
<result property="halfMonthWarehouseRent" column="half_month_warehouse_rent" />
|
||||||
|
<result property="monthlyWarehouseRent" column="monthly_warehouse_rent" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
|
|
||||||
@@ -95,6 +99,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
a.bar_code as inv_bar_code,
|
a.bar_code as inv_bar_code,
|
||||||
a.in_order_number,a.lot_number,
|
a.in_order_number,a.lot_number,
|
||||||
a.last_billing_time,
|
a.last_billing_time,
|
||||||
|
b.MONTHLY_WAREHOUSE_RENT_UNIT,
|
||||||
|
b.HALF_MONTH_WAREHOUSE_RENT_UNIT,
|
||||||
|
b.HALF_MONTH_WAREHOUSE_RENT,
|
||||||
|
b.MONTHLY_WAREHOUSE_RENT,
|
||||||
CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END as sort_order
|
CASE WHEN IFNULL(sum(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END as sort_order
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user