Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java =================================================================== diff -u -r13070 -r13084 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java (.../ReturnMaterialItem.java) (revision 13070) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java (.../ReturnMaterialItem.java) (revision 13084) @@ -1,5 +1,8 @@ package com.forgon.disinfectsystem.entity.returnmaterialrecord; +import java.math.BigDecimal; + +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -27,6 +30,8 @@ private Integer amount;//退货数量 + private BigDecimal settlementPrice = new BigDecimal("0.00");// 退货物品小结价格 + private ReturnMaterialRecord returnMaterialRecord;//退货记录 @@ -75,7 +80,16 @@ public void setAmount(Integer amount) { this.amount = amount; } + + @Column(scale = 2) + public BigDecimal getSettlementPrice() { + return settlementPrice; + } + public void setSettlementPrice(BigDecimal settlementPrice) { + this.settlementPrice = settlementPrice; + } + public Long getWarehouseId() { return warehouseId; }