Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/IdentificationOfDiposableGoods.java
===================================================================
diff -u -r12672 -r12676
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/IdentificationOfDiposableGoods.java	(.../IdentificationOfDiposableGoods.java)	(revision 12672)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/IdentificationOfDiposableGoods.java	(.../IdentificationOfDiposableGoods.java)	(revision 12676)
@@ -33,6 +33,9 @@
 	private DisposableGoodsBatchStock batchStock;
 	
 	private String conclusion;// 验收结果
+	
+	private Long wareHouseID;// 仓库ID
+	private String wareHouseName;// 仓库名字
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -94,6 +97,22 @@
 		this.conclusion = conclusion;
 	}
 
+	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;
+	}
+
 	@Override
 	public int compareTo(IdentificationOfDiposableGoods o) {
 		if (entryDate.after(o.getEntryDate())) {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java
===================================================================
diff -u -r12672 -r12676
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java	(.../DisposableGoodsBatchStock.java)	(revision 12672)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatchStock.java	(.../DisposableGoodsBatchStock.java)	(revision 12676)
@@ -54,6 +54,9 @@
 	
 	private String barcode;// 批次库存的条码，目前和物品批次的条码一样。为冗余字段
 	
+	private Long wareHouseID;// 仓库ID
+	private String wareHouseName;// 仓库名字
+	
 	@JsonIgnore
 	private List<IdentificationOfDiposableGoods> identifications = new ArrayList<IdentificationOfDiposableGoods>();
 
@@ -160,6 +163,22 @@
 		this.barcode = barcode;
 	}
 
+	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;
+	}
+
 	@OneToMany(fetch = FetchType.LAZY)
 	@Cascade(value = { org.hibernate.annotations.CascadeType.ALL })
 	@JoinColumn(name = "batch_id")
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java
===================================================================
diff -u -r12672 -r12676
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java	(.../DisposableGoodsStock.java)	(revision 12672)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java	(.../DisposableGoodsStock.java)	(revision 12676)
@@ -80,6 +80,8 @@
 	
 	private String inventorySerialNumber;	// 物资系统的物资编码，用于与物资系统交互
 	
+	private Long wareHouseID;// 仓库ID
+	private String wareHouseName;// 仓库名字
 	@JsonIgnore
 	private Set<DisposableGoodsBatchStock> goodsBatchs = new HashSet<DisposableGoodsBatchStock>();
 	
@@ -300,6 +302,22 @@
 		this.inventorySerialNumber = inventorySerialNumber;
 	}
 
+	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 String getPackageSpec() {
 		return packageSpec;
 	}