Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java =================================================================== diff -u -r12665 -r13098 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java (.../GoodsStock.java) (revision 12665) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java (.../GoodsStock.java) (revision 13098) @@ -72,6 +72,11 @@ * 数量 */ private Integer amount; + + /** + * 记录每一材料明细item的入库单价 + */ + private Double price; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -154,5 +159,13 @@ public void setAmount(Integer amount) { this.amount = amount; } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialItem.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialItem.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialItem.java (revision 13098) @@ -0,0 +1,175 @@ +package com.forgon.disinfectsystem.entity.invoicemanager; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +import com.forgon.tools.db.DatabaseUtil; + +/** + * 材料发货明细的材料明细 + * @author shuyongfu + * @since 2016-04-16 + */ +@Entity +@Table(name = "MaterialItem") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class MaterialItem { + + private Long id; + + /** + * 材料名称 + */ + private String name; + + /** + * 数量 + */ + private Integer amount; + + /** + * 材料退货数量 + */ + private Long returnedAmount; + + /** + * 材料库存id,相当于一次性物品库存标识对象的Id + */ + private Long goodsStockId; + + /** + * 材料退货记录的ID + */ + private Long returnMaterialRecordID; + + /** + * 材料明细汇总的ID + */ + private Long materialInvoiceItemID; + + /** + * 材料退货明细汇总的id + */ + private Long returnMaterialItemID; + + /** + * 材料发货明细的id + */ + private Long sendOutMaterialItemID; + + /** + * 材料单价 + */ + private Double price; + + /** + * 材料发货单 + */ + private MaterialInvoice materialInvoice; + + public MaterialItem() { + + } + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getAmount() { + return amount; + } + + public void setAmount(Integer amount) { + this.amount = amount; + } + + public Long getReturnedAmount() { + return returnedAmount; + } + + public void setReturnedAmount(Long returnedAmount) { + this.returnedAmount = returnedAmount; + } + + @ManyToOne + @JoinColumn(name="materialInvoice_id") + public MaterialInvoice getMaterialInvoice() { + return materialInvoice; + } + + public void setMaterialInvoice(MaterialInvoice materialInvoice) { + this.materialInvoice = materialInvoice; + } + + public Long getGoodsStockId() { + return goodsStockId; + } + + public void setGoodsStockId(Long goodsStockId) { + this.goodsStockId = goodsStockId; + } + + public Long getReturnMaterialRecordID() { + return returnMaterialRecordID; + } + + public void setReturnMaterialRecordID(Long returnMaterialRecordID) { + this.returnMaterialRecordID = returnMaterialRecordID; + } + + public Long getMaterialInvoiceItemID() { + return materialInvoiceItemID; + } + + public void setMaterialInvoiceItemID(Long materialInvoiceItemID) { + this.materialInvoiceItemID = materialInvoiceItemID; + } + + public Long getReturnMaterialItemID() { + return returnMaterialItemID; + } + + public void setReturnMaterialItemID(Long returnMaterialItemID) { + this.returnMaterialItemID = returnMaterialItemID; + } + + public Long getSendOutMaterialItemID() { + return sendOutMaterialItemID; + } + + public void setSendOutMaterialItemID(Long sendOutMaterialItemID) { + this.sendOutMaterialItemID = sendOutMaterialItemID; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + +}