Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java
===================================================================
diff -u -r13927 -r14338
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java	(.../DiposableGoodsItem.java)	(revision 13927)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java	(.../DiposableGoodsItem.java)	(revision 14338)
@@ -59,6 +59,16 @@
 	private Double fluctuationPrice;//浮动价格
 	
 	private Invoice invoice;
+	
+	/**
+	 * 装配记录id
+	 */
+	private Long packingRecordId;
+	
+	/**
+	 * 装配扣减明细id
+	 */
+	private Long packingRecordOutItemId;
 
 	public  DiposableGoodsItem() {
 		
@@ -84,6 +94,8 @@
 		this.price = item.price;
 		this.fluctuationPrice = item.fluctuationPrice;
 		this.invoice = item.invoice;
+		this.packingRecordId = item.packingRecordId;
+		this.packingRecordOutItemId = item.packingRecordOutItemId;
 	}
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -249,6 +261,22 @@
 		this.fluctuationPrice = fluctuationPrice;
 	}
 	
+	public Long getPackingRecordId() {
+		return packingRecordId;
+	}
+
+	public void setPackingRecordId(Long packingRecordId) {
+		this.packingRecordId = packingRecordId;
+	}
+
+	public Long getPackingRecordOutItemId() {
+		return packingRecordOutItemId;
+	}
+
+	public void setPackingRecordOutItemId(Long packingRecordOutItemId) {
+		this.packingRecordOutItemId = packingRecordOutItemId;
+	}
+
 	// 校验关联信息是否正确/发货
 	@Transient
 	public boolean isAssociatedInfoValidForInvoice() {
@@ -305,7 +333,7 @@
 //		}
 		if (!DatabaseUtil.isPoIdValid(invoiceItemID)) {
 			return false;
-		}
+		}		
 		return true;
 	}
 
@@ -336,7 +364,7 @@
 		}
 		if (!DatabaseUtil.isPoIdValid(sendOutDiposableGoodsItemID)) {
 			return false;
-		}
+		}		
 		return true;
 	}
 	@Transient
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecordOutItem.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecordOutItem.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecordOutItem.java	(revision 14338)
@@ -0,0 +1,110 @@
+package com.forgon.disinfectsystem.entity.packing;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import com.fasterxml.jackson.annotation.JsonFilter;
+
+
+/**
+ * 装配历史记录的材料、一次性物品出库明细
+ * @author shuyongfu
+ * @since 2016-07-25
+ *
+ */
+@Entity
+@Table(name = "PackingRecordOutItem")
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+@JsonFilter("fieldFilter")
+public class PackingRecordOutItem {
+
+	private Long id;
+	
+	private Long packingRecordId; //装配历史记录id
+	
+	private Long tousseDefinitionId; //器械包定义id
+	
+	private String tousseName; //器械包名字
+	
+	private Long disposableGoodsId; //一次性物品定义id
+	
+	private String disposableGoodsName; //一次性物品名字
+	
+	private Integer amount; //数量(实际出库扣减数量)
+	
+	private Double settlementPrice; //结算金额
+	
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getPackingRecordId() {
+		return packingRecordId;
+	}
+
+	public void setPackingRecordId(Long packingRecordId) {
+		this.packingRecordId = packingRecordId;
+	}
+
+	public Long getTousseDefinitionId() {
+		return tousseDefinitionId;
+	}
+
+	public void setTousseDefinitionId(Long tousseDefinitionId) {
+		this.tousseDefinitionId = tousseDefinitionId;
+	}
+
+	public String getTousseName() {
+		return tousseName;
+	}
+
+	public void setTousseName(String tousseName) {
+		this.tousseName = tousseName;
+	}
+
+	public Long getDisposableGoodsId() {
+		return disposableGoodsId;
+	}
+
+	public void setDisposableGoodsId(Long disposableGoodsId) {
+		this.disposableGoodsId = disposableGoodsId;
+	}
+
+	public String getDisposableGoodsName() {
+		return disposableGoodsName;
+	}
+
+	public void setDisposableGoodsName(String disposableGoodsName) {
+		this.disposableGoodsName = disposableGoodsName;
+	}
+
+	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;
+	}
+
+}