Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialItem.java
===================================================================
diff -u -r13103 -r13373
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialItem.java	(.../MaterialItem.java)	(revision 13103)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialItem.java	(.../MaterialItem.java)	(revision 13373)
@@ -12,7 +12,7 @@
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 /**
- * 材料发货明细的材料明细
+ * 材料各业务项的明细,如供应室领用、材料发货、材料退库等
  * @author shuyongfu
  * @since 2016-04-16
  */
@@ -33,51 +33,61 @@
 	private String name;
 	
 	/**
-	 * 数量
+	 * 材料单价
 	 */
-	private Integer amount;
+	private Double price;
 	
 	/**
-	 * 材料退货数量
+	 * 数量(如果关联材料发货单则表示发货数量,同理如果关联材料退货单表示退货数量,关联供应室领用代表领用数量)
 	 */
-	private Long returnedAmount;
+	private Integer amount;
 	
 	/**
 	 * 材料库存id,相当于一次性物品库存标识对象的Id
 	 */
 	private Long goodsStockId;
 	
 	/**
-	 * 材料退货记录的ID
+	 * 材料退库单
 	 */
-	private Long returnMaterialRecordID;
+	private Long materialOutEntryId;
 	
 	/**
-	 * 材料明细汇总的ID
+	 * 供应室材料领用单
 	 */
-	private Long materialInvoiceItemID;
+	private Long receiveRecordId;
 	
 	/**
-	 * 材料退货明细汇总的id
+	 * 材料发货单
 	 */
-	private Long returnMaterialItemID;
+	private MaterialInvoice materialInvoice;
 	
 	/**
-	 * 材料发货明细的id
+	 * 材料退货单的ID
 	 */
-	private Long sendOutMaterialItemID;
+	private Long returnMaterialRecordID;
 	
 	/**
-	 * 材料单价
+	 * 材料退库明细的id
 	 */
-	private Double price;
+	private Long materialOutEntryItemId;
 	
 	/**
-	 * 材料发货单
+	 * 供应室领用材料明细的id
 	 */
-	private MaterialInvoice materialInvoice;
-
-	public  MaterialItem() {
+	private Long receiveRecordItemId;
+	
+	/**
+	 * 材料发货明细的ID
+	 */
+	private Long materialInvoiceItemID;
+	
+	/**
+	 * 材料退货明细汇总的id
+	 */
+	private Long returnMaterialItemID;
+	
+	public MaterialItem() {
 		
 	}
 
@@ -115,14 +125,6 @@
 		this.amount = amount;
 	}
 
-	public Long getReturnedAmount() {
-		return returnedAmount;
-	}
-
-	public void setReturnedAmount(Long returnedAmount) {
-		this.returnedAmount = returnedAmount;
-	}
-
 	@ManyToOne
 	@JoinColumn(name="materialInvoice_id")
 	public MaterialInvoice getMaterialInvoice() {
@@ -165,14 +167,6 @@
 		this.returnMaterialItemID = returnMaterialItemID;
 	}
 
-	public Long getSendOutMaterialItemID() {
-		return sendOutMaterialItemID;
-	}
-
-	public void setSendOutMaterialItemID(Long sendOutMaterialItemID) {
-		this.sendOutMaterialItemID = sendOutMaterialItemID;
-	}
-
 	public Double getPrice() {
 		return price;
 	}
@@ -181,4 +175,36 @@
 		this.price = price;
 	}
 
+	public Long getReceiveRecordItemId() {
+		return receiveRecordItemId;
+	}
+
+	public void setReceiveRecordItemId(Long receiveRecordItemId) {
+		this.receiveRecordItemId = receiveRecordItemId;
+	}
+
+	public Long getMaterialOutEntryId() {
+		return materialOutEntryId;
+	}
+
+	public void setMaterialOutEntryId(Long materialOutEntryId) {
+		this.materialOutEntryId = materialOutEntryId;
+	}
+
+	public Long getReceiveRecordId() {
+		return receiveRecordId;
+	}
+
+	public void setReceiveRecordId(Long receiveRecordId) {
+		this.receiveRecordId = receiveRecordId;
+	}
+
+	public Long getMaterialOutEntryItemId() {
+		return materialOutEntryItemId;
+	}
+
+	public void setMaterialOutEntryItemId(Long materialOutEntryItemId) {
+		this.materialOutEntryItemId = materialOutEntryItemId;
+	}
+
 }