Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoiceItem.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoiceItem.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoiceItem.java	(revision 13070)
@@ -0,0 +1,106 @@
+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.Table;
+import javax.persistence.Transient;
+
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
+
+/**
+ * @author shuyongfu
+ * @since 2016-04-15
+ * 材料发货项
+ */
+@Entity
+@Table(name = "MaterialInvoiceItem")
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+public class MaterialInvoiceItem {
+
+	private Long id;
+
+	private String materialName;// 名字
+
+	private Integer amount;// 数量
+	
+	private Double settlementPrice = 0d;// 发货物品小结价格
+	
+	private Long materialInvoiceId;// 材料发货单Id
+	
+	/**
+	 * 仓库ID
+	 */
+	private Long wareHouseId;
+	
+	/**
+	 * 仓库名称
+	 */
+	private String wareHouseName;
+	
+	
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getMaterialName() {
+		return materialName;
+	}
+
+	public void setMaterialName(String materialName) {
+		this.materialName = materialName;
+	}
+
+	public Integer getAmount() {
+		return amount;
+	}
+
+	public void setAmount(Integer amount) {
+		this.amount = amount;
+	}
+
+	public Double getSettlementPrice() {
+		return settlementPrice;
+	}
+
+	public void setSettlementPrice(Double settlementPrice) {
+		this.settlementPrice = settlementPrice;
+	}
+
+	public Long getMaterialInvoiceId() {
+		return materialInvoiceId;
+	}
+
+	public void setMaterialInvoiceId(Long materialInvoiceId) {
+		this.materialInvoiceId = materialInvoiceId;
+	}
+
+	public Long getWareHouseId() {
+		return wareHouseId;
+	}
+
+	public void setWareHouseId(Long wareHouseId) {
+		this.wareHouseId = wareHouseId;
+	}
+
+	public String getWareHouseName() {
+		return wareHouseName;
+	}
+
+	public void setWareHouseName(String wareHouseName) {
+		this.wareHouseName = wareHouseName;
+	}
+
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialRecord.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialRecord.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialRecord.java	(revision 13070)
@@ -0,0 +1,187 @@
+package com.forgon.disinfectsystem.entity.returnmaterialrecord;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.Cascade;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
+import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
+
+/**
+ * @author shuyongfu
+ * @since 2016-04-15
+ * 材料退货单
+ */
+@Entity
+@Table(name = "ReturnMaterialRecord")
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+public class ReturnMaterialRecord {
+	
+	private Long id;
+	
+	private String operator;//操作人
+	
+	private String returnOfPeople;//退货人
+	
+	private String depart;//退货人科室
+	
+	private String departCoding;//退货人科室编码
+	
+	private Date returnTime;//退货时间
+	
+	private String remark;//备注
+	
+	private String handleDepartCode;//退回科室编码（一二级供应室编码）
+	
+	/**
+	 * 仓库ID
+	 */
+	private Long warehouseId;
+	
+	/**
+	 * 仓库名称
+	 */
+	private String warehouseName;
+	
+	/**
+	 * 源仓库ID
+	 */
+	private Long srcWarehouseId;
+	
+	/**
+	 * 源仓库名称
+	 */
+	private String srcWarehouseName;
+	
+	@JsonIgnore
+	private List<ReturnMaterialItem> returnMaterialItems = new ArrayList<ReturnMaterialItem>();//退货明细信息
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@OneToMany(fetch = FetchType.LAZY)
+	@Cascade(value = { org.hibernate.annotations.CascadeType.ALL })
+	@JoinColumn(name = "returnMaterialRecord_ID")
+	@OrderBy("id asc")
+	public List<ReturnMaterialItem> getReturnMaterialItems() {
+		return returnMaterialItems;
+	}
+
+	public void setReturnMaterialItems(List<ReturnMaterialItem> returnMaterialItems) {
+		this.returnMaterialItems = returnMaterialItems;
+	}
+
+	public String getOperator() {
+		return operator;
+	}
+
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
+
+	public String getReturnOfPeople() {
+		return returnOfPeople;
+	}
+
+	public void setReturnOfPeople(String returnOfPeople) {
+		this.returnOfPeople = returnOfPeople;
+	}
+
+	public String getDepart() {
+		return depart;
+	}
+
+	public void setDepart(String depart) {
+		this.depart = depart;
+	}
+
+	public String getDepartCoding() {
+		return departCoding;
+	}
+
+	public void setDepartCoding(String departCoding) {
+		this.departCoding = departCoding;
+	}
+
+	public Date getReturnTime() {
+		return returnTime;
+	}
+
+	public void setReturnTime(Date returnTime) {
+		this.returnTime = returnTime;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getHandleDepartCode() {
+		return handleDepartCode;
+	}
+
+	public void setHandleDepartCode(String handleDepartCode) {
+		this.handleDepartCode = handleDepartCode;
+	}
+
+	public Long getWarehouseId() {
+		return warehouseId;
+	}
+
+	public void setWarehouseId(Long warehouseId) {
+		this.warehouseId = warehouseId;
+	}
+
+	public String getWarehouseName() {
+		return warehouseName;
+	}
+
+	public void setWarehouseName(String warehouseName) {
+		this.warehouseName = warehouseName;
+	}
+
+	public Long getSrcWarehouseId() {
+		return srcWarehouseId;
+	}
+
+	public void setSrcWarehouseId(Long srcWarehouseId) {
+		this.srcWarehouseId = srcWarehouseId;
+	}
+
+	public String getSrcWarehouseName() {
+		return srcWarehouseName;
+	}
+
+	public void setSrcWarehouseName(String srcWarehouseName) {
+		this.srcWarehouseName = srcWarehouseName;
+	}
+
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java	(revision 13070)
@@ -0,0 +1,94 @@
+package com.forgon.disinfectsystem.entity.returnmaterialrecord;
+
+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 org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+/**
+ * @author shuyongfu
+ * @since 2016-04-15
+ * 材料退货明细
+ */
+@Entity
+@Table(name = "ReturnMaterialItem")
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+public class ReturnMaterialItem {
+
+	private Long id;
+
+	private String materialName;//一次性物品或器械包名称
+
+	private Integer amount;//退货数量
+	
+	private ReturnMaterialRecord returnMaterialRecord;//退货记录
+	
+	
+	/**
+	 * 仓库ID
+	 */
+	private Long warehouseId;
+	
+	/**
+	 * 仓库名称
+	 */
+	private String warehouseName;
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+	
+	@ManyToOne
+	@JoinColumn(name = "returnMaterialRecord_ID")
+	public ReturnMaterialRecord getReturnMaterialRecord() {
+		return returnMaterialRecord;
+	}
+
+	public void setReturnMaterialRecord(ReturnMaterialRecord returnMaterialRecord) {
+		this.returnMaterialRecord = returnMaterialRecord;
+	}
+
+	public String getMaterialName() {
+		return materialName;
+	}
+
+	public void setMaterialName(String materialName) {
+		this.materialName = materialName;
+	}
+
+	public Integer getAmount() {
+		return amount;
+	}
+
+	public void setAmount(Integer amount) {
+		this.amount = amount;
+	}
+
+	public Long getWarehouseId() {
+		return warehouseId;
+	}
+
+	public void setWarehouseId(Long warehouseId) {
+		this.warehouseId = warehouseId;
+	}
+
+	public String getWarehouseName() {
+		return warehouseName;
+	}
+
+	public void setWarehouseName(String warehouseName) {
+		this.warehouseName = warehouseName;
+	}
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoice.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoice.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoice.java	(revision 13070)
@@ -0,0 +1,188 @@
+package com.forgon.disinfectsystem.entity.invoicemanager;
+
+import java.util.Date;
+import java.util.Set;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Transient;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.Cascade;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * @author shuyongfu
+ * @since 2016-04-15
+ * 材料发货单
+ */
+@Entity
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+public class MaterialInvoice {
+	
+	private Long id;
+
+	private String serialNumber; // 流水号
+
+	private String departCoding; // 发往目的科室
+	
+	private String depart; // 发往目的科室
+	
+	private String sender; // 发货员
+	
+	private Date sendTime; // 发货时间
+
+	private String remark; // 备注
+	
+	@JsonIgnore
+	private Set<MaterialInvoiceItem> materialInvoiceItem; // 待发的物品
+	
+	private Double totalPrice;//总价
+	
+	private String orgUnitCoding;//供应室
+	
+	/**
+	 * 仓库ID
+	 */
+	private Long warehouseId;
+	
+	/**
+	 * 仓库名称
+	 */
+	private String warehouseName;
+	/**
+	 * 发货的仓库Id
+	 */
+	private Long sourceWarehouseId;
+	/**
+	 * 发货的仓库名称
+	 */
+	private String sourceWarehouseName;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(String serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public String getDepartCoding() {
+		return departCoding;
+	}
+
+	public void setDepartCoding(String departCoding) {
+		this.departCoding = departCoding;
+	}
+
+	public String getDepart() {
+		return depart;
+	}
+
+	public void setDepart(String depart) {
+		this.depart = depart;
+	}
+
+	public String getSender() {
+		return sender;
+	}
+
+	public void setSender(String sender) {
+		this.sender = sender;
+	}
+
+	public Date getSendTime() {
+		return sendTime;
+	}
+
+	public void setSendTime(Date sendTime) {
+		this.sendTime = sendTime;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	@OneToMany(fetch = FetchType.LAZY)
+	@Cascade(value = { org.hibernate.annotations.CascadeType.ALL })
+	@JoinColumn(name = "materialInvoice_id")
+	@OrderBy("id asc")
+	public Set<MaterialInvoiceItem> getMaterialInvoiceItem() {
+		return materialInvoiceItem;
+	}
+
+	public void setMaterialInvoiceItem(Set<MaterialInvoiceItem> materialInvoiceItem) {
+		this.materialInvoiceItem = materialInvoiceItem;
+	}
+
+	public Double getTotalPrice() {
+		return totalPrice;
+	}
+
+	public void setTotalPrice(Double totalPrice) {
+		this.totalPrice = totalPrice;
+	}
+
+	public String getOrgUnitCoding() {
+		return orgUnitCoding;
+	}
+
+	public void setOrgUnitCoding(String orgUnitCoding) {
+		this.orgUnitCoding = orgUnitCoding;
+	}
+
+	public Long getWarehouseId() {
+		return warehouseId;
+	}
+
+	public void setWarehouseId(Long warehouseId) {
+		this.warehouseId = warehouseId;
+	}
+
+	public String getWarehouseName() {
+		return warehouseName;
+	}
+
+	public void setWarehouseName(String warehouseName) {
+		this.warehouseName = warehouseName;
+	}
+
+	public Long getSourceWarehouseId() {
+		return sourceWarehouseId;
+	}
+
+	public void setSourceWarehouseId(Long sourceWarehouseId) {
+		this.sourceWarehouseId = sourceWarehouseId;
+	}
+
+	public String getSourceWarehouseName() {
+		return sourceWarehouseName;
+	}
+
+	public void setSourceWarehouseName(String sourceWarehouseName) {
+		this.sourceWarehouseName = sourceWarehouseName;
+	}
+
+}